summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog8
-rw-r--r--ext/musepack/gstmusepackreader.c6
-rw-r--r--ext/musepack/gstmusepackreader.cpp6
-rw-r--r--gst/apetag/apedemux.c1
4 files changed, 21 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 78ccdcc4..f80853a3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
2005-01-10 Ronald S. Bultje <rbultje@ronald.bitfreak.net>
+ * 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 <rbultje@ronald.bitfreak.net>
+
* gst/qtdemux/qtdemux.c: (qtdemux_parse_tree):
Also shove tags on kid pads.
diff --git a/ext/musepack/gstmusepackreader.c b/ext/musepack/gstmusepackreader.c
index 2bef1cf2..07fbcf3d 100644
--- a/ext/musepack/gstmusepackreader.c
+++ b/ext/musepack/gstmusepackreader.c
@@ -64,6 +64,9 @@ GstMusepackReader::read (void * ptr, mpc_int32_t size)
this->eos = true;
gst_event_unref (event);
goto done;
+ case GST_EVENT_FLUSH:
+ gst_event_unref (event);
+ break;
default:
gst_pad_event_default (this->bs->pad, event);
break;
@@ -117,6 +120,9 @@ GstMusepackReader::seek (mpc_int32_t offset)
case GST_EVENT_INTERRUPT:
g_warning ("interrupt!");
return false;
+ case GST_EVENT_FLUSH:
+ gst_event_unref (event);
+ break;
default:
gst_pad_event_default (this->bs->pad, event);
break;
diff --git a/ext/musepack/gstmusepackreader.cpp b/ext/musepack/gstmusepackreader.cpp
index 2bef1cf2..07fbcf3d 100644
--- a/ext/musepack/gstmusepackreader.cpp
+++ b/ext/musepack/gstmusepackreader.cpp
@@ -64,6 +64,9 @@ GstMusepackReader::read (void * ptr, mpc_int32_t size)
this->eos = true;
gst_event_unref (event);
goto done;
+ case GST_EVENT_FLUSH:
+ gst_event_unref (event);
+ break;
default:
gst_pad_event_default (this->bs->pad, event);
break;
@@ -117,6 +120,9 @@ GstMusepackReader::seek (mpc_int32_t offset)
case GST_EVENT_INTERRUPT:
g_warning ("interrupt!");
return false;
+ case GST_EVENT_FLUSH:
+ gst_event_unref (event);
+ break;
default:
gst_pad_event_default (this->bs->pad, event);
break;
diff --git a/gst/apetag/apedemux.c b/gst/apetag/apedemux.c
index 6736d086..f1d10a2b 100644
--- a/gst/apetag/apedemux.c
+++ b/gst/apetag/apedemux.c
@@ -710,6 +710,7 @@ gst_ape_demux_stream_data (GstApeDemux * ape)
GstData *data;
data = gst_pad_pull (ape->sinkpad);
+
if (GST_IS_EVENT (data)) {
GstEvent *event = GST_EVENT (data);