diff options
| author | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2010-08-26 23:39:06 +0200 |
|---|---|---|
| committer | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2010-08-27 16:59:09 +0200 |
| commit | 2e6f80bf8120628be1f8a7d0181ba3999689a251 (patch) | |
| tree | 7837f8e23419725708a58bbaca82207fda8d5d9c | |
| parent | 2dfb0d2772eec352eac20656b7e12f626eb50c76 (diff) | |
elements: Stop using GST_FLOW_IS_FATAL()
| -rw-r--r-- | plugins/elements/gstmultiqueue.c | 2 | ||||
| -rw-r--r-- | plugins/elements/gstqueue.c | 3 | ||||
| -rw-r--r-- | plugins/elements/gstqueue2.c | 7 |
3 files changed, 5 insertions, 7 deletions
diff --git a/plugins/elements/gstmultiqueue.c b/plugins/elements/gstmultiqueue.c index b9fa663e7f..d9bbba9560 100644 --- a/plugins/elements/gstmultiqueue.c +++ b/plugins/elements/gstmultiqueue.c @@ -1125,3 +1125,3 @@ out_flushing: * so empty this one and trigger dynamic queue growth */ - if (GST_FLOW_IS_FATAL (sq->srcresult)) { + if (sq->srcresult <= GST_FLOW_UNEXPECTED) { gst_data_queue_flush (sq->queue); diff --git a/plugins/elements/gstqueue.c b/plugins/elements/gstqueue.c index 0306b04902..34d08ed5ef 100644 --- a/plugins/elements/gstqueue.c +++ b/plugins/elements/gstqueue.c @@ -1236,4 +1236,3 @@ out_flushing: /* UNEXPECTED is already taken care of elsewhere */ - if (eos && (GST_FLOW_IS_FATAL (ret) || ret == GST_FLOW_NOT_LINKED) && - (ret != GST_FLOW_UNEXPECTED)) { + if (eos && (ret == GST_FLOW_NOT_LINKED || ret < GST_FLOW_UNEXPECTED)) { GST_ELEMENT_ERROR (queue, STREAM, FAILED, diff --git a/plugins/elements/gstqueue2.c b/plugins/elements/gstqueue2.c index c56f887cc0..bb09e5a0a2 100644 --- a/plugins/elements/gstqueue2.c +++ b/plugins/elements/gstqueue2.c @@ -2305,4 +2305,3 @@ out_flushing: /* UNEXPECTED is already taken care of elsewhere */ - if (eos && (GST_FLOW_IS_FATAL (ret) || ret == GST_FLOW_NOT_LINKED) && - (ret != GST_FLOW_UNEXPECTED)) { + if (eos && (ret == GST_FLOW_NOT_LINKED || ret < GST_FLOW_UNEXPECTED)) { GST_ELEMENT_ERROR (queue, STREAM, FAILED, @@ -2686,3 +2685,3 @@ gst_queue2_src_activate_pull (GstPad * pad, gboolean active) queue->ring_buffer = g_malloc (queue->ring_buffer_max_size); - result = !!queue->ring_buffer; + result = ! !queue->ring_buffer; } else { @@ -2889,3 +2888,3 @@ gst_queue2_set_property (GObject * object, queue->ring_buffer_max_size = g_value_get_uint64 (value); - queue->use_ring_buffer = !!queue->ring_buffer_max_size; + queue->use_ring_buffer = ! !queue->ring_buffer_max_size; break; |