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 ?

diff --git a/gst/gstqueue.c b/gst/gstqueue.c
index 48d6b55..7807ec4 100644 (file)
--- 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 (file)
--- 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) {