ext/pango/gsttextoverlay.c: Stick to seeking theory until i find the bug.

Original commit message from CVS:
2006-02-06  Julien MOUTTE  <julien@moutte.net>

* ext/pango/gsttextoverlay.c: (gst_text_overlay_src_event):
Stick to seeking theory until i find the bug.
* gst/subparse/gstsubparse.c: (parse_subrip): Fix debug.

diff --git a/ChangeLog b/ChangeLog
index a52b0873ccb168c74363dd6f8f99143edd81862d..92a0c0b38f9d85c91d27e5e4e9d2bf6085002fd1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-02-06  Julien MOUTTE  <julien@moutte.net>
+
+       * ext/pango/gsttextoverlay.c: (gst_text_overlay_src_event): 
+       Stick to seeking theory until i find the bug.
+       * gst/subparse/gstsubparse.c: (parse_subrip): Fix debug.
+
 2006-02-06  Jan Schmidt  <thaytan@mad.scientist.com>
 
        * ext/theora/theoraenc.c: (gst_theora_enc_class_init),

diff --git a/ext/pango/gsttextoverlay.c b/ext/pango/gsttextoverlay.c
index f3ea67c7925ad6857b5740da458f5fb462c17ad6..fb9a36c0ba61b7729118ab6388d8f4eefc4a9f71 100644 (file)
--- a/ext/pango/gsttextoverlay.c
+++ b/ext/pango/gsttextoverlay.c
@@ -528,11 +528,6 @@ gst_text_overlay_src_event (GstPad * pad, GstEvent * event)
       /* Stopping collect pads */
       gst_collect_pads_stop (overlay->collect);
 
-      /* Flush upstream, this is required so that we can take the stream lock
-         safely */
-      gst_pad_push_event (overlay->video_sinkpad, gst_event_new_flush_start ());
-      gst_pad_push_event (overlay->text_sinkpad, gst_event_new_flush_start ());
-
       /* Acquire stream lock */
       GST_PAD_STREAM_LOCK (overlay->video_sinkpad);
       GST_PAD_STREAM_LOCK (overlay->text_sinkpad);
@@ -546,10 +541,6 @@ gst_text_overlay_src_event (GstPad * pad, GstEvent * event)
         gst_event_unref (event);
       }
 
-      /* Stop flushing upstream */
-      gst_pad_push_event (overlay->video_sinkpad, gst_event_new_flush_stop ());
-      gst_pad_push_event (overlay->text_sinkpad, gst_event_new_flush_stop ());
-
       /* Start collect pads again */
       gst_collect_pads_start (overlay->collect);
 

diff --git a/gst/subparse/gstsubparse.c b/gst/subparse/gstsubparse.c
index cbfc10af96a7e3324b1bce3d6fb66dde0d81bc29..16cccb0ccb3e524decf08e448419610f40e47b38 100644 (file)
--- a/gst/subparse/gstsubparse.c
+++ b/gst/subparse/gstsubparse.c
@@ -408,7 +408,7 @@ parse_subrip (ParserState * state, const gchar * line)
             (((guint64) h2) * 3600 + m2 * 60 + s2) * GST_SECOND +
             ms2 * GST_MSECOND - state->start_time;
       } else {
-        GST_DEBUG (0, "error parsing subrip time line");
+        GST_DEBUG ("error parsing subrip time line");
         state->state = 0;
       }
       return NULL;