summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWim Taymans <wim.taymans@gmail.com>2002-07-28 01:48:38 +0000
committerWim Taymans <wim.taymans@gmail.com>2002-07-28 01:48:38 +0000
commitf0a3e054beceb5385e0a9a50ee97719cf51aa1dd (patch)
tree22ae69619456f027cf48db53a771c3733c1126ca
parentf46e5158bd190ccd2e7a1ee9c47ab26f9e79ab2b (diff)
downloadgst-plugins-bad-f0a3e054beceb5385e0a9a50ee97719cf51aa1dd.tar.gz
gst-plugins-bad-f0a3e054beceb5385e0a9a50ee97719cf51aa1dd.tar.bz2
gst-plugins-bad-f0a3e054beceb5385e0a9a50ee97719cf51aa1dd.zip
- Remove the dummy scheduler hack
Original commit message from CVS: - Remove the dummy scheduler hack - Remove the state change hack
-rw-r--r--sys/cdrom/gstcdplayer.c13
1 files changed, 2 insertions, 11 deletions
diff --git a/sys/cdrom/gstcdplayer.c b/sys/cdrom/gstcdplayer.c
index ddfc823f..2bbbddb2 100644
--- a/sys/cdrom/gstcdplayer.c
+++ b/sys/cdrom/gstcdplayer.c
@@ -109,21 +109,15 @@ static void cdplayer_class_init(CDPlayerClass *klass)
static void cdplayer_init(CDPlayer *cdp)
{
- GstScheduler *scheduler;
-
cdp->device = g_strdup("/dev/cdrom");
cdp->num_tracks = -1;
cdp->start_track = 1;
cdp->paused = FALSE;
+ GST_FLAG_SET(cdp,GST_BIN_FLAG_MANAGER);
GST_FLAG_SET(cdp,GST_BIN_SELF_SCHEDULABLE);
- scheduler = gst_scheduler_factory_make(NULL,GST_ELEMENT(cdp));
- g_return_if_fail(scheduler != NULL);
-
- gst_scheduler_setup(scheduler);
-
return;
}
@@ -257,11 +251,8 @@ static GstElementStateReturn cdplayer_change_state(GstElement *element)
break;
}
- GST_STATE(element) = GST_STATE_PENDING(element);
- GST_STATE_PENDING(element) = GST_STATE_VOID_PENDING;
-
if (GST_ELEMENT_CLASS(parent_class)->change_state) {
- return GST_ELEMENT_CLASS(parent_class)->change_state(element);
+ GST_ELEMENT_CLASS(parent_class)->change_state(element);
}
return GST_STATE_SUCCESS;