mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-27 20:21:24 +00:00
Code Issues 1 Projects Releases Wiki Activity

Remove hacks for older core. Require newer core version accordingly.

Browse source 
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.
This commit is contained in:
Ronald S. Bultje 2004-11-25 20:09:53 +00:00
parent 431ef9fdb3
commit 2b39885ed9
4 changed files with 12 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,11 @@
2004-11-25 Ronald S. Bultje <rbultje@ronald.bitfreak.net>
* 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 <rbultje@ronald.bitfreak.net>
* gst/cdxaparse/Makefile.am:

2
configure.ac
View file

@ -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")

13
gst/playback/gstplaybasebin.c
View file

@ -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");
}

6
gst/typefind/gsttypefindfunctions.c
View file

@ -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;