remove unneeded assertions

This commit is contained in:
Brandon Lewis 2010-07-07 17:58:59 +02:00 committed by Edward Hervey
parent 31ffb87dde
commit b13bf26795
2 changed files with 4 additions and 16 deletions

View file

@ -240,9 +240,9 @@ ges_track_audio_transition_duration_changed (GESTrackTransition * object)
GST_LOG ("updating controller: gnlobj (%p) acontroller(%p) bcontroller(%p)",
gnlobj, self->a_controller, self->b_controller);
if (G_UNLIKELY ((gnlobj == NULL) || !self->a_controller
|| !self->b_controller))
return;
if (G_UNLIKELY ((!gnlobj || !self->a_control_source ||
!self->b_control_source)));
return;
GST_INFO ("duration: %" G_GUINT64_FORMAT, duration);
g_value_init (&zero, G_TYPE_DOUBLE);
@ -252,12 +252,6 @@ ges_track_audio_transition_duration_changed (GESTrackTransition * object)
GST_LOG ("setting values on controller");
g_assert (GST_IS_CONTROLLER (self->a_controller));
g_assert (GST_IS_CONTROL_SOURCE (self->a_control_source));
g_assert (GST_IS_CONTROLLER (self->b_controller));
g_assert (GST_IS_CONTROL_SOURCE (self->b_control_source));
gst_interpolation_control_source_unset_all (self->a_control_source);
gst_interpolation_control_source_set (self->a_control_source, 0, &one);
gst_interpolation_control_source_set (self->a_control_source,

View file

@ -243,9 +243,6 @@ link_element_to_mixer (GstElement * element, GstElement * mixer)
GstPad *sinkpad = gst_element_get_request_pad (mixer, "sink_%d");
GstPad *srcpad = gst_element_get_static_pad (element, "src");
g_assert (sinkpad);
g_assert (srcpad);
gst_pad_link (srcpad, sinkpad);
gst_object_unref (srcpad);
@ -289,7 +286,7 @@ ges_track_video_transition_duration_changed (GESTrackTransition * object)
GST_LOG ("updating controller");
if (G_UNLIKELY (!gnlobj || !self->controller))
if (G_UNLIKELY (!gnlobj || !self->control_source))
return;
GST_INFO ("duration: %" G_GUINT64_FORMAT, duration);
@ -300,9 +297,6 @@ ges_track_video_transition_duration_changed (GESTrackTransition * object)
GST_LOG ("setting values on controller");
g_assert (GST_IS_CONTROLLER (self->controller));
g_assert (GST_IS_CONTROL_SOURCE (self->control_source));
gst_interpolation_control_source_unset_all (self->control_source);
gst_interpolation_control_source_set (self->control_source, 0, &start_value);
gst_interpolation_control_source_set (self->control_source,