From c33e70af70a3c43d9b53c6695fa60da03157ef10 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= Date: Mon, 6 Sep 2010 23:51:23 +0100 Subject: [PATCH] siddec: don't use GST_FLOW_IS_FATAL GST_FLOW_IS_FATAL has been deprecated in core git. --- ext/sidplay/gstsiddec.cc | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/ext/sidplay/gstsiddec.cc b/ext/sidplay/gstsiddec.cc index 0b2c8f7bee..308d529a54 100644 --- a/ext/sidplay/gstsiddec.cc +++ b/ext/sidplay/gstsiddec.cc @@ -430,20 +430,18 @@ pause: { const gchar *reason = gst_flow_get_name (ret); - GST_DEBUG_OBJECT (siddec, "pausing task, reason %s", reason); - gst_pad_pause_task (pad); - - if (GST_FLOW_IS_FATAL (ret) || ret == GST_FLOW_NOT_LINKED) { - if (ret == GST_FLOW_UNEXPECTED) { - /* perform EOS logic, FIXME, segment seek? */ - gst_pad_push_event (pad, gst_event_new_eos ()); - } else { - /* for fatal errors we post an error message */ - GST_ELEMENT_ERROR (siddec, STREAM, FAILED, - (NULL), ("streaming task paused, reason %s", reason)); - gst_pad_push_event (pad, gst_event_new_eos ()); - } + if (ret == GST_FLOW_UNEXPECTED) { + /* perform EOS logic, FIXME, segment seek? */ + gst_pad_push_event (pad, gst_event_new_eos ()); + } else if (ret < GST_FLOW_UNEXPECTED || ret == GST_FLOW_NOT_LINKED) { + /* for fatal errors we post an error message */ + GST_ELEMENT_ERROR (siddec, STREAM, FAILED, + (NULL), ("streaming task paused, reason %s", reason)); + gst_pad_push_event (pad, gst_event_new_eos ()); } + + GST_INFO_OBJECT (siddec, "pausing task, reason: %s", reason); + gst_pad_pause_task (pad); goto done; } }