summaryrefslogtreecommitdiff
authorSebastian Dröge <sebastian.droege@collabora.co.uk>2010-08-26 21:39:06 (GMT)
committer Sebastian Dröge <sebastian.droege@collabora.co.uk>2010-08-27 14:59:09 (GMT)
commit2e6f80bf8120628be1f8a7d0181ba3999689a251 (patch) (side-by-side diff)
tree7837f8e23419725708a58bbaca82207fda8d5d9c
parent2dfb0d2772eec352eac20656b7e12f626eb50c76 (diff)
downloadgstreamer-2e6f80bf8120628be1f8a7d0181ba3999689a251.zip
gstreamer-2e6f80bf8120628be1f8a7d0181ba3999689a251.tar.gz
elements: Stop using GST_FLOW_IS_FATAL()
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--plugins/elements/gstmultiqueue.c2
-rw-r--r--plugins/elements/gstqueue.c3
-rw-r--r--plugins/elements/gstqueue2.c7
3 files changed, 5 insertions, 7 deletions
diff --git a/plugins/elements/gstmultiqueue.c b/plugins/elements/gstmultiqueue.c
index b9fa663..d9bbba9 100644
--- a/plugins/elements/gstmultiqueue.c
+++ b/plugins/elements/gstmultiqueue.c
@@ -1123,7 +1123,7 @@ out_flushing:
/* upstream needs to see fatal result ASAP to shut things down,
* but might be stuck in one of our other full queues;
* 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);
single_queue_underrun_cb (sq->queue, sq);
}
diff --git a/plugins/elements/gstqueue.c b/plugins/elements/gstqueue.c
index 0306b04..34d08ed 100644
--- a/plugins/elements/gstqueue.c
+++ b/plugins/elements/gstqueue.c
@@ -1234,8 +1234,7 @@ out_flushing:
GST_QUEUE_MUTEX_UNLOCK (queue);
/* let app know about us giving up if upstream is not expected to do so */
/* 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,
(_("Internal data flow error.")),
("streaming task paused, reason %s (%d)",
diff --git a/plugins/elements/gstqueue2.c b/plugins/elements/gstqueue2.c
index c56f887..bb09e5a 100644
--- a/plugins/elements/gstqueue2.c
+++ b/plugins/elements/gstqueue2.c
@@ -2303,8 +2303,7 @@ out_flushing:
GST_QUEUE2_MUTEX_UNLOCK (queue);
/* let app know about us giving up if upstream is not expected to do so */
/* 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,
(_("Internal data flow error.")),
("streaming task paused, reason %s (%d)",
@@ -2684,7 +2683,7 @@ gst_queue2_src_activate_pull (GstPad * pad, gboolean active)
result = gst_queue2_open_temp_location_file (queue);
} else if (!queue->ring_buffer) {
queue->ring_buffer = g_malloc (queue->ring_buffer_max_size);
- result = !!queue->ring_buffer;
+ result = ! !queue->ring_buffer;
} else {
result = TRUE;
}
@@ -2887,7 +2886,7 @@ gst_queue2_set_property (GObject * object,
break;
case PROP_RING_BUFFER_MAX_SIZE:
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;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);