From b64fd034a58ad433ad489d2748a72abfc3ef0d6a Mon Sep 17 00:00:00 2001
From: Sebastian Dröge <slomo@circular-chaos.org>
Date: Wed, 2 May 2007 17:08:09 +0000
Subject: ext/flac/gstflacdec.c: Correctly post an error on the bus if
 something went wrong in the loop function. This fixes a ...

Original commit message from CVS:
* ext/flac/gstflacdec.c: (gst_flac_dec_loop):
Correctly post an error on the bus if something went wrong in the loop
function. This fixes a few cases where the task was paused and nothing
happened anymore.
---
 ext/flac/gstflacdec.c | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

(limited to 'ext')

diff --git a/ext/flac/gstflacdec.c b/ext/flac/gstflacdec.c
index 1cf238ea..4da09eff 100644
--- a/ext/flac/gstflacdec.c
+++ b/ext/flac/gstflacdec.c
@@ -52,6 +52,7 @@
 #include <string.h>
 
 #include "gstflacdec.h"
+#include <gst/gst-i18n-plugin.h>
 #include <gst/gsttagsetter.h>
 
 #include <gst/tag/tag.h>
@@ -931,10 +932,14 @@ analyze_state:
     case FLAC__SEEKABLE_STREAM_DECODER_SEEKING:{
       GST_DEBUG_OBJECT (flacdec, "everything ok");
 
-      if (flacdec->last_flow != GST_FLOW_OK &&
-          flacdec->last_flow != GST_FLOW_NOT_LINKED) {
-        GST_DEBUG_OBJECT (flacdec, "last_flow return was %s, pausing",
-            gst_flow_get_name (flacdec->last_flow));
+      if (GST_FLOW_IS_FATAL (flacdec->last_flow) ||
+          flacdec->last_flow == GST_FLOW_NOT_LINKED) {
+        GST_ELEMENT_ERROR (flacdec, STREAM, FAILED,
+            (_("Internal data stream error.")),
+            ("stream stopped, reason %s",
+                gst_flow_get_name (flacdec->last_flow)));
+        goto eos_and_pause;
+      } else if (flacdec->last_flow != GST_FLOW_OK) {
         goto pause;
       }
 
-- 
cgit