summaryrefslogtreecommitdiffstats
path: root/ext/speex
diff options
context:
space:
mode:
authorWim Taymans <wim.taymans@gmail.com>2005-10-19 15:57:04 +0000
committerWim Taymans <wim.taymans@gmail.com>2005-10-19 15:57:04 +0000
commitba7ee6ae6cc73b5620b517e03ddac8a2b4badb90 (patch)
treea950dccd74a3f01c613ce5c89fe37529869b7dad /ext/speex
parent97f39d46478583613258d50acdc209e5c489a969 (diff)
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.
Diffstat (limited to 'ext/speex')
-rw-r--r--ext/speex/gstspeexdec.c51
1 files changed, 36 insertions, 15 deletions
diff --git a/ext/speex/gstspeexdec.c b/ext/speex/gstspeexdec.c
index adf00790..c495cf1d 100644
--- a/ext/speex/gstspeexdec.c
+++ b/ext/speex/gstspeexdec.c
@@ -211,23 +211,44 @@ speex_dec_convert (GstPad * pad,
static gboolean
speex_dec_src_query (GstPad * pad, GstQuery * query)
{
- gint64 samples_out = 0, total_samples;
GstSpeexDec *dec = GST_SPEEXDEC (GST_OBJECT_PARENT (pad));
- GstFormat my_format = GST_FORMAT_TIME;
- GstPad *peer;
- if (GST_QUERY_TYPE (query) != GST_QUERY_POSITION)
- return FALSE;
- if (!(peer = gst_pad_get_peer (dec->sinkpad)))
- return FALSE;
- gst_pad_query_position (peer, &my_format, NULL, &total_samples);
- gst_object_unref (peer);
- samples_out = dec->samples_out;
- speex_dec_convert (dec->srcpad, GST_FORMAT_DEFAULT, samples_out,
- &my_format, &samples_out);
- speex_dec_convert (dec->srcpad, GST_FORMAT_DEFAULT, total_samples,
- &my_format, &total_samples);
- gst_query_set_position (query, GST_FORMAT_TIME, samples_out, total_samples);
+ switch (GST_QUERY_TYPE (query)) {
+ case GST_QUERY_POSITION:
+ {
+ gint64 cur;
+ GstFormat format;
+
+ gst_query_parse_position (query, &format, NULL);
+
+ speex_dec_convert (dec->srcpad, GST_FORMAT_DEFAULT, dec->samples_out,
+ &format, &cur);
+
+ gst_query_set_position (query, format, cur);
+ break;
+ }
+ case GST_QUERY_DURATION:
+ {
+ GstPad *peer;
+ GstFormat my_format = GST_FORMAT_TIME;
+ gint64 total_samples;
+
+ if (!(peer = gst_pad_get_peer (dec->sinkpad)))
+ return FALSE;
+
+ gst_pad_query_duration (peer, &my_format, &total_samples);
+ gst_object_unref (peer);
+
+ speex_dec_convert (dec->srcpad, GST_FORMAT_DEFAULT, total_samples,
+ &my_format, &total_samples);
+
+ gst_query_set_duration (query, GST_FORMAT_TIME, total_samples);
+ break;
+ }
+ default:
+ return FALSE;
+ break;
+ }
return TRUE;
}