diff options
| -rw-r--r-- | gst-libs/gst/play/play.old.c | 27 | ||||
| -rw-r--r-- | gst-libs/gst/play/play.old.h | 2 |
2 files changed, 7 insertions, 22 deletions
diff --git a/gst-libs/gst/play/play.old.c b/gst-libs/gst/play/play.old.c index ee7d5f6e..e375979b 100644 --- a/gst-libs/gst/play/play.old.c +++ b/gst-libs/gst/play/play.old.c @@ -297,9 +297,6 @@ gst_play_init (GstPlay *play) play->audio_bin_mutex = g_mutex_new(); play->video_bin_mutex = g_mutex_new(); gst_play_set_idle_timeout_funcs(play, gst_play_default_timeout_add, gst_play_default_idle_add); - - /*fixored by dolphy */ - play->tick_timeout_id = play->idle_timeout_id = play->idle_signal_id = 0; } @@ -393,7 +390,7 @@ static void gst_play_dispose (GObject *object) { GstPlay *play = GST_PLAY (object); - /* fixored by dolphy : Before disposing removing any callback that could + /* Before disposing, removing any callback that could be called : time ticks, signal poller, etc...*/ if (play->tick_timeout_id) if (!g_source_remove(play->tick_timeout_id)) @@ -428,7 +425,7 @@ callback_pipeline_deep_notify (GstElement *element, GstElement *orig, GParamSpec signal->signal_data.info.element = orig; signal->signal_data.info.param = param; g_async_queue_push(play->signal_queue, signal); - /* fixored by dolphy : If an idle callback has been added for signal polling + /* If an idle callback has been added for signal polling no need to put a new one */ if (!play->idle_signal_id) play->idle_signal_id = play->idle_add_func ((GSourceFunc) gst_play_idle_signal, play); @@ -466,7 +463,7 @@ callback_pipeline_state_change (GstElement *element, GstElementState old, GstEle signal->signal_data.state.old_state = old; signal->signal_data.state.new_state = state; g_async_queue_push(play->signal_queue, signal); - /* fixored by dolphy : If an idle callback has been added for signal polling + /* If an idle callback has been added for signal polling no need to put a new one */ if (!play->idle_signal_id) play->idle_signal_id = play->idle_add_func ((GSourceFunc) gst_play_idle_signal, play); @@ -478,8 +475,6 @@ gst_play_idle_signal (GstPlay *play) GstPlaySignal *signal; gint queue_length; - /* fixored by dolphy : Added safety check on play before poping */ - g_return_val_if_fail(GST_IS_PLAY(play), FALSE); signal = g_async_queue_try_pop(play->signal_queue); @@ -511,7 +506,7 @@ gst_play_idle_signal (GstPlay *play) g_free(signal); queue_length = g_async_queue_length (play->signal_queue); - /* fixored by dolphy : If queue length is zero the idle callback will be + /* If queue length is zero the idle callback will be destroyed */ if (!queue_length) @@ -541,7 +536,7 @@ callback_video_have_xid (GstElement *element, gint xid, GstPlay *play) signal->signal_id = HAVE_XID; signal->signal_data.video_xid.xid = xid; g_async_queue_push(play->signal_queue, signal); - /* fixored by dolphy : If an idle callback has been added for signal polling + /* If an idle callback has been added for signal polling no need to put a new one */ if (!play->idle_signal_id) play->idle_signal_id = play->idle_add_func ((GSourceFunc) gst_play_idle_signal, play); @@ -557,7 +552,7 @@ callback_video_have_size (GstElement *element, gint width, gint height, GstPlay signal->signal_data.video_size.width = width; signal->signal_data.video_size.height = height; g_async_queue_push(play->signal_queue, signal); - /* fixored by dolphy : If an idle callback has been added for signal polling + /* If an idle callback has been added for signal polling no need to put a new one */ if (!play->idle_signal_id) play->idle_signal_id = play->idle_add_func ((GSourceFunc) gst_play_idle_signal, play); @@ -614,8 +609,6 @@ gst_play_tick_callback (GstPlay *play) { gint secs; - /* fixored by dolphy : Added safety check on play before accessing */ - g_return_val_if_fail(GST_IS_PLAY(play), FALSE); play->clock = gst_bin_get_clock (GST_BIN (play->pipeline)); @@ -632,8 +625,6 @@ gst_play_tick_callback (GstPlay *play) static gboolean gst_play_idle_callback (GstPlay *play) { - /* fixored by dolphy : Added safety check on play before iterating */ - g_return_val_if_fail(GST_IS_PLAY(play), FALSE); return gst_bin_iterate (GST_BIN (play->pipeline)); @@ -755,9 +746,7 @@ gst_play_default_timeout_add (guint interval, GSourceFunc function, gpointer dat GstPlayIdleData *idle_data = g_new0(GstPlayIdleData, 1); idle_data->func = function; idle_data->data = data; - - /* fixored by dolphy : here we return the source tag to caller */ - + return g_timeout_add (interval, (GSourceFunc)gst_play_default_idle, idle_data); } @@ -768,8 +757,6 @@ gst_play_default_idle_add (GSourceFunc function, gpointer data) idle_data->func = function; idle_data->data = data; - /* fixored by dolphy : here we return the source tag to caller */ - return g_idle_add ((GSourceFunc)gst_play_default_idle, idle_data); } diff --git a/gst-libs/gst/play/play.old.h b/gst-libs/gst/play/play.old.h index f9bc1e62..02d55e05 100644 --- a/gst-libs/gst/play/play.old.h +++ b/gst-libs/gst/play/play.old.h @@ -117,8 +117,6 @@ struct _GstPlay gint64 time_nanos; gint64 length_nanos; - /*fixored by dolphy */ - guint tick_timeout_id; guint idle_timeout_id; guint idle_signal_id; |