From 47043705b307a9a7d239252d732210d1af45af7b Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Mon, 8 Jul 2002 19:42:06 +0000 Subject: - use _merge instead of _append Original commit message from CVS: - use _merge instead of _append - fix events in modplug --- gst/modplug/gstmodplug.cc | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) (limited to 'gst/modplug/gstmodplug.cc') diff --git a/gst/modplug/gstmodplug.cc b/gst/modplug/gstmodplug.cc index 4a84a7d8..c0991e4b 100644 --- a/gst/modplug/gstmodplug.cc +++ b/gst/modplug/gstmodplug.cc @@ -360,6 +360,7 @@ gst_modplug_src_event (GstPad *pad, GstEvent *event) res = FALSE; break; } + gst_event_unref (event); return res; } @@ -385,17 +386,26 @@ gst_modplug_loop (GstElement *element) if ( GST_IS_EVENT (buffer_in) ) { GstEvent *event = GST_EVENT (buffer_in); - if (GST_EVENT_TYPE (event) == GST_EVENT_EOS) + if (GST_EVENT_TYPE (event) == GST_EVENT_EOS) { + gst_event_unref (event); break; + } + gst_event_unref (event); } else { if ( modplug->Buffer ) { - modplug->Buffer = gst_buffer_append( modplug->Buffer, buffer_in ); + GstBuffer *merge; + + merge = gst_buffer_merge( modplug->Buffer, buffer_in ); gst_buffer_unref( buffer_in ); + gst_buffer_unref( modplug->Buffer ); + + modplug->Buffer = merge; } - else + else { modplug->Buffer = buffer_in; + } } } -- cgit v1.2.1