summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--ext/flac/gstflacdec.c36
2 files changed, 23 insertions, 19 deletions
diff --git a/ChangeLog b/ChangeLog
index cba894a5..e3c0c1a4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2004-07-02 David Schleef <ds@schleef.org>
+ * ext/flac/gstflacdec.c: (gst_flacdec_class_init),
+ (gst_flacdec_write): Actually, GST_PAD_CAPS() has nothing to
+ do with the logic.
+
+2004-07-02 David Schleef <ds@schleef.org>
+
* ext/flac/gstflacdec.c: (gst_flacdec_write): Set duration on
output buffers. Fix logic mistake. (bug #144866)
diff --git a/ext/flac/gstflacdec.c b/ext/flac/gstflacdec.c
index 1a7852e9..ace9a4b8 100644
--- a/ext/flac/gstflacdec.c
+++ b/ext/flac/gstflacdec.c
@@ -467,26 +467,24 @@ gst_flacdec_write (const FLAC__SeekableStreamDecoder * decoder,
flacdec->need_discont = FALSE;
- if (GST_PAD_CAPS (flacdec->srcpad)) {
- if (flacdec->seek_pending) {
- flacdec->total_samples = flacdec->seek_value;
- }
-
- if (GST_PAD_IS_USABLE (flacdec->srcpad)) {
- GST_DEBUG ("send discont");
-
- format = GST_FORMAT_TIME;
- gst_pad_convert (flacdec->srcpad, GST_FORMAT_DEFAULT,
- flacdec->total_samples, &format, &time);
- format = GST_FORMAT_BYTES;
- gst_pad_convert (flacdec->srcpad, GST_FORMAT_DEFAULT,
- flacdec->total_samples, &format, &bytes);
- discont = gst_event_new_discontinuous (FALSE, GST_FORMAT_TIME, time,
- GST_FORMAT_BYTES, bytes,
- GST_FORMAT_DEFAULT, flacdec->total_samples, NULL);
+ if (flacdec->seek_pending) {
+ flacdec->total_samples = flacdec->seek_value;
+ }
- gst_pad_push (flacdec->srcpad, GST_DATA (discont));
- }
+ if (GST_PAD_IS_USABLE (flacdec->srcpad)) {
+ GST_DEBUG ("send discont");
+
+ format = GST_FORMAT_TIME;
+ gst_pad_convert (flacdec->srcpad, GST_FORMAT_DEFAULT,
+ flacdec->total_samples, &format, &time);
+ format = GST_FORMAT_BYTES;
+ gst_pad_convert (flacdec->srcpad, GST_FORMAT_DEFAULT,
+ flacdec->total_samples, &format, &bytes);
+ discont = gst_event_new_discontinuous (FALSE, GST_FORMAT_TIME, time,
+ GST_FORMAT_BYTES, bytes,
+ GST_FORMAT_DEFAULT, flacdec->total_samples, NULL);
+
+ gst_pad_push (flacdec->srcpad, GST_DATA (discont));
}
}