From 98a2f3f54bd22422edff04046388cccd852b07a3 Mon Sep 17 00:00:00 2001 From: "Ronald S. Bultje" Date: Mon, 10 Jan 2005 16:42:27 +0000 Subject: [PATCH] Some work on tags - still doesn't work in playbin... Original commit message from CVS: * ext/musepack/gstmusepackreader.cpp: * gst/apetag/apedemux.c: (gst_ape_demux_stream_data): Some work on tags - still doesn't work in playbin... * gst/audioscale/gstaudioscale.c: (gst_audioscale_chain): Handle events... --- ChangeLog | 8 ++++++++ gst/audioscale/gstaudioscale.c | 9 +++++---- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 78ccdcc470..f80853a31c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2005-01-10 Ronald S. Bultje + + * ext/musepack/gstmusepackreader.cpp: + * gst/apetag/apedemux.c: (gst_ape_demux_stream_data): + Some work on tags - still doesn't work in playbin... + * gst/audioscale/gstaudioscale.c: (gst_audioscale_chain): + Handle events... + 2005-01-10 Ronald S. Bultje * gst/qtdemux/qtdemux.c: (qtdemux_parse_tree): diff --git a/gst/audioscale/gstaudioscale.c b/gst/audioscale/gstaudioscale.c index 0734940a90..5c9a12d6c7 100644 --- a/gst/audioscale/gstaudioscale.c +++ b/gst/audioscale/gstaudioscale.c @@ -561,10 +561,6 @@ gst_audioscale_chain (GstPad * pad, GstData * _data) g_return_if_fail (buf != NULL); audioscale = GST_AUDIOSCALE (gst_pad_get_parent (pad)); - if (audioscale->passthru && audioscale->num_iterations == 0) { - gst_pad_push (audioscale->srcpad, GST_DATA (buf)); - return; - } if (GST_IS_EVENT (_data)) { GstEvent *e = GST_EVENT (_data); @@ -607,6 +603,11 @@ gst_audioscale_chain (GstPad * pad, GstData * _data) audioscale->gst_resample->o_rate / GST_SECOND; } + if (audioscale->passthru && audioscale->num_iterations == 0) { + gst_pad_push (audioscale->srcpad, GST_DATA (buf)); + return; + } + data = GST_BUFFER_DATA (buf); size = GST_BUFFER_SIZE (buf);