ext/mad/: Fix mad and id3tag compilation again.

Original commit message from CVS:
* ext/mad/gstid3tag.c: (gst_id3_tag_src_query):
* ext/mad/gstmad.c: (gst_mad_chain):
Fix mad and id3tag compilation again.

diff --git a/ChangeLog b/ChangeLog
index b9d2b820ffc95eed84300049b6bf426d2959a137..12c6272b8235e22dc254568ec3a860311249a211 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-05-12  Wim Taymans  <wim@fluendo.com>
+
+       * ext/mad/gstid3tag.c: (gst_id3_tag_src_query):
+       * ext/mad/gstmad.c: (gst_mad_chain):
+       Fix mad and id3tag compilation again.
+
 2005-05-12  Wim Taymans  <wim@fluendo.com>
 
        * gst/udp/.cvsignore:

diff --git a/ext/mad/gstid3tag.c b/ext/mad/gstid3tag.c
index fdf764c68e679c4e8508f0ee946ea9170553805b..ae6a520838fb239a651b9ffc76689170517e179c 100644 (file)
--- a/ext/mad/gstid3tag.c
+++ b/ext/mad/gstid3tag.c
@@ -163,8 +163,7 @@ static gboolean gst_id3_tag_src_event (GstPad * pad, GstEvent * event);
 static const GstEventMask *gst_id3_tag_get_event_masks (GstPad * pad);
 static const GstQueryType *gst_id3_tag_get_query_types (GstPad * pad);
 
-static gboolean gst_id3_tag_src_query (GstPad * pad,
-    GstQueryType type, GstFormat * format, gint64 * value);
+static gboolean gst_id3_tag_src_query (GstPad * pad, GstQuery * query);
 
 static gboolean gst_id3_tag_sink_event (GstPad * pad, GstEvent * event);
 static GstFlowReturn gst_id3_tag_chain (GstPad * pad, GstBuffer * buffer);
@@ -429,43 +428,34 @@ gst_id3_tag_get_query_types (GstPad * pad)
 }
 
 static gboolean
-gst_id3_tag_src_query (GstPad * pad, GstQueryType type,
-    GstFormat * format, gint64 * value)
+gst_id3_tag_src_query (GstPad * pad, GstQuery * query)
 {
   gboolean res = FALSE;
   GstID3Tag *tag;
 
   tag = GST_ID3_TAG (gst_pad_get_parent (pad));
 
-  switch (type) {
-    case GST_QUERY_TOTAL:{
-      switch (*format) {
+  switch (GST_QUERY_TYPE (query)) {
+    case GST_QUERY_POSITION:{
+      GstFormat format;
+      gint64 current, total;
+
+      gst_query_parse_position (query, &format, NULL, NULL);
+      switch (format) {
         case GST_FORMAT_BYTES:
           if (GST_PAD_PEER (tag->sinkpad) &&
               tag->state == GST_ID3_TAG_STATE_NORMAL &&
-              gst_pad_query (GST_PAD_PEER (tag->sinkpad), GST_QUERY_TOTAL,
-                  format, value)) {
-            *value -= tag->v2tag_size + tag->v1tag_size;
-            *value += tag->v2tag_size_new + tag->v1tag_size_new;
-            res = TRUE;
-          }
-          break;
-        default:
-          break;
-      }
-      break;
-    }
-    case GST_QUERY_POSITION:
-      switch (*format) {
-        case GST_FORMAT_BYTES:
-          if (GST_PAD_PEER (tag->sinkpad) &&
-              gst_pad_query (GST_PAD_PEER (tag->sinkpad), GST_QUERY_POSITION,
-                  format, value)) {
+              gst_pad_query_position (GST_PAD_PEER (tag->sinkpad),
+                  &format, &current, &total)) {
+            total -= tag->v2tag_size + tag->v1tag_size;
+            total += tag->v2tag_size_new + tag->v1tag_size_new;
             if (tag->state == GST_ID3_TAG_STATE_NORMAL) {
-              *value -= tag->v2tag_size + tag->v2tag_size_new;
+              current -= tag->v2tag_size + tag->v2tag_size_new;
             } else {
-              *value = 0;
+              current = 0;
             }
+            gst_query_set_position (query, format, current, total);
+
             res = TRUE;
           }
           break;
@@ -473,6 +463,7 @@ gst_id3_tag_src_query (GstPad * pad, GstQueryType type,
           break;
       }
       break;
+    }
     default:
       break;
   }

diff --git a/ext/mad/gstmad.c b/ext/mad/gstmad.c
index 1f686db227e4671bea063b28e08a888994e02244..246f41e2c045d6191e943f4ed72721d5d3940196 100644 (file)
--- a/ext/mad/gstmad.c
+++ b/ext/mad/gstmad.c
@@ -1494,8 +1494,8 @@ gst_mad_chain (GstPad * pad, GstBuffer * buffer)
         if (GST_CLOCK_TIME_IS_VALID (mad->last_ts)) {
           GstFormat format = GST_FORMAT_DEFAULT;
 
-          gst_pad_convert (mad->srcpad, GST_FORMAT_TIME, mad->last_ts, &format,
-              &mad->total_samples);
+          gst_pad_query_convert (mad->srcpad, GST_FORMAT_TIME, mad->last_ts,
+              &format, &mad->total_samples);
           mad->last_ts = GST_CLOCK_TIME_NONE;
         }
         time_offset = mad->total_samples * GST_SECOND / mad->rate;