gst/playback/gstplaybasebin.c: We can remove this hack now.

Original commit message from CVS:
* gst/playback/gstplaybasebin.c: (gst_play_base_bin_add_element):
We can remove this hack now.

diff --git a/ChangeLog b/ChangeLog
index 6391093..4618d48 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2004-11-08  Wim Taymans  <wim@fluendo.com>
 
+       * gst/playback/gstplaybasebin.c: (gst_play_base_bin_add_element):
+       We can remove this hack now.
+
+2004-11-08  Wim Taymans  <wim@fluendo.com>
+
        * gst/videomixer/videomixer.c: (gst_videomixer_blend_ayuv_ayuv),
        (gst_videomixer_fill_checker), (gst_videomixer_fill_color),
        (gst_videomixer_blend_buffers), (gst_videomixer_loop):

diff --git a/gst/playback/gstplaybasebin.c b/gst/playback/gstplaybasebin.c
index 3e1905c..ed82210 100644 (file)
--- a/gst/playback/gstplaybasebin.c
+++ b/gst/playback/gstplaybasebin.c
@@ -1094,9 +1094,6 @@ gst_play_base_bin_add_element (GstBin * bin, GstElement * element)
   play_base_bin = GST_PLAY_BASE_BIN (bin);
 
   if (play_base_bin->thread) {
-    GstScheduler *sched;
-    GstClock *clock;
-
     if (play_base_bin->threaded) {
       gchar *name;
       GstElement *thread;
@@ -1109,16 +1106,6 @@ gst_play_base_bin_add_element (GstBin * bin, GstElement * element)
       element = thread;
     }
     gst_bin_add (GST_BIN (play_base_bin->thread), element);
-
-    /* hack, the clock is not correctly distributed in the core */
-    sched = gst_element_get_scheduler (GST_ELEMENT (play_base_bin->thread));
-    clock = gst_scheduler_get_clock (sched);
-    gst_scheduler_set_clock (sched, clock);
-
-    /* FIXME set element to READY so that negotiation can happen. This
-     * currently fails because of weird negotiation problems. */
-    //gst_element_set_state (element, GST_STATE_PLAYING);
-
   } else {
     g_warning ("adding elements is not allowed in NULL");
   }