From 4cd9fd5006a7a4420e31263aaaf82da9500de002 Mon Sep 17 00:00:00 2001
From: Brandon Lewis <brandon@collabora.co.uk>
Date: Thu, 8 Jul 2010 13:20:56 +0200
Subject: [PATCH] refactor duration_changed method as this is now a
 TrackObjectClass method

---
 ges/ges-track-audio-transition.c | 14 +++++++++-----
 ges/ges-track-video-transition.c | 14 +++++++++-----
 2 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/ges/ges-track-audio-transition.c b/ges/ges-track-audio-transition.c
index c4b49b7..a6bba66 100644
--- a/ges/ges-track-audio-transition.c
+++ b/ges/ges-track-audio-transition.c
@@ -37,7 +37,7 @@ enum
 
 
 static void
-ges_track_audio_transition_duration_changed (GESTrackTransition * self);
+ges_track_audio_transition_duration_changed (GESTrackObject * self, guint64);
 
 static GstElement *ges_track_audio_transition_create_element (GESTrackTransition
     * self);
@@ -56,9 +56,11 @@ static void
 ges_track_audio_transition_class_init (GESTrackAudioTransitionClass * klass)
 {
   GObjectClass *object_class;
+  GESTrackObjectClass *toclass;
   GESTrackTransitionClass *pclass;
 
   object_class = G_OBJECT_CLASS (klass);
+  toclass = GES_TRACK_OBJECT_CLASS (klass);
   pclass = GES_TRACK_TRANSITION_CLASS (klass);
 
   object_class->get_property = ges_track_audio_transition_get_property;
@@ -66,8 +68,9 @@ ges_track_audio_transition_class_init (GESTrackAudioTransitionClass * klass)
   object_class->dispose = ges_track_audio_transition_dispose;
   object_class->finalize = ges_track_audio_transition_finalize;
 
+  toclass->duration_changed = ges_track_audio_transition_duration_changed;
+
   pclass->create_element = ges_track_audio_transition_create_element;
-  pclass->duration_changed = ges_track_audio_transition_duration_changed;
 
 }
 
@@ -227,11 +230,12 @@ ges_track_audio_transition_create_element (GESTrackTransition * object)
 }
 
 static void
-ges_track_audio_transition_duration_changed (GESTrackTransition * object)
+ges_track_audio_transition_duration_changed (GESTrackObject * object,
+    guint64 duration)
 {
   GESTrackAudioTransition *self;
-  guint64 duration = GES_TRACK_OBJECT_DURATION (object);
-  GstElement *gnlobj = GES_TRACK_OBJECT (object)->gnlobject;
+  GstElement *gnlobj = object->gnlobject;
+
   GValue zero = { 0, };
   GValue one = { 0, };
 
diff --git a/ges/ges-track-video-transition.c b/ges/ges-track-video-transition.c
index d3bbb1e..748963c 100644
--- a/ges/ges-track-video-transition.c
+++ b/ges/ges-track-video-transition.c
@@ -44,7 +44,8 @@ static GObject *link_element_to_mixer_with_smpte (GstBin * bin,
     GstElement ** smpteref);
 
 static void
-ges_track_video_transition_duration_changed (GESTrackTransition * self);
+ges_track_video_transition_duration_changed (GESTrackObject * self,
+    guint64 duration);
 
 static GstElement *ges_track_video_transition_create_element (GESTrackTransition
     * self);
@@ -63,9 +64,11 @@ static void
 ges_track_video_transition_class_init (GESTrackVideoTransitionClass * klass)
 {
   GObjectClass *object_class;
+  GESTrackObjectClass *toclass;
   GESTrackTransitionClass *pclass;
 
   object_class = G_OBJECT_CLASS (klass);
+  toclass = GES_TRACK_OBJECT_CLASS (klass);
   pclass = GES_TRACK_TRANSITION_CLASS (klass);
 
   object_class->get_property = ges_track_video_transition_get_property;
@@ -73,8 +76,9 @@ ges_track_video_transition_class_init (GESTrackVideoTransitionClass * klass)
   object_class->dispose = ges_track_video_transition_dispose;
   object_class->finalize = ges_track_video_transition_finalize;
 
+  toclass->duration_changed = ges_track_video_transition_duration_changed;
+
   pclass->create_element = ges_track_video_transition_create_element;
-  pclass->duration_changed = ges_track_video_transition_duration_changed;
 }
 
 static void
@@ -276,12 +280,12 @@ link_element_to_mixer_with_smpte (GstBin * bin, GstElement * element,
 }
 
 static void
-ges_track_video_transition_duration_changed (GESTrackTransition * object)
+ges_track_video_transition_duration_changed (GESTrackObject * object,
+    guint64 duration)
 {
   GValue start_value = { 0, };
   GValue end_value = { 0, };
-  guint64 duration = GES_TRACK_OBJECT_DURATION (object);
-  GstElement *gnlobj = GES_TRACK_OBJECT (object)->gnlobject;
+  GstElement *gnlobj = object->gnlobject;
   GESTrackVideoTransition *self = GES_TRACK_VIDEO_TRANSITION (object);
 
   GST_LOG ("updating controller");
-- 
2.7.4