diff --git a/ChangeLog b/ChangeLog index f19b4817b5..01a466d889 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2004-10-20 Ronald S. Bultje + + * ext/ogg/gstoggdemux.c: (gst_ogg_demux_iterate): + Wrong return. + * gst/playback/Makefile.am: + * gst/playback/gstdecodebin.c: (gst_decode_bin_class_init): + * gst/playback/gstplay-marshal.list: + * gst/playback/gstplaybasebin.c: (gst_play_base_bin_class_init): + Fix marshallers. + 2004-10-18 Ronald S. Bultje * ext/ogg/gstoggdemux.c: (gst_ogg_demux_src_event): diff --git a/ext/ogg/gstoggdemux.c b/ext/ogg/gstoggdemux.c index bd0693d1fe..1cd44d504d 100644 --- a/ext/ogg/gstoggdemux.c +++ b/ext/ogg/gstoggdemux.c @@ -555,7 +555,8 @@ gst_ogg_demux_src_event (GstPad * pad, GstEvent * event) GST_OGG_SET_STATE (ogg, GST_OGG_STATE_PLAY); FOR_PAD_IN_CURRENT_CHAIN (ogg, pad, - pad->flags |= GST_OGG_PAD_NEEDS_DISCONT;); + pad->flags |= GST_OGG_PAD_NEEDS_DISCONT; + ); GST_DEBUG_OBJECT (ogg, "initiating seeking to format %d, offset %" G_GUINT64_FORMAT, format, offset); @@ -628,7 +629,8 @@ gst_ogg_demux_handle_event (GstPad * pad, GstEvent * event) gst_event_unref (event); GST_FLAG_UNSET (ogg, GST_OGG_FLAG_WAIT_FOR_DISCONT); FOR_PAD_IN_CURRENT_CHAIN (ogg, pad, - pad->flags |= GST_OGG_PAD_NEEDS_DISCONT;); + pad->flags |= GST_OGG_PAD_NEEDS_DISCONT; + ); break; default: gst_pad_event_default (pad, event); @@ -914,7 +916,8 @@ _find_chain_get_unknown_part (GstOggDemux * ogg, gint64 * start, gint64 * end) *end = G_MAXINT64; g_assert (ogg->current_chain >= 0); - FOR_PAD_IN_CURRENT_CHAIN (ogg, pad, *start = MAX (*start, pad->end_offset);); + FOR_PAD_IN_CURRENT_CHAIN (ogg, pad, *start = MAX (*start, pad->end_offset); + ); if (ogg->setup_state == SETUP_FIND_LAST_CHAIN) { *end = gst_file_pad_get_length (ogg->sinkpad); @@ -1043,7 +1046,8 @@ _find_streams_check (GstOggDemux * ogg) } else { endpos = G_MAXINT64; FOR_PAD_IN_CHAIN (ogg, pad, ogg->chains->len - 1, - endpos = MIN (endpos, pad->start_offset);); + endpos = MIN (endpos, pad->start_offset); + ); } if (!ogg->seek_skipped || gst_ogg_demux_position (ogg) >= endpos) { /* have we found the endposition for all streams yet? */ @@ -1115,7 +1119,6 @@ gst_ogg_demux_iterate (GstFilePad * pad) gst_ogg_demux_eos (ogg); } else { GST_DEBUG_OBJECT (ogg, "no data available, doing nothing"); - return; } return; } diff --git a/gst/playback/Makefile.am b/gst/playback/Makefile.am index eff0517071..1507572726 100644 --- a/gst/playback/Makefile.am +++ b/gst/playback/Makefile.am @@ -1,8 +1,19 @@ +glib_enum_define=GST_PLAY +glib_enum_prefix=gst_play + +built_sources = gstplay-marshal.c + +built_headers = gstplay-marshal.h + plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@ plugin_LTLIBRARIES = libgstplaybin.la libgstdecodebin.la -libgstplaybin_la_SOURCES = gstplaybin.c gstplaybasebin.c gststreaminfo.c +libgstplaybin_la_SOURCES = \ + gstplaybin.c \ + gstplaybasebin.c \ + gststreaminfo.c +nodist_libgstplaybin_la_SOURCES = $(built_sources) libgstplaybin_la_CFLAGS = $(GST_CFLAGS) libgstplaybin_la_LIBADD = libgstplaybin_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) @@ -30,3 +41,11 @@ test4_CFLAGS = $(GST_CFLAGS) decodetest_LDADD = $(GST_LIBS) decodetest_CFLAGS = $(GST_CFLAGS) + +BUILT_SOURCES = $(built_headers) $(built_sources) + +EXTRA_DIST = gstplay-marshal.list + +CLEANFILES = $(BUILT_SOURCES) + +include $(top_srcdir)/common/glib-gen.mak diff --git a/gst/playback/gstdecodebin.c b/gst/playback/gstdecodebin.c index cad836cee2..b794b856ee 100644 --- a/gst/playback/gstdecodebin.c +++ b/gst/playback/gstdecodebin.c @@ -24,6 +24,8 @@ #include #include +#include "gstplay-marshal.h" + /* generic templates */ static GstStaticPadTemplate decoder_bin_sink_template = GST_STATIC_PAD_TEMPLATE ("sink", @@ -182,12 +184,12 @@ gst_decode_bin_class_init (GstDecodeBinClass * klass) g_signal_new ("new-decoded-pad", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GstDecodeBinClass, new_decoded_pad), NULL, NULL, - gst_marshal_VOID__OBJECT_POINTER, G_TYPE_NONE, 2, G_TYPE_OBJECT, + gst_play_marshal_VOID__OBJECT_BOOLEAN, G_TYPE_NONE, 2, G_TYPE_OBJECT, G_TYPE_BOOLEAN); gst_decode_bin_signals[SIGNAL_UNKNOWN_TYPE] = g_signal_new ("unknown-type", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GstDecodeBinClass, unknown_type), - NULL, NULL, gst_marshal_VOID__POINTER_OBJECT, G_TYPE_NONE, 2, + NULL, NULL, gst_marshal_VOID__OBJECT_BOXED, G_TYPE_NONE, 2, GST_TYPE_PAD, GST_TYPE_CAPS); gobject_klass->dispose = GST_DEBUG_FUNCPTR (gst_decode_bin_dispose); diff --git a/gst/playback/gstplay-marshal.list b/gst/playback/gstplay-marshal.list new file mode 100644 index 0000000000..771565c90c --- /dev/null +++ b/gst/playback/gstplay-marshal.list @@ -0,0 +1,2 @@ +VOID:OBJECT,OBJECT +VOID:OBJECT,BOOLEAN diff --git a/gst/playback/gstplaybasebin.c b/gst/playback/gstplaybasebin.c index e72de9d981..470e250c86 100644 --- a/gst/playback/gstplaybasebin.c +++ b/gst/playback/gstplaybasebin.c @@ -23,6 +23,7 @@ #include #include "gstplaybasebin.h" +#include "gstplay-marshal.h" GST_DEBUG_CATEGORY_STATIC (gst_play_base_bin_debug); #define GST_CAT_DEFAULT gst_play_base_bin_debug @@ -139,12 +140,12 @@ gst_play_base_bin_class_init (GstPlayBaseBinClass * klass) gst_play_base_bin_signals[LINK_STREAM_SIGNAL] = g_signal_new ("link-stream", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GstPlayBaseBinClass, link_stream), - NULL, NULL, gst_marshal_VOID__OBJECT_POINTER, G_TYPE_NONE, 2, + NULL, NULL, gst_play_marshal_VOID__OBJECT_OBJECT, G_TYPE_NONE, 2, G_TYPE_OBJECT, GST_TYPE_PAD); gst_play_base_bin_signals[UNLINK_STREAM_SIGNAL] = g_signal_new ("unlink-stream", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GstPlayBaseBinClass, unlink_stream), - NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 1, G_TYPE_OBJECT); + NULL, NULL, gst_marshal_VOID__OBJECT, G_TYPE_NONE, 1, G_TYPE_OBJECT); gobject_klass->dispose = GST_DEBUG_FUNCPTR (gst_play_base_bin_dispose);