gst/switch/gstswitch.c (gst_switch_set_property): Don't push buffers from app thread...

Original commit message from CVS:
2007-12-05  Andy Wingo  <wingo@pobox.com>

* gst/switch/gstswitch.c (gst_switch_set_property): Don't push
buffers from app thread when unsetting `queue-buffers', it's
dangerous and the chain function will do it for us anyway.

diff --git a/ChangeLog b/ChangeLog
index 0c60cd9262c7fd4f5936cc248ddf34e65f8ba1b0..4761020657b498c52bdaba86ce874b6bbb55360e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-12-05  Andy Wingo  <wingo@pobox.com>
+
+       * gst/switch/gstswitch.c (gst_switch_set_property): Don't push
+       buffers from app thread when unsetting `queue-buffers', it's
+       dangerous and the chain function will do it for us anyway.
+
 2007-12-04  Edgard Lima  <edgard.lima@indt.org.br>
 
        * ext/metadata/metadatamuxjpeg.c: (metadatamux_wrap_chunk),

diff --git a/gst/switch/gstswitch.c b/gst/switch/gstswitch.c
index 4fce29e7777b63dfcf63fa904cef1738de32b923..9d9ff240eeddce2a526aa509ccde6f3f2c07220b 100644 (file)
--- a/gst/switch/gstswitch.c
+++ b/gst/switch/gstswitch.c
@@ -513,23 +513,6 @@ gst_switch_set_property (GObject * object, guint prop_id,
     case ARG_QUEUE_BUFFERS:
       GST_SWITCH_LOCK (gstswitch);
       gstswitch->queue_buffers = g_value_get_boolean (value);
-      if (!gstswitch->queue_buffers && !gstswitch->need_to_send_newsegment) {
-        GList *buffers;
-
-        /* send all the stored buffers if any */
-        buffers =
-            g_hash_table_lookup (gstswitch->stored_buffers,
-            gstswitch->active_sinkpad);
-        while (buffers != NULL) {
-          gst_buffer_ref (GST_BUFFER (buffers->data));
-          GST_SWITCH_UNLOCK (gstswitch);
-          gst_pad_push (gstswitch->srcpad, GST_BUFFER (buffers->data));
-          GST_SWITCH_LOCK (gstswitch);
-          buffers = buffers->next;
-        }
-        g_hash_table_remove (gstswitch->stored_buffers,
-            gstswitch->active_sinkpad);
-      }
       GST_SWITCH_UNLOCK (gstswitch);
       break;
     default: