Fix for stream lock updates.

Original commit message from CVS:
* ext/faac/gstfaac.c: (gst_faac_sink_event):
* gst/qtdemux/qtdemux.c: (gst_qtdemux_handle_src_event):
* gst/tta/gstttaparse.c: (gst_tta_parse_src_event):
Fix for stream lock updates.

diff --git a/ChangeLog b/ChangeLog
index 92ebc53c7662b13cae7f2da66b9538fbc14c72e1..aa2c7ce2ba657f63a59aa32d050ab1fb9a23d454 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-11-21  Wim Taymans  <wim@fluendo.com>
+
+       * ext/faac/gstfaac.c: (gst_faac_sink_event):
+       * gst/qtdemux/qtdemux.c: (gst_qtdemux_handle_src_event):
+       * gst/tta/gstttaparse.c: (gst_tta_parse_src_event):
+       Fix for stream lock updates.
+
 2005-11-21  Tim-Philipp Müller  <tim at centricular dot net>
 
        * gst/qtdemux/qtdemux.c: (qtdemux_video_caps):

diff --git a/ext/faac/gstfaac.c b/ext/faac/gstfaac.c
index 52ce8177d40f450965f3e8efea7cc50b56c8ee0e..f89ad751bbfe9d2560e15856144b5c6c00e48dea 100644 (file)
--- a/ext/faac/gstfaac.c
+++ b/ext/faac/gstfaac.c
@@ -431,8 +431,6 @@ gst_faac_sink_event (GstPad * pad, GstEvent * event)
     {
       GstBuffer *outbuf;
 
-      GST_STREAM_LOCK (pad);
-
       /* flush first */
       ret = TRUE;
       do {
@@ -455,18 +453,13 @@ gst_faac_sink_event (GstPad * pad, GstEvent * event)
       } while (ret);
 
       ret = gst_pad_event_default (pad, event);
-      GST_STREAM_UNLOCK (pad);
       break;
     }
     case GST_EVENT_NEWSEGMENT:
-      GST_STREAM_LOCK (pad);
       ret = gst_pad_push_event (faac->srcpad, event);
-      GST_STREAM_UNLOCK (pad);
       break;
     case GST_EVENT_TAG:
-      GST_STREAM_LOCK (pad);
       ret = gst_pad_event_default (pad, event);
-      GST_STREAM_UNLOCK (pad);
       break;
     default:
       ret = gst_pad_event_default (pad, event);

diff --git a/gst/qtdemux/qtdemux.c b/gst/qtdemux/qtdemux.c
index 9a59855444496391eff801cbe9b9fb4e1ace1d13..8d0d5c3e3af9b4d2ec0f20b12085627a90dde8f5 100644 (file)
--- a/gst/qtdemux/qtdemux.c
+++ b/gst/qtdemux/qtdemux.c
@@ -358,7 +358,7 @@ gst_qtdemux_handle_src_event (GstPad * pad, GstEvent * event)
           }
 
           gst_pad_event_default (pad, gst_event_new_flush_start ());
-          GST_STREAM_LOCK (pad);
+          GST_PAD_STREAM_LOCK (pad);
 
           /* resync to new time */
           for (n = 0; n < qtdemux->n_streams; n++) {
@@ -378,7 +378,7 @@ gst_qtdemux_handle_src_event (GstPad * pad, GstEvent * event)
           gst_pad_start_task (qtdemux->sinkpad,
               (GstTaskFunction) gst_qtdemux_loop_header, qtdemux->sinkpad);
 
-          GST_STREAM_UNLOCK (pad);
+          GST_PAD_STREAM_UNLOCK (pad);
           break;
         }
         default:

diff --git a/gst/tta/gstttaparse.c b/gst/tta/gstttaparse.c
index cb37ea0b541e5025f95da635244c0029aca924ed..e7d65164cb37cd06c8cdd55323f09b664be68744 100644 (file)
--- a/gst/tta/gstttaparse.c
+++ b/gst/tta/gstttaparse.c
@@ -187,7 +187,7 @@ gst_tta_parse_src_event (GstPad * pad, GstEvent * event)
         } else {
           gst_pad_pause_task (ttaparse->sinkpad);
         }
-        GST_STREAM_LOCK (ttaparse->sinkpad);
+        GST_PAD_STREAM_LOCK (ttaparse->sinkpad);
 
         switch (start_type) {
           case GST_SEEK_TYPE_CUR:
@@ -216,7 +216,7 @@ gst_tta_parse_src_event (GstPad * pad, GstEvent * event)
         gst_pad_start_task (ttaparse->sinkpad,
             (GstTaskFunction) gst_tta_parse_loop, ttaparse);
 
-        GST_STREAM_UNLOCK (ttaparse->sinkpad);
+        GST_PAD_STREAM_UNLOCK (ttaparse->sinkpad);
 
       } else {
         res = FALSE;