mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-26 19:51:11 +00:00
Code Issues 1 Projects Releases Wiki Activity

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

Browse source 
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.
This commit is contained in:
Sebastian Dröge 2007-12-29 17:29:17 +00:00
parent d712e44d30
commit ff8530e228
12 changed files with 5 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ext/gio/Makefile.am
View file

@ -14,7 +14,7 @@ libgstgio_la_SOURCES = \
libgstgio_la_CFLAGS = $(GST_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GIO_CFLAGS) libgstgio_la_CFLAGS = $(GST_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GIO_CFLAGS)
libgstgio_la_LIBADD = $(GST_LIBS) $(GST_BASE_LIBS) $(GIO_LIBS) 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 # headers we need but don't want installed
noinst_HEADERS = \ noinst_HEADERS = \

2
ext/gio/gstgio.c
View file

@ -29,8 +29,6 @@
#include "gstgiostreamsink.h" #include "gstgiostreamsink.h"
#include "gstgiostreamsrc.h" #include "gstgiostreamsrc.h"
#include <gio/gvfs.h>
GST_DEBUG_CATEGORY_STATIC (gst_gio_debug); GST_DEBUG_CATEGORY_STATIC (gst_gio_debug);
#define GST_CAT_DEFAULT gst_gio_debug #define GST_CAT_DEFAULT gst_gio_debug

3
ext/gio/gstgio.h
View file

@ -22,8 +22,7 @@
#ifndef __GST_GIO_H__ #ifndef __GST_GIO_H__
#define __GST_GIO_H__ #define __GST_GIO_H__
#include <gio/gioerror.h> #include <gio/gio.h>
#include <gio/gseekable.h>
#include <gst/gst.h> #include <gst/gst.h>
G_BEGIN_DECLS G_BEGIN_DECLS

1
ext/gio/gstgiobasesink.h
View file

@ -24,7 +24,6 @@
#include "gstgio.h" #include "gstgio.h"
#include <gio/gfile.h>
#include <gst/base/gstbasesink.h> #include <gst/base/gstbasesink.h>
G_BEGIN_DECLS G_BEGIN_DECLS

2
ext/gio/gstgiobasesrc.c
View file

@ -166,7 +166,7 @@ gst_gio_base_src_get_size (GstBaseSrc * base_src, guint64 * size)
GError *err = NULL; GError *err = NULL;
info = g_file_input_stream_query_info (G_FILE_INPUT_STREAM (src->stream), 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) { if (info != NULL) {
*size = g_file_info_get_size (info); *size = g_file_info_get_size (info);

3
ext/gio/gstgiobasesrc.h
View file

@ -24,9 +24,6 @@
#include "gstgio.h" #include "gstgio.h"
#include <gio/gfile.h>
#include <gio/gfileinputstream.h>
#include <gio/gmemoryinputstream.h>
#include <gst/base/gstbasesrc.h> #include <gst/base/gstbasesrc.h>
G_BEGIN_DECLS G_BEGIN_DECLS

3
ext/gio/gstgiosink.c
View file

@ -182,8 +182,7 @@ gst_gio_sink_start (GstBaseSink * base_sink)
} }
stream = stream =
G_OUTPUT_STREAM (g_file_create (file, G_FILE_CREATE_FLAGS_NONE, cancel, G_OUTPUT_STREAM (g_file_create (file, G_FILE_CREATE_NONE, cancel, &err));
&err));
success = (stream != NULL); success = (stream != NULL);
g_object_unref (file); g_object_unref (file);

1
ext/gio/gstgiosink.h
View file

@ -25,7 +25,6 @@
#include "gstgio.h" #include "gstgio.h"
#include "gstgiobasesink.h" #include "gstgiobasesink.h"
#include <gio/gfile.h>
#include <gst/base/gstbasesink.h> #include <gst/base/gstbasesink.h>
G_BEGIN_DECLS G_BEGIN_DECLS

1
ext/gio/gstgiosrc.h
View file

@ -25,7 +25,6 @@
#include "gstgio.h" #include "gstgio.h"
#include "gstgiobasesrc.h" #include "gstgiobasesrc.h"
#include <gio/gfile.h>
#include <gst/base/gstbasesrc.h> #include <gst/base/gstbasesrc.h>
G_BEGIN_DECLS G_BEGIN_DECLS

1
ext/gio/gstgiostreamsink.h
View file

@ -25,7 +25,6 @@
#include "gstgio.h" #include "gstgio.h"
#include "gstgiobasesink.h" #include "gstgiobasesink.h"
#include <gio/gfile.h>
#include <gst/base/gstbasesink.h> #include <gst/base/gstbasesink.h>
G_BEGIN_DECLS G_BEGIN_DECLS

1
ext/gio/gstgiostreamsrc.h
View file

@ -25,7 +25,6 @@
#include "gstgio.h" #include "gstgio.h"
#include "gstgiobasesrc.h" #include "gstgiobasesrc.h"
#include <gio/gfile.h>
#include <gst/base/gstbasesrc.h> #include <gst/base/gstbasesrc.h>
G_BEGIN_DECLS G_BEGIN_DECLS

3
tests/check/pipelines/gio.c
View file

@ -22,8 +22,7 @@
#include <gst/check/gstcheck.h> #include <gst/check/gstcheck.h>
#include <gst/check/gstbufferstraw.h> #include <gst/check/gstbufferstraw.h>
#include <gio/gmemoryinputstream.h> #include <gio/gio.h>
#include <gio/gmemoryoutputstream.h>
static gboolean got_eos = FALSE; static gboolean got_eos = FALSE;