summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWim Taymans <wim.taymans@gmail.com>2005-07-18 15:40:36 +0000
committerWim Taymans <wim.taymans@gmail.com>2005-07-18 15:40:36 +0000
commitbae4e2ad4a6334aecaaa68f22f1ac1c00e05c34d (patch)
tree7b5688b61c339c34b967ed155470f5cc90d90f6a
parenta88aaf5b03a1d29707e3eb2faf770af72e4338c7 (diff)
gst/rtsp/gstrtspsrc.c: Fix for core changes.
Original commit message from CVS: * gst/rtsp/gstrtspsrc.c: (gst_rtspsrc_add_element), (gst_rtspsrc_play): Fix for core changes.
-rw-r--r--ChangeLog6
m---------common0
-rw-r--r--gst/rtsp/gstrtspsrc.c8
3 files changed, 8 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index b54de7f0..91f6fdda 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-07-18 Wim Taymans <wim@fluendo.com>
+
+ * gst/rtsp/gstrtspsrc.c: (gst_rtspsrc_add_element),
+ (gst_rtspsrc_play):
+ Fix for core changes.
+
2005-07-18 Jan Schmidt <thaytan@mad.scientist.com>
* ext/mad/gstid3tag.c: (gst_id3_tag_sink_event):
diff --git a/common b/common
-Subproject ac7272b7af934c2294a44ac1c0f3fac3f8d17ec
+Subproject 6f9b691adc2a0300598311671dd7c4d9d2035af
diff --git a/gst/rtsp/gstrtspsrc.c b/gst/rtsp/gstrtspsrc.c
index a522e357..fea449fe 100644
--- a/gst/rtsp/gstrtspsrc.c
+++ b/gst/rtsp/gstrtspsrc.c
@@ -244,8 +244,6 @@ static gboolean
gst_rtspsrc_add_element (GstRTSPSrc * src, GstElement * element)
{
gst_object_set_parent (GST_OBJECT (element), GST_OBJECT (src));
- gst_element_set_manager (element, GST_ELEMENT_MANAGER (src));
- gst_element_set_scheduler (element, GST_ELEMENT_SCHEDULER (src));
return TRUE;
}
@@ -795,10 +793,8 @@ gst_rtspsrc_play (GstRTSPSrc * src)
if (!gst_rtspsrc_send (src, &request, &response))
goto send_error;
- if (GST_ELEMENT_SCHEDULER (src) && src->interleaved) {
- src->task =
- gst_scheduler_create_task (GST_ELEMENT_SCHEDULER (src),
- (GstTaskFunction) gst_rtspsrc_loop, src);
+ if (src->interleaved) {
+ src->task = gst_task_create ((GstTaskFunction) gst_rtspsrc_loop, src);
gst_task_start (src->task);
}