Make sure we interrupt the right scheduler on the right pad.

Original commit message from CVS:
Make sure we interrupt the right scheduler on the right pad.

diff --git a/gst/gstqueue.c b/gst/gstqueue.c
index e42dfe0..f2ca083 100644 (file)
--- a/gst/gstqueue.c
+++ b/gst/gstqueue.c
@@ -370,7 +370,7 @@ restart:
       if (queue->interrupt) {
         GST_DEBUG_ELEMENT (GST_CAT_DATAFLOW, queue, "interrupted!!");
         g_mutex_unlock (queue->qlock);
-       if (gst_element_interrupt (GST_ELEMENT (queue)))
+       if (gst_scheduler_interrupt (GST_RPAD_SCHED (queue->sinkpad), GST_ELEMENT (queue)))
           return;
        goto restart;
       }
@@ -456,7 +456,7 @@ restart:
     if (queue->interrupt) {
       GST_DEBUG_ELEMENT (GST_CAT_DATAFLOW, queue, "interrupted!!");
       g_mutex_unlock (queue->qlock);
-      if (gst_element_interrupt (GST_ELEMENT (queue)))
+      if (gst_scheduler_interrupt (GST_RPAD_SCHED (queue->srcpad), GST_ELEMENT (queue)))
         return NULL;
       goto restart;
     }

diff --git a/plugins/elements/gstqueue.c b/plugins/elements/gstqueue.c
index e42dfe0..f2ca083 100644 (file)
--- a/plugins/elements/gstqueue.c
+++ b/plugins/elements/gstqueue.c
@@ -370,7 +370,7 @@ restart:
       if (queue->interrupt) {
         GST_DEBUG_ELEMENT (GST_CAT_DATAFLOW, queue, "interrupted!!");
         g_mutex_unlock (queue->qlock);
-       if (gst_element_interrupt (GST_ELEMENT (queue)))
+       if (gst_scheduler_interrupt (GST_RPAD_SCHED (queue->sinkpad), GST_ELEMENT (queue)))
           return;
        goto restart;
       }
@@ -456,7 +456,7 @@ restart:
     if (queue->interrupt) {
       GST_DEBUG_ELEMENT (GST_CAT_DATAFLOW, queue, "interrupted!!");
       g_mutex_unlock (queue->qlock);
-      if (gst_element_interrupt (GST_ELEMENT (queue)))
+      if (gst_scheduler_interrupt (GST_RPAD_SCHED (queue->srcpad), GST_ELEMENT (queue)))
         return NULL;
       goto restart;
     }