gst/base/gstbasesink.c: Some more debug.

Original commit message from CVS:
* gst/base/gstbasesink.c: (gst_base_sink_handle_object),
(gst_base_sink_get_position):
Some more debug.

* gst/gstbin.c: (message_check), (bin_replace_message),
(bin_remove_messages), (is_eos), (gst_bin_add_func),
(update_degree), (gst_bin_sort_iterator_next), (bin_bus_handler),
(bin_query_duration_init), (bin_query_duration_fold),
(bin_query_duration_done), (bin_query_generic_fold),
(gst_bin_query):
* tools/gst-launch.c: (main):
Remove old option.

diff --git a/ChangeLog b/ChangeLog
index 9a6ad52..05d2533 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2005-10-27  Wim Taymans  <wim@fluendo.com>
+
+       * gst/base/gstbasesink.c: (gst_base_sink_handle_object),
+       (gst_base_sink_get_position):
+       Some more debug.
+
+       * gst/gstbin.c: (message_check), (bin_replace_message),
+       (bin_remove_messages), (is_eos), (gst_bin_add_func),
+       (update_degree), (gst_bin_sort_iterator_next), (bin_bus_handler),
+       (bin_query_duration_init), (bin_query_duration_fold),
+       (bin_query_duration_done), (bin_query_generic_fold),
+       (gst_bin_query):
+       * tools/gst-launch.c: (main):
+       Remove old option.
+
 2005-10-26  Stefan Kost  <ensonic@users.sf.net>
 
        * examples/controller/audio-example.c: (main):

diff --git a/gst/base/gstbasesink.c b/gst/base/gstbasesink.c
index 9d5345a..b9dfaf9 100644 (file)
--- a/gst/base/gstbasesink.c
+++ b/gst/base/gstbasesink.c
@@ -689,11 +689,14 @@ gst_base_sink_handle_object (GstBaseSink * basesink, GstPad * pad,
     if (GST_IS_BUFFER (obj)) {
       GstBaseSinkClass *bclass;
       GstFlowReturn pres;
+      GstBuffer *buf = GST_BUFFER (obj);
+
+      GST_DEBUG_OBJECT (basesink, "preroll buffer %" GST_TIME_FORMAT,
+          GST_TIME_ARGS (GST_BUFFER_TIMESTAMP (buf)));
 
       bclass = GST_BASE_SINK_GET_CLASS (basesink);
       if (bclass->preroll)
-        if ((pres =
-                bclass->preroll (basesink, GST_BUFFER (obj))) != GST_FLOW_OK)
+        if ((pres = bclass->preroll (basesink, buf)) != GST_FLOW_OK)
           goto preroll_failed;
     }
   }

diff --git a/gst/gstbin.c b/gst/gstbin.c
index 2bf8e2d..4794466 100644 (file)
--- a/gst/gstbin.c
+++ b/gst/gstbin.c
@@ -1993,7 +1993,6 @@ gst_bin_query (GstElement * element, GstQuery * query)
                 duration);
             GST_UNLOCK (bin);
 
-
             gst_query_set_duration (query, qformat, duration);
             res = TRUE;
             goto exit;

diff --git a/libs/gst/base/gstbasesink.c b/libs/gst/base/gstbasesink.c
index 9d5345a..b9dfaf9 100644 (file)
--- a/libs/gst/base/gstbasesink.c
+++ b/libs/gst/base/gstbasesink.c
@@ -689,11 +689,14 @@ gst_base_sink_handle_object (GstBaseSink * basesink, GstPad * pad,
     if (GST_IS_BUFFER (obj)) {
       GstBaseSinkClass *bclass;
       GstFlowReturn pres;
+      GstBuffer *buf = GST_BUFFER (obj);
+
+      GST_DEBUG_OBJECT (basesink, "preroll buffer %" GST_TIME_FORMAT,
+          GST_TIME_ARGS (GST_BUFFER_TIMESTAMP (buf)));
 
       bclass = GST_BASE_SINK_GET_CLASS (basesink);
       if (bclass->preroll)
-        if ((pres =
-                bclass->preroll (basesink, GST_BUFFER (obj))) != GST_FLOW_OK)
+        if ((pres = bclass->preroll (basesink, buf)) != GST_FLOW_OK)
           goto preroll_failed;
     }
   }

diff --git a/tools/gst-launch.c b/tools/gst-launch.c
index 72ae90d..2e9b9e4 100644 (file)
--- a/tools/gst-launch.c
+++ b/tools/gst-launch.c
@@ -59,7 +59,6 @@ static void sigint_restore (void);
 static gboolean caught_intr = FALSE;
 #endif
 
-static gint max_iterations = 0;
 static GstElement *pipeline;
 static gboolean caught_error = FALSE;
 static gboolean tags = FALSE;
@@ -507,8 +506,6 @@ main (int argc, char *argv[])
         N_("Do not install a fault handler"), NULL},
     {"trace", 'T', 0, G_OPTION_ARG_NONE, &trace,
         N_("Print alloc trace (if enabled at compile time)"), NULL},
-    {"iterations", 'i', 0, G_OPTION_ARG_INT, &max_iterations,
-        N_("Number of times to iterate pipeline"), NULL},
     {NULL}
   };
   GOptionContext *ctx;