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...

diff --git a/ChangeLog b/ChangeLog
index 78ccdcc470dfba6d98011ccf995a98b32af9243e..f80853a31cfecd4c633e6db252503ab02cd2aecc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+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):

diff --git a/ext/musepack/gstmusepackreader.c b/ext/musepack/gstmusepackreader.c
index 2bef1cf2fa12926bd1bcd12a1c8e8a19a360e8f2..07fbcf3d3538f0e5e59259eaaa45c4b9632af1d0 100644 (file)
--- 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 2bef1cf2fa12926bd1bcd12a1c8e8a19a360e8f2..07fbcf3d3538f0e5e59259eaaa45c4b9632af1d0 100644 (file)
--- 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 6736d086f62791432f5ca81f149817f161cc610a..f1d10a2bec39ef810832869dbb7a787baaac0a85 100644 (file)
--- 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);