From 2b39885ed976562f3aea50bb57d98b999cf87287 Mon Sep 17 00:00:00 2001 From: "Ronald S. Bultje" Date: Thu, 25 Nov 2004 20:09:53 +0000 Subject: [PATCH] Remove hacks for older core. Require newer core version accordingly. Original commit message from CVS: * configure.ac: * gst/playback/gstplaybasebin.c: (gst_play_base_bin_add_element): * gst/typefind/gsttypefindfunctions.c: (mp3_type_find): Remove hacks for older core. Require newer core version accordingly. --- ChangeLog | 8 ++++++++ configure.ac | 2 +- gst/playback/gstplaybasebin.c | 13 ------------- gst/typefind/gsttypefindfunctions.c | 6 +++--- 4 files changed, 12 insertions(+), 17 deletions(-) diff --git a/ChangeLog b/ChangeLog index fc81b69..9c429c2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,13 @@ 2004-11-25 Ronald S. Bultje + * configure.ac: + * gst/playback/gstplaybasebin.c: (gst_play_base_bin_add_element): + * gst/typefind/gsttypefindfunctions.c: (mp3_type_find): + Remove hacks for older core. Require newer core version + accordingly. + +2004-11-25 Ronald S. Bultje + * gst/cdxaparse/Makefile.am: * gst/cdxaparse/gstcdxaparse.c: (gst_cdxaparse_get_type), (gst_cdxaparse_class_init), (gst_cdxaparse_init), diff --git a/configure.ac b/configure.ac index 1733339..025b85a 100644 --- a/configure.ac +++ b/configure.ac @@ -180,7 +180,7 @@ GST_CHECK_FEATURE(GCONF, [GConf libraries], , [ dnl check for gstreamer dnl uninstalled is selected preferentially -- see pkg-config(1) -GST_REQ=0.8.4 +GST_REQ=0.8.7.1 PKG_CHECK_MODULES(GST, gstreamer-$GST_MAJORMINOR >= $GST_REQ, HAVE_GST="yes", HAVE_GST="no") diff --git a/gst/playback/gstplaybasebin.c b/gst/playback/gstplaybasebin.c index 82dd296..f5c86fa 100644 --- a/gst/playback/gstplaybasebin.c +++ b/gst/playback/gstplaybasebin.c @@ -1174,9 +1174,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; @@ -1189,16 +1186,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"); } diff --git a/gst/typefind/gsttypefindfunctions.c b/gst/typefind/gsttypefindfunctions.c index bd5fbb2..35c6380 100644 --- a/gst/typefind/gsttypefindfunctions.c +++ b/gst/typefind/gsttypefindfunctions.c @@ -369,14 +369,14 @@ static GstStaticCaps mp3_caps = GST_STATIC_CAPS ("audio/mpeg, " static void mp3_type_find (GstTypeFind * tf, gpointer unused) { - /*guint64 length = gst_type_find_get_length (tf); */ + guint64 length = gst_type_find_get_length (tf); gint try; guint8 *data = NULL; guint size; guint64 skipped; - for (try = 0; try < 1 /* 2 */ ; try++) { - guint64 start_off = 0; /*(try == 0) ? 0 : length / 2; */ + for (try = 0; try < 2; try++) { + guint64 start_off = (try == 0) ? 0 : length / 2; if (try != 0 && start_off == 0) return; -- 2.7.4