TrackTransition: Remove second argument from duration_changed vmethod

And get properties directly from parent classes instead

diff --git a/ges/ges-track-audio-transition.c b/ges/ges-track-audio-transition.c
index 77723fbfdcb27b7c61309e52fce6fa00def6d145..40140aea54063d4dab6feaed46a325d1e0c0ec4b 100644 (file)
--- a/ges/ges-track-audio-transition.c
+++ b/ges/ges-track-audio-transition.c
@@ -37,8 +37,7 @@ enum
 
 
 static void
-ges_track_audio_transition_duration_changed (GESTrackTransition * self,
-    GstElement * gnlobj);
+ges_track_audio_transition_duration_changed (GESTrackTransition * self);
 
 static GstElement *ges_track_audio_transition_create_element (GESTrackTransition
     * self);
@@ -228,12 +227,11 @@ ges_track_audio_transition_create_element (GESTrackTransition * object)
 }
 
 static void
-ges_track_audio_transition_duration_changed (GESTrackTransition * object,
-    GstElement * gnlobj)
+ges_track_audio_transition_duration_changed (GESTrackTransition * object)
 {
-
   GESTrackAudioTransition *self;
-  guint64 duration;
+  guint64 duration = GES_TRACK_OBJECT_DURATION (object);
+  GstElement *gnlobj = GES_TRACK_OBJECT (object)->gnlobject;
   GValue zero = { 0, };
   GValue one = { 0, };
 
@@ -242,16 +240,11 @@ 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 (!gnlobj)
-    return;
-
-  if (!(self->a_controller) || !(self->b_controller))
+  if (G_UNLIKELY ((gnlobj == NULL) || !self->a_controller
+          || !self->b_controller))
     return;
 
-  GST_LOG ("getting properties");
-  g_object_get (G_OBJECT (gnlobj), "duration", (guint64 *) & duration, NULL);
-
-  GST_INFO ("duration: %lud\n", duration);
+  GST_INFO ("duration: %" G_GUINT64_FORMAT, duration);
   g_value_init (&zero, G_TYPE_DOUBLE);
   g_value_init (&one, G_TYPE_DOUBLE);
   g_value_set_double (&zero, 0.0);

diff --git a/ges/ges-track-transition.c b/ges/ges-track-transition.c
index a46006997ca91f6a6ef40732f164c7ed1b253c9a..b13544358c4aae6e8fd9612062a7c16675bbd1c3 100644 (file)
--- a/ges/ges-track-transition.c
+++ b/ges/ges-track-transition.c
@@ -39,20 +39,16 @@ gnlobject_duration_cb (GstElement * gnlobject, GParamSpec * arg
 {
   GESTrackTransitionClass *klass;
 
-  klass = GES_TRACK_TRANSITION_GET_CLASS (self);
   GST_LOG ("got duration changed signal");
 
   klass = GES_TRACK_TRANSITION_GET_CLASS (self);
-  klass->duration_changed (self, gnlobject);
+  if (klass->duration_changed)
+    klass->duration_changed (self);
 }
 
 static void
-ges_track_transition_duration_changed (GESTrackTransition * self, GstElement
-    * gnlobject)
+ges_track_transition_duration_changed (GESTrackTransition * self)
 {
-  GESTrackType type;
-  type = ((GESTrackObject *) self)->track->type;
-
   GST_WARNING ("transitions don't handle this track type!");
 }
 
@@ -114,7 +110,9 @@ ges_track_transition_create_gnl_object (GESTrackObject * object)
 
   gst_bin_add (GST_BIN (object->gnlobject), element);
 
-  klass->duration_changed (self, object->gnlobject);
+  if (klass->duration_changed)
+    klass->duration_changed (self);
+
   return TRUE;
 }
 

diff --git a/ges/ges-track-transition.h b/ges/ges-track-transition.h
index 487ea64ffa2647a99b721163aa0a85444ec182ea..51d96a79ca361f58e7ede8dac79e6bb44912c245 100644 (file)
--- a/ges/ges-track-transition.h
+++ b/ges/ges-track-transition.h
@@ -75,8 +75,8 @@ struct _GESTrackTransitionClass {
 
     /* <public> */
     GstElement* (*create_element) (GESTrackTransition *self);
-    void (*duration_changed) (GESTrackTransition *self, GstElement
-        *gnlobj);
+
+  void (*duration_changed) (GESTrackTransition *self);
 };
 
 GType ges_track_transition_get_type (void);

diff --git a/ges/ges-track-video-transition.c b/ges/ges-track-video-transition.c
index ff6e0278f8294d39e639544015db5f358a9aec1e..0275bbed09daa5845823a4460a93cbeea90a72ce 100644 (file)
--- a/ges/ges-track-video-transition.c
+++ b/ges/ges-track-video-transition.c
@@ -44,8 +44,7 @@ static GObject *link_element_to_mixer_with_smpte (GstBin * bin,
     GstElement ** smpteref);
 
 static void
-ges_track_video_transition_duration_changed (GESTrackTransition * self,
-    GstElement * gnlobj);
+ges_track_video_transition_duration_changed (GESTrackTransition * self);
 
 static GstElement *ges_track_video_transition_create_element (GESTrackTransition
     * self);
@@ -280,26 +279,20 @@ link_element_to_mixer_with_smpte (GstBin * bin, GstElement * element,
 }
 
 static void
-ges_track_video_transition_duration_changed (GESTrackTransition * object,
-    GstElement * gnlobj)
+ges_track_video_transition_duration_changed (GESTrackTransition * object)
 {
   GValue start_value = { 0, };
   GValue end_value = { 0, };
-  guint64 duration;
+  guint64 duration = GES_TRACK_OBJECT_DURATION (object);
+  GstElement *gnlobj = GES_TRACK_OBJECT (object)->gnlobject;
   GESTrackVideoTransition *self = GES_TRACK_VIDEO_TRANSITION (object);
 
   GST_LOG ("updating controller");
 
-  if (!gnlobj)
+  if (G_UNLIKELY (!gnlobj || !self->controller))
     return;
 
-  if (!(self->controller))
-    return;
-
-  GST_LOG ("getting properties");
-  g_object_get (G_OBJECT (gnlobj), "duration", (guint64 *) & duration, NULL);
-
-  GST_INFO ("duration: %d\n", duration);
+  GST_INFO ("duration: %" G_GUINT64_FORMAT, duration);
   g_value_init (&start_value, G_TYPE_DOUBLE);
   g_value_init (&end_value, G_TYPE_DOUBLE);
   g_value_set_double (&start_value, self->start_value);