From d6531ec3ea325679a8669fb87482fd45a224cb9c Mon Sep 17 00:00:00 2001 From: "Ronald S. Bultje" Date: Thu, 17 Apr 2003 10:23:45 +0000 Subject: This adds more assertions in the code and changes the location of the volume element Original commit message from CVS: This adds more assertions in the code and changes the location of the volume element --- gst-libs/gst/play/play.old.c | 61 +++++++++++++++++++++++++++++--------------- 1 file changed, 40 insertions(+), 21 deletions(-) (limited to 'gst-libs/gst/play/play.old.c') diff --git a/gst-libs/gst/play/play.old.c b/gst-libs/gst/play/play.old.c index 88a370d5..1becf292 100644 --- a/gst-libs/gst/play/play.old.c +++ b/gst-libs/gst/play/play.old.c @@ -152,9 +152,10 @@ gst_play_set_property ( GObject *object, const GValue *value, GParamSpec *pspec) { - GstPlay *play = GST_PLAY (object); - - g_return_if_fail (GST_IS_PLAY (play)); + GstPlay *play; + g_return_if_fail (object != NULL); + g_return_if_fail (GST_IS_PLAY (object)); + play = GST_PLAY (object); switch (prop_id) { case ARG_LOCATION: @@ -178,9 +179,10 @@ gst_play_get_property ( GObject *object, GValue *value, GParamSpec *pspec) { - GstPlay *play = GST_PLAY (object); - - g_return_if_fail (GST_IS_PLAY (play)); + GstPlay *play; + g_return_if_fail (object != NULL); + g_return_if_fail (GST_IS_PLAY (object)); + play = GST_PLAY (object); switch (prop_id) { case ARG_LOCATION: @@ -212,12 +214,14 @@ gst_play_get_length_callback (GstPlay *play) gboolean query_worked = FALSE; g_print("trying to get length\n"); - if (play->audio_sink_element != NULL){ + if ( (play->audio_sink_element != NULL) && + (GST_IS_ELEMENT (play->audio_sink_element)) ) { g_mutex_lock(play->audio_bin_mutex); query_worked = gst_element_query (play->audio_sink_element, GST_QUERY_TOTAL, &format, &value); g_mutex_unlock(play->audio_bin_mutex); } - else if (play->video_sink_element != NULL){ + else if ( (play->video_sink_element != NULL) && + (GST_IS_ELEMENT (play->video_sink_element)) ) { g_mutex_lock(play->video_bin_mutex); query_worked = gst_element_query (play->video_sink_element, GST_QUERY_TOTAL, &format, &value); g_mutex_unlock(play->video_bin_mutex); @@ -242,7 +246,8 @@ gst_play_tick_callback (GstPlay *play) { gint secs; - g_return_val_if_fail(GST_IS_PLAY(play), FALSE); + g_return_val_if_fail (play != NULL, FALSE); + g_return_val_if_fail (GST_IS_PLAY(play), FALSE); play->clock = gst_bin_get_clock (GST_BIN (play->pipeline)); play->time_nanos = gst_clock_get_time(play->clock); @@ -293,7 +298,8 @@ gst_play_default_idle_add ( GSourceFunc function, static gboolean gst_play_idle_callback (GstPlay *play) { - g_return_val_if_fail(GST_IS_PLAY(play), FALSE); + g_return_val_if_fail (play != NULL, FALSE); + g_return_val_if_fail (GST_IS_PLAY(play), FALSE); return gst_bin_iterate (GST_BIN (play->pipeline)); } @@ -304,7 +310,8 @@ gst_play_idle_signal (GstPlay *play) GstPlaySignal *signal; gint queue_length; - g_return_val_if_fail(GST_IS_PLAY(play), FALSE); + g_return_val_if_fail (play != NULL, FALSE); + g_return_val_if_fail (GST_IS_PLAY(play), FALSE); signal = g_async_queue_try_pop(play->signal_queue); if (signal == NULL){ @@ -457,6 +464,8 @@ callback_pipeline_state_change ( GstElement *element, { GstPlaySignal *signal; + g_return_if_fail (play != NULL); + g_return_if_fail (element != NULL); g_return_if_fail (GST_IS_ELEMENT (element)); g_return_if_fail (GST_IS_PLAY (play)); g_return_if_fail (element == play->pipeline); @@ -504,6 +513,8 @@ callback_pipeline_state_change ( GstElement *element, static void gst_play_dispose (GObject *object) { + g_return_if_fail (object != NULL); + g_return_if_fail (GST_IS_PLAY(object)); GstPlay *play = GST_PLAY (object); /* Removing all sources */ @@ -689,6 +700,7 @@ gst_play_seek_to_time ( GstPlay *play, gboolean video_seek_worked = FALSE; gboolean visualisation_seek_worked = FALSE; + g_return_if_fail (play != NULL); g_return_if_fail (GST_IS_PLAY (play)); if (time_nanos < 0LL){ play->seek_time = 0LL; @@ -757,6 +769,7 @@ gst_play_set_idle_timeout_funcs ( GstPlay *play, GstPlayTimeoutAdd timeout_add_func, GstPlayIdleAdd idle_add_func) { + g_return_if_fail (play != NULL); g_return_if_fail (GST_IS_PLAY (play)); play->timeout_add_func = timeout_add_func; play->idle_add_func = idle_add_func; @@ -782,6 +795,8 @@ gst_play_get_sink_element ( GstPlay *play, const GList *pads = NULL; gboolean has_src, has_correct_type; + g_return_val_if_fail (play != NULL, NULL); + g_return_val_if_fail (element != NULL, NULL); g_return_val_if_fail (GST_IS_PLAY (play), NULL); g_return_val_if_fail (GST_IS_ELEMENT (element), NULL); @@ -885,9 +900,9 @@ GstElementStateReturn gst_play_set_state ( GstPlay *play, GstElementState state) { + g_return_val_if_fail (play != NULL, GST_STATE_FAILURE); g_return_val_if_fail (GST_IS_PLAY (play), GST_STATE_FAILURE); g_return_val_if_fail (GST_IS_ELEMENT(play->pipeline), GST_STATE_FAILURE); - /*g_print("setting state to %d\n", state);*/ return gst_element_set_state(play->pipeline, state); } @@ -903,6 +918,7 @@ gst_play_set_state ( GstPlay *play, GstElementState gst_play_get_state (GstPlay *play) { + g_return_val_if_fail (play != NULL, GST_STATE_FAILURE); g_return_val_if_fail (GST_IS_PLAY (play), GST_STATE_FAILURE); g_return_val_if_fail (play->pipeline, GST_STATE_FAILURE); @@ -923,6 +939,7 @@ gst_play_set_location ( GstPlay *play, const gchar *location) { GstElementState current_state; + g_return_val_if_fail (play != NULL, FALSE); g_return_val_if_fail (GST_IS_PLAY (play), FALSE); g_return_val_if_fail (location != NULL, FALSE); @@ -964,6 +981,7 @@ gchar* gst_play_get_location (GstPlay *play) { gchar* location; + g_return_val_if_fail (play != NULL, NULL); g_return_val_if_fail (GST_IS_PLAY (play), NULL); g_return_val_if_fail (GST_IS_ELEMENT(play->source), NULL); g_object_get (G_OBJECT (play->source), "location", &location, NULL); @@ -981,6 +999,7 @@ void gst_play_set_volume ( GstPlay *play, gfloat volume) { + g_return_if_fail (play != NULL); g_return_if_fail (GST_IS_PLAY (play)); g_object_set(G_OBJECT(play->vol_dparam), "value_float", volume, NULL); @@ -999,6 +1018,7 @@ gst_play_get_volume (GstPlay *play) { gfloat volume; + g_return_val_if_fail (play != NULL, 0); g_return_val_if_fail (GST_IS_PLAY (play), 0); g_object_get(G_OBJECT(play->vol_dparam), "value_float", &volume, NULL); @@ -1017,6 +1037,7 @@ void gst_play_set_mute ( GstPlay *play, gboolean mute) { + g_return_if_fail (play != NULL); g_return_if_fail (GST_IS_PLAY (play)); g_object_set (G_OBJECT (play->volume), "mute", mute, NULL); @@ -1035,6 +1056,7 @@ gst_play_get_mute (GstPlay *play) { gboolean mute; + g_return_val_if_fail (play != NULL, 0); g_return_val_if_fail (GST_IS_PLAY (play), 0); g_object_get (G_OBJECT (play->volume), "mute", &mute, NULL); @@ -1061,6 +1083,8 @@ gboolean gst_play_set_data_src ( GstPlay *play, GstElement *data_src) { + g_return_val_if_fail (play != NULL, FALSE); + g_return_val_if_fail (data_src != NULL, FALSE); g_return_val_if_fail (GST_IS_PLAY (play), FALSE); g_return_val_if_fail (GST_IS_ELEMENT (data_src), FALSE); @@ -1089,6 +1113,8 @@ gboolean gst_play_set_video_sink ( GstPlay *play, GstElement *video_sink) { + g_return_val_if_fail (play != NULL, FALSE); + g_return_val_if_fail (video_sink != NULL, FALSE); g_return_val_if_fail (GST_IS_PLAY (play), FALSE); g_return_val_if_fail (GST_IS_ELEMENT (video_sink), FALSE); @@ -1117,6 +1143,8 @@ gboolean gst_play_set_audio_sink ( GstPlay *play, GstElement *audio_sink) { + g_return_val_if_fail (play != NULL, FALSE); + g_return_val_if_fail (audio_sink != NULL, FALSE); g_return_val_if_fail (GST_IS_PLAY (play), FALSE); g_return_val_if_fail (GST_IS_ELEMENT (audio_sink), FALSE); @@ -1267,12 +1295,3 @@ gst_play_new ( GstPlayPipeType pipe_type, return play; } - - - - - - - - - -- cgit v1.2.1