API change fix.

Original commit message from CVS:
* ext/dv/gstdvdemux.c: (gst_dvdemux_get_src_query_types),
(gst_dvdemux_src_query):
* ext/flac/gstflacdec.c: (gst_flacdec_length),
(gst_flacdec_src_query):
* ext/raw1394/gstdv1394src.c: (gst_dv1394src_query):
* ext/speex/gstspeexdec.c: (speex_dec_src_query):
* gst/avi/gstavidemux.c: (gst_avi_demux_handle_src_query):
* gst/debug/gstnavseek.c: (gst_navseek_seek):
* gst/debug/progressreport.c: (gst_progress_report_report):
* gst/matroska/ebml-read.c: (gst_ebml_read_get_length):
* gst/matroska/matroska-demux.c:
(gst_matroska_demux_handle_src_query):
* gst/matroska/matroska-mux.c: (gst_matroska_mux_start):
* gst/wavparse/gstwavparse.c: (gst_wavparse_handle_seek),
(gst_wavparse_stream_headers), (gst_wavparse_stream_data),
(gst_wavparse_pad_convert), (gst_wavparse_pad_query),
(gst_wavparse_srcpad_event):
API change fix.

3 files changed, 23 insertions, 10 deletions

diff --git a/gst/matroska/ebml-read.c b/gst/matroska/ebml-read.c
index 02d36d97..db8606aa 100644
--- a/gst/matroska/ebml-read.c
+++ b/gst/matroska/ebml-read.c
@@ -366,9 +366,9 @@ gint64
 gst_ebml_read_get_length (GstEbmlRead * ebml)
 {
   GstFormat fmt = GST_FORMAT_BYTES;
-  gint64 pos, end;
+  gint64 end;
 
-  if (!gst_pad_query_position (GST_PAD_PEER (ebml->sinkpad), &fmt, &pos, &end))
+  if (!gst_pad_query_duration (GST_PAD_PEER (ebml->sinkpad), &fmt, &end))
     g_return_val_if_reached (0);        ///// FIXME /////////
 
   if (fmt != GST_FORMAT_BYTES || end < 0)
diff --git a/gst/matroska/matroska-demux.c b/gst/matroska/matroska-demux.c
index 1b2d72dc..dbb81cc9 100644
--- a/gst/matroska/matroska-demux.c
+++ b/gst/matroska/matroska-demux.c
@@ -972,7 +972,7 @@ gst_matroska_demux_handle_src_query (GstPad * pad, GstQuery * query)
     {
       GstFormat format;
 
-      gst_query_parse_position (query, &format, NULL, NULL);
+      gst_query_parse_position (query, &format, NULL);
 
       if (format != GST_FORMAT_TIME) {
         GST_DEBUG ("only query position on TIME is supported");
@@ -980,12 +980,25 @@ gst_matroska_demux_handle_src_query (GstPad * pad, GstQuery * query)
       }
 
       GST_LOCK (demux);
+      gst_query_set_position (query, GST_FORMAT_TIME, demux->pos);
+      GST_UNLOCK (demux);
+
+      res = TRUE;
+      break;
+    }
+    case GST_QUERY_DURATION:
+    {
+      GstFormat format;
+
+      gst_query_parse_position (query, &format, NULL);
 
-      /* mabe we should only fill in the total time and let
-       * decoders fill in the current position? (like oggdemux) */
-      gst_query_set_position (query, GST_FORMAT_TIME, demux->pos,
-          demux->duration);
+      if (format != GST_FORMAT_TIME) {
+        GST_DEBUG ("only query duration on TIME is supported");
+        break;
+      }
 
+      GST_LOCK (demux);
+      gst_query_set_duration (query, GST_FORMAT_TIME, demux->duration);
       GST_UNLOCK (demux);
 
       res = TRUE;
diff --git a/gst/matroska/matroska-mux.c b/gst/matroska/matroska-mux.c
index 3d7944f9..ae2968b3 100644
--- a/gst/matroska/matroska-mux.c
+++ b/gst/matroska/matroska-mux.c
@@ -1034,12 +1034,12 @@ gst_matroska_mux_start (GstMatroskaMux * mux)
     thepad = collect_pad->collect.pad;
 
     /* Query the total length of the track. */
-    query = gst_query_new_position (GST_FORMAT_TIME);
+    query = gst_query_new_duration (GST_FORMAT_TIME);
     if (gst_pad_query (GST_PAD_PEER (thepad), query)) {
       GstFormat format;
-      gint64 cur, trackduration;
+      gint64 trackduration;
 
-      gst_query_parse_position (query, &format, &cur, &trackduration);
+      gst_query_parse_duration (query, &format, &trackduration);
 
       if ((gdouble) trackduration > duration) {
         duration = (gdouble) trackduration;