From 79ebc389e0a0958c8a67b20f1b9931ee9e0fde83 Mon Sep 17 00:00:00 2001
From: Brandon Lewis <brandon.lewis@collabora.co.uk>
Date: Mon, 31 May 2010 15:38:14 +0200
Subject: [PATCH] ges/ges-track-transition.{c,h}: add fields for audio
 interpolation to obj

---
 ges/ges-track-transition.c | 23 +++++++++++++++++++----
 ges/ges-track-transition.h |  6 ++++--
 2 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/ges/ges-track-transition.c b/ges/ges-track-transition.c
index f80e3fc4f6..e78b859733 100644
--- a/ges/ges-track-transition.c
+++ b/ges/ges-track-transition.c
@@ -96,17 +96,29 @@ ges_track_transition_dispose (GObject * object)
   if (self->vcontroller) {
     g_object_unref (self->vcontroller);
     self->vcontroller = NULL;
-    /* is this referenced by the controller ? */
+    /* is this referenec owned by someone other than us? */
     self->vcontrol_source = NULL;
   }
 
+  if (self->a_acontroller) {
+    g_object_unref (self->a_acontroller);
+    self->a_acontroller = NULL;
+    self->a_acontrol_source = NULL;
+  }
+
+  if (self->a_bcontroller) {
+    g_object_unref (self->a_acontroller);
+    self->a_bcontroller = NULL;
+    self->a_bcontrol_source = NULL;
+  }
+
   G_OBJECT_CLASS (ges_track_transition_parent_class)->dispose (object);
 }
 
 static void
 ges_track_transition_finalize (GObject * object)
 {
-  G_OBJECT_CLASS (ges_track_transition_parent_class)->dispose (object);
+  G_OBJECT_CLASS (ges_track_transition_parent_class)->finalize (object);
 }
 
 static GObject *
@@ -258,8 +270,11 @@ ges_track_transition_init (GESTrackTransition * self)
   self->vstart_value = 0.0;
   self->vend_value = 0.0;
 
-  self->acontroller = NULL;
-  self->acontrol_source = NULL;
+  self->a_acontroller = NULL;
+  self->a_acontrol_source = NULL;
+
+  self->a_bcontroller = NULL;
+  self->a_bcontrol_source = NULL;
 }
 
 GESTrackTransition *
diff --git a/ges/ges-track-transition.h b/ges/ges-track-transition.h
index 6f6d562d19..716db094ee 100644
--- a/ges/ges-track-transition.h
+++ b/ges/ges-track-transition.h
@@ -59,9 +59,11 @@ struct _GESTrackTransition
   gdouble                       vstart_value;
   gdouble                       vend_value;
 
-  GstController                 *acontroller;
-  GstInterpolationControlSource *acontrol_source;
+  GstController                 *a_acontroller;
+  GstInterpolationControlSource *a_acontrol_source;
 
+  GstController                 *a_bcontroller;
+  GstInterpolationControlSource *a_bcontrol_source;
 };
 
 struct _GESTrackTransitionClass {