From d1d3d5344f82d3d198b5258e4c558878d8282303 Mon Sep 17 00:00:00 2001 From: Thomas Vander Stichele Date: Mon, 31 Dec 2001 15:54:42 +0000 Subject: [PATCH] can someone fix this better than me and remove FIXME's ? Original commit message from CVS: can someone fix this better than me and remove FIXME's ? --- gst/gstqueue.c | 10 ++++++++-- plugins/elements/gstqueue.c | 10 ++++++++-- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/gst/gstqueue.c b/gst/gstqueue.c index 48d6b55..7807ec4 100644 --- a/gst/gstqueue.c +++ b/gst/gstqueue.c @@ -355,8 +355,11 @@ restart: while (GST_STATE_PENDING (queue) != GST_STATE_VOID_PENDING) { GST_DEBUG_ELEMENT (GST_CAT_DATAFLOW, queue, "interrupted!!\n"); g_mutex_unlock (queue->qlock); + /* FIXME: gst_element_interrupt doesn't return anything if (gst_element_interrupt (GST_ELEMENT (queue))) return; + */ + gst_element_interrupt (GST_ELEMENT (queue)); goto restart; } if (GST_STATE (queue) != GST_STATE_PLAYING) { @@ -439,8 +442,11 @@ restart: while (GST_STATE_PENDING (queue) != GST_STATE_VOID_PENDING) { GST_DEBUG_ELEMENT (GST_CAT_DATAFLOW, queue, "interrupted!!\n"); g_mutex_unlock (queue->qlock); - if (gst_element_interrupt (GST_ELEMENT (queue))) - return NULL; + /* FIXME: gst_element_interrupt doesn't return anything + if (gst_element_interrupt (GST_ELEMENT (queue))) + return; + */ + gst_element_interrupt (GST_ELEMENT (queue)); goto restart; } if (GST_STATE (queue) != GST_STATE_PLAYING) { diff --git a/plugins/elements/gstqueue.c b/plugins/elements/gstqueue.c index 48d6b55..7807ec4 100644 --- a/plugins/elements/gstqueue.c +++ b/plugins/elements/gstqueue.c @@ -355,8 +355,11 @@ restart: while (GST_STATE_PENDING (queue) != GST_STATE_VOID_PENDING) { GST_DEBUG_ELEMENT (GST_CAT_DATAFLOW, queue, "interrupted!!\n"); g_mutex_unlock (queue->qlock); + /* FIXME: gst_element_interrupt doesn't return anything if (gst_element_interrupt (GST_ELEMENT (queue))) return; + */ + gst_element_interrupt (GST_ELEMENT (queue)); goto restart; } if (GST_STATE (queue) != GST_STATE_PLAYING) { @@ -439,8 +442,11 @@ restart: while (GST_STATE_PENDING (queue) != GST_STATE_VOID_PENDING) { GST_DEBUG_ELEMENT (GST_CAT_DATAFLOW, queue, "interrupted!!\n"); g_mutex_unlock (queue->qlock); - if (gst_element_interrupt (GST_ELEMENT (queue))) - return NULL; + /* FIXME: gst_element_interrupt doesn't return anything + if (gst_element_interrupt (GST_ELEMENT (queue))) + return; + */ + gst_element_interrupt (GST_ELEMENT (queue)); goto restart; } if (GST_STATE (queue) != GST_STATE_PLAYING) { -- 2.7.4