Commit ff8530e2 authored by Sebastian Dröge's avatar Sebastian Dröge

Update to latest API changes in GLib/GIO and require at least gio-2.0 2.15.0 for this.

Original commit message from CVS:
* configure.ac:
* ext/gio/gstgio.c:
* ext/gio/gstgio.h:
* ext/gio/gstgiobasesink.h:
* ext/gio/gstgiobasesrc.c: (gst_gio_base_src_get_size):
* ext/gio/gstgiobasesrc.h:
* ext/gio/gstgiosink.c: (gst_gio_sink_start):
* ext/gio/gstgiosink.h:
* ext/gio/gstgiosrc.h:
* ext/gio/gstgiostreamsink.h:
* ext/gio/gstgiostreamsrc.h:
* tests/check/pipelines/gio.c:
Update to latest API changes in GLib/GIO and require at least
gio-2.0 2.15.0 for this.
* ext/gio/Makefile.am:
Add GST_PLUGIN_LDFLAGS to LDFLAGS.
parent d712e44d
......@@ -14,7 +14,7 @@ libgstgio_la_SOURCES = \
libgstgio_la_CFLAGS = $(GST_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GIO_CFLAGS)
libgstgio_la_LIBADD = $(GST_LIBS) $(GST_BASE_LIBS) $(GIO_LIBS)
libgstgio_la_LDFLAGS = $(GST_GIO_LDFLAGS)
libgstgio_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(GST_GIO_LDFLAGS)
# headers we need but don't want installed
noinst_HEADERS = \
......
......@@ -29,8 +29,6 @@
#include "gstgiostreamsink.h"
#include "gstgiostreamsrc.h"
#include <gio/gvfs.h>
GST_DEBUG_CATEGORY_STATIC (gst_gio_debug);
#define GST_CAT_DEFAULT gst_gio_debug
......
......@@ -22,8 +22,7 @@
#ifndef __GST_GIO_H__
#define __GST_GIO_H__
#include <gio/gioerror.h>
#include <gio/gseekable.h>
#include <gio/gio.h>
#include <gst/gst.h>
G_BEGIN_DECLS
......
......@@ -24,7 +24,6 @@
#include "gstgio.h"
#include <gio/gfile.h>
#include <gst/base/gstbasesink.h>
G_BEGIN_DECLS
......
......@@ -166,7 +166,7 @@ gst_gio_base_src_get_size (GstBaseSrc * base_src, guint64 * size)
GError *err = NULL;
info = g_file_input_stream_query_info (G_FILE_INPUT_STREAM (src->stream),
G_FILE_ATTRIBUTE_STD_SIZE, src->cancel, &err);
G_FILE_ATTRIBUTE_STANDARD_SIZE, src->cancel, &err);
if (info != NULL) {
*size = g_file_info_get_size (info);
......
......@@ -24,9 +24,6 @@
#include "gstgio.h"
#include <gio/gfile.h>
#include <gio/gfileinputstream.h>
#include <gio/gmemoryinputstream.h>
#include <gst/base/gstbasesrc.h>
G_BEGIN_DECLS
......
......@@ -182,8 +182,7 @@ gst_gio_sink_start (GstBaseSink * base_sink)
}
stream =
G_OUTPUT_STREAM (g_file_create (file, G_FILE_CREATE_FLAGS_NONE, cancel,
&err));
G_OUTPUT_STREAM (g_file_create (file, G_FILE_CREATE_NONE, cancel, &err));
success = (stream != NULL);
g_object_unref (file);
......
......@@ -25,7 +25,6 @@
#include "gstgio.h"
#include "gstgiobasesink.h"
#include <gio/gfile.h>
#include <gst/base/gstbasesink.h>
G_BEGIN_DECLS
......
......@@ -25,7 +25,6 @@
#include "gstgio.h"
#include "gstgiobasesrc.h"
#include <gio/gfile.h>
#include <gst/base/gstbasesrc.h>
G_BEGIN_DECLS
......
......@@ -25,7 +25,6 @@
#include "gstgio.h"
#include "gstgiobasesink.h"
#include <gio/gfile.h>
#include <gst/base/gstbasesink.h>
G_BEGIN_DECLS
......
......@@ -25,7 +25,6 @@
#include "gstgio.h"
#include "gstgiobasesrc.h"
#include <gio/gfile.h>
#include <gst/base/gstbasesrc.h>
G_BEGIN_DECLS
......
......@@ -22,8 +22,7 @@
#include <gst/check/gstcheck.h>
#include <gst/check/gstbufferstraw.h>
#include <gio/gmemoryinputstream.h>
#include <gio/gmemoryoutputstream.h>
#include <gio/gio.h>
static gboolean got_eos = FALSE;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment