summaryrefslogtreecommitdiffstats
path: root/ext/flac
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/flac
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/flac')
-rw-r--r--ext/flac/gstflacdec.c24
1 files changed, 17 insertions, 7 deletions
diff --git a/ext/flac/gstflacdec.c b/ext/flac/gstflacdec.c
index 3079c880..c609e2e5 100644
--- a/ext/flac/gstflacdec.c
+++ b/ext/flac/gstflacdec.c
@@ -359,7 +359,7 @@ gst_flacdec_length (const FLAC__SeekableStreamDecoder * decoder,
if (!(peer = gst_pad_get_peer (flacdec->sinkpad)))
return FLAC__SEEKABLE_STREAM_DECODER_TELL_STATUS_ERROR;
- gst_pad_query_position (peer, &fmt, NULL, &len);
+ gst_pad_query_duration (peer, &fmt, &len);
gst_object_unref (peer);
if (fmt != GST_FORMAT_BYTES || len == -1)
return FLAC__SEEKABLE_STREAM_DECODER_TELL_STATUS_ERROR;
@@ -706,20 +706,30 @@ gst_flacdec_src_query (GstPad * pad, GstQuery * query)
switch (GST_QUERY_TYPE (query)) {
case GST_QUERY_POSITION:{
- gint64 len, pos;
+ gint64 pos;
+ GstFormat fmt = GST_FORMAT_TIME;
+
+ pos = flacdec->total_samples;
+
+ if (gst_flacdec_convert_src (flacdec->srcpad,
+ GST_FORMAT_DEFAULT, pos, &fmt, &pos))
+ gst_query_set_position (query, GST_FORMAT_TIME, pos);
+ else
+ res = FALSE;
+ break;
+ }
+ case GST_QUERY_DURATION:{
+ gint64 len;
GstFormat fmt = GST_FORMAT_TIME;
if (flacdec->stream_samples == 0)
len = flacdec->total_samples;
else
len = flacdec->stream_samples;
- pos = flacdec->total_samples;
if (gst_flacdec_convert_src (flacdec->srcpad,
- GST_FORMAT_DEFAULT, len, &fmt, &len) &&
- gst_flacdec_convert_src (flacdec->srcpad,
- GST_FORMAT_DEFAULT, pos, &fmt, &pos))
- gst_query_set_position (query, GST_FORMAT_TIME, pos, len);
+ GST_FORMAT_DEFAULT, len, &fmt, &len))
+ gst_query_set_duration (query, GST_FORMAT_TIME, len);
else
res = FALSE;
break;