summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWim Taymans <wim.taymans@gmail.com>2005-01-11 16:34:34 +0000
committerWim Taymans <wim.taymans@gmail.com>2005-01-11 16:34:34 +0000
commit31a54928663b461b79829517c7b16d518b1ffa25 (patch)
tree28813691e67bf715ec9b7161ad13f89bbbe70b2d
parentc94e7a02b5ef72cd6ecb3fe345632877c66574d3 (diff)
downloadgstreamer-plugins-base-31a54928663b461b79829517c7b16d518b1ffa25.tar.gz
No more bytestream.
Original commit message from CVS: No more bytestream.
-rw-r--r--ChangeLog10
-rw-r--r--ext/ogg/gstogg.c3
-rw-r--r--ext/vorbis/vorbis.c3
-rw-r--r--gst/playback/gstdecodebin.c9
-rw-r--r--gst/playback/gstplaybasebin.c22
5 files changed, 21 insertions, 26 deletions
diff --git a/ChangeLog b/ChangeLog
index 5b504353d..63a95c7d2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,15 @@
2005-01-11 Wim Taymans <wim@fluendo.com>
+ * ext/ogg/gstogg.c: (plugin_init):
+ * ext/vorbis/vorbis.c: (plugin_init):
+ * gst/playback/gstdecodebin.c: (find_compatibles),
+ (get_our_ghost_pad), (close_link):
+ * gst/playback/gstplaybasebin.c: (gst_play_base_bin_class_init),
+ (setup_source), (gst_play_base_bin_change_state):
+ Fix bogus requirement of bytestream.
+
+2005-01-11 Wim Taymans <wim@fluendo.com>
+
* configure.ac:
* examples/seeking/seek.c: (dynamic_link), (make_vorbis_pipeline),
(make_theora_pipeline), (make_vorbis_theora_pipeline), (do_seek):
diff --git a/ext/ogg/gstogg.c b/ext/ogg/gstogg.c
index d581c0df6..ac0ac23af 100644
--- a/ext/ogg/gstogg.c
+++ b/ext/ogg/gstogg.c
@@ -32,9 +32,6 @@ GST_DEBUG_CATEGORY (vorbisdec_debug);
static gboolean
plugin_init (GstPlugin * plugin)
{
- if (!gst_library_load ("gstbytestream"))
- return FALSE;
-
gst_ogg_demux_plugin_init (plugin);
gst_ogg_mux_plugin_init (plugin);
gst_ogm_parse_plugin_init (plugin);
diff --git a/ext/vorbis/vorbis.c b/ext/vorbis/vorbis.c
index 94f402094..609b2f2e1 100644
--- a/ext/vorbis/vorbis.c
+++ b/ext/vorbis/vorbis.c
@@ -32,8 +32,7 @@ GST_DEBUG_CATEGORY (vorbisparse_debug);
static gboolean
plugin_init (GstPlugin * plugin)
{
- if (!gst_library_load ("gstbytestream") ||
- !gst_library_load ("gstaudio") || !gst_library_load ("gsttags"))
+ if (!gst_library_load ("gstaudio") || !gst_library_load ("gsttags"))
return FALSE;
if (!gst_element_register (plugin, "rawvorbisenc", GST_RANK_NONE,
diff --git a/gst/playback/gstdecodebin.c b/gst/playback/gstdecodebin.c
index f9a3ba57e..991bfff35 100644
--- a/gst/playback/gstdecodebin.c
+++ b/gst/playback/gstdecodebin.c
@@ -365,7 +365,7 @@ find_compatibles (GstDecodeBin * decode_bin, const GstCaps * caps)
/* non empty intersection, we can use this element */
to_try = g_list_append (to_try, factory);
}
- gst_caps_free (intersect);
+ gst_caps_unref (intersect);
}
}
}
@@ -558,7 +558,7 @@ get_our_ghost_pad (GstDecodeBin * decode_bin, GstPad * pad)
}
GST_DEBUG_OBJECT (decode_bin, "looping over ghostpads");
- ghostpads = gst_pad_get_ghost_pad_list (pad);
+ ghostpads = GST_REAL_PAD (pad)->ghostpads;
while (ghostpads) {
GstPad *ghostpad;
@@ -729,8 +729,9 @@ close_link (GstElement * element, GstDecodeBin * decode_bin)
gst_element_get_name (element));
/* loop over all the padtemplates */
- for (pads = gst_element_get_pad_template_list (element); pads;
- pads = g_list_next (pads)) {
+ for (pads =
+ gst_element_class_get_pad_template_list (GST_ELEMENT_GET_CLASS (element));
+ pads; pads = g_list_next (pads)) {
GstPadTemplate *templ = GST_PAD_TEMPLATE (pads->data);
const gchar *templ_name;
diff --git a/gst/playback/gstplaybasebin.c b/gst/playback/gstplaybasebin.c
index b8da04edc..9ce04ca16 100644
--- a/gst/playback/gstplaybasebin.c
+++ b/gst/playback/gstplaybasebin.c
@@ -1147,26 +1147,14 @@ gst_play_base_bin_change_state (GstElement * element)
switch (GST_STATE_TRANSITION (element)) {
case GST_STATE_NULL_TO_READY:
{
- GstScheduler *sched;
-
play_base_bin->thread = gst_bin_new ("internal_thread");
- sched = gst_scheduler_factory_make ("opt", play_base_bin->thread);
- if (sched) {
- gst_element_set_scheduler (play_base_bin->thread, sched);
-
- gst_element_set_state (play_base_bin->thread, GST_STATE_READY);
- g_signal_connect (G_OBJECT (play_base_bin->thread), "eos",
- G_CALLBACK (play_base_eos), play_base_bin);
- g_signal_connect (play_base_bin->thread, "found_tag",
- G_CALLBACK (gst_play_base_bin_found_tag), play_base_bin);
- } else {
- g_warning ("could not get 'opt' scheduler");
- gst_object_unref (GST_OBJECT (play_base_bin->thread));
- play_base_bin->thread = NULL;
+ gst_element_set_state (play_base_bin->thread, GST_STATE_READY);
- ret = GST_STATE_FAILURE;
- }
+ g_signal_connect (G_OBJECT (play_base_bin->thread), "eos",
+ G_CALLBACK (play_base_eos), play_base_bin);
+ g_signal_connect (play_base_bin->thread, "found_tag",
+ G_CALLBACK (gst_play_base_bin_found_tag), play_base_bin);
break;
}
case GST_STATE_READY_TO_PAUSED: