push make_audio_bin down into subclass

diff --git a/ges/ges-track-audio-transition.c b/ges/ges-track-audio-transition.c
index 3ead9cf45b2af779e139c91674218ae8c7e085ce..aee9412991c4690e511963b5eeb46a993e70aa97 100644 (file)
--- a/ges/ges-track-audio-transition.c
+++ b/ges/ges-track-audio-transition.c
@@ -35,6 +35,14 @@ enum
   PROP_0,
 };
 
+
+static void
+ges_track_audio_transition_duration_changed (GESTrackTransition * self,
+    GstElement * gnlobj);
+
+static GstElement *ges_track_audio_transition_create_element (GESTrackTransition
+    * self, GESTrack * unused);
+
 static void ges_track_audio_transition_dispose (GObject * object);
 
 static void ges_track_audio_transition_finalize (GObject * object);
@@ -49,16 +57,19 @@ static void
 ges_track_audio_transition_class_init (GESTrackAudioTransitionClass * klass)
 {
   GObjectClass *object_class;
-  GESTrackTransitionClass *bg_class;
+  GESTrackTransitionClass *pclass;
 
   object_class = G_OBJECT_CLASS (klass);
-  bg_class = GES_TRACK_TRANSITION_CLASS (klass);
+  pclass = GES_TRACK_TRANSITION_CLASS (klass);
 
   object_class->get_property = ges_track_audio_transition_get_property;
   object_class->set_property = ges_track_audio_transition_set_property;
   object_class->dispose = ges_track_audio_transition_dispose;
   object_class->finalize = ges_track_audio_transition_finalize;
 
+  pclass->create_element = ges_track_audio_transition_create_element;
+  pclass->duration_changed = ges_track_audio_transition_duration_changed;
+
 }
 
 static void
@@ -98,6 +109,144 @@ ges_track_audio_transition_set_property (GObject * object,
   }
 }
 
+static GObject *
+link_element_to_mixer_with_volume (GstBin * bin, GstElement * element,
+    GstElement * mixer)
+{
+  GstElement *volume = gst_element_factory_make ("volume", NULL);
+  gst_bin_add (bin, volume);
+
+  gst_element_link_many (element, volume, mixer, NULL);
+
+  return G_OBJECT (volume);
+}
+
+static GstElement *
+ges_track_audio_transition_create_element (GESTrackTransition * self,
+    GESTrack * unded)
+{
+  GstElement *topbin, *iconva, *iconvb, *oconv;
+  GObject *atarget, *btarget = NULL;
+  const gchar *propname = "volume";
+  GstElement *mixer = NULL;
+  GstPad *sinka_target, *sinkb_target, *src_target, *sinka, *sinkb, *src;
+  GstController *acontroller, *bcontroller;
+  GstInterpolationControlSource *acontrol_source, *bcontrol_source;
+
+
+  GST_LOG ("creating an audio bin");
+
+  topbin = gst_bin_new ("transition-bin");
+  iconva = gst_element_factory_make ("audioconvert", "tr-aconv-a");
+  iconvb = gst_element_factory_make ("audioconvert", "tr-aconv-b");
+  oconv = gst_element_factory_make ("audioconvert", "tr-aconv-output");
+
+  gst_bin_add_many (GST_BIN (topbin), iconva, iconvb, oconv, NULL);
+
+  mixer = gst_element_factory_make ("adder", NULL);
+  gst_bin_add (GST_BIN (topbin), mixer);
+
+  atarget = link_element_to_mixer_with_volume (GST_BIN (topbin), iconva, mixer);
+  btarget = link_element_to_mixer_with_volume (GST_BIN (topbin), iconvb, mixer);
+
+  g_assert (atarget && btarget);
+
+  gst_element_link (mixer, oconv);
+
+  sinka_target = gst_element_get_static_pad (iconva, "sink");
+  sinkb_target = gst_element_get_static_pad (iconvb, "sink");
+  src_target = gst_element_get_static_pad (oconv, "src");
+
+  sinka = gst_ghost_pad_new ("sinka", sinka_target);
+  sinkb = gst_ghost_pad_new ("sinkb", sinkb_target);
+  src = gst_ghost_pad_new ("src", src_target);
+
+  gst_element_add_pad (topbin, src);
+  gst_element_add_pad (topbin, sinka);
+  gst_element_add_pad (topbin, sinkb);
+
+  /* set up interpolation */
+
+  gst_object_unref (sinka_target);
+  gst_object_unref (sinkb_target);
+  gst_object_unref (src_target);
+
+
+  //g_object_set(atarget, propname, (gdouble) 0, NULL);
+  //g_object_set(btarget, propname, (gdouble) 0, NULL);
+
+  acontroller = gst_object_control_properties (atarget, propname, NULL);
+  bcontroller = gst_object_control_properties (btarget, propname, NULL);
+
+  g_assert (acontroller && bcontroller);
+
+  acontrol_source = gst_interpolation_control_source_new ();
+  gst_controller_set_control_source (acontroller,
+      propname, GST_CONTROL_SOURCE (acontrol_source));
+  gst_interpolation_control_source_set_interpolation_mode (acontrol_source,
+      GST_INTERPOLATE_LINEAR);
+
+  bcontrol_source = gst_interpolation_control_source_new ();
+  gst_controller_set_control_source (bcontroller,
+      propname, GST_CONTROL_SOURCE (bcontrol_source));
+  gst_interpolation_control_source_set_interpolation_mode (bcontrol_source,
+      GST_INTERPOLATE_LINEAR);
+
+  self->a_acontroller = acontroller;
+  self->a_bcontroller = bcontroller;
+  self->a_acontrol_source = acontrol_source;
+  self->a_bcontrol_source = bcontrol_source;
+
+  return topbin;
+}
+
+static void
+ges_track_audio_transition_duration_changed (GESTrackTransition * self,
+    GstElement * gnlobj)
+{
+  guint64 duration;
+  GValue zero = { 0, };
+  GValue one = { 0, };
+
+  GST_LOG ("updating controller: gnlobj (%p) acontroller(%p) bcontroller(%p)",
+      gnlobj, self->a_acontroller, self->a_bcontroller);
+
+  if (!gnlobj)
+    return;
+
+  if (!(self->a_acontroller) || !(self->a_bcontroller))
+    return;
+
+  GST_LOG ("getting properties");
+  g_object_get (G_OBJECT (gnlobj), "duration", (guint64 *) & duration, NULL);
+
+  GST_INFO ("duration: %lud\n", duration);
+  g_value_init (&zero, G_TYPE_DOUBLE);
+  g_value_init (&one, G_TYPE_DOUBLE);
+  g_value_set_double (&zero, 0.0);
+  g_value_set_double (&one, 1.0);
+
+  GST_LOG ("setting values on controller");
+
+  g_assert (GST_IS_CONTROLLER (self->a_acontroller));
+  g_assert (GST_IS_CONTROL_SOURCE (self->a_acontrol_source));
+
+  g_assert (GST_IS_CONTROLLER (self->a_bcontroller));
+  g_assert (GST_IS_CONTROL_SOURCE (self->a_bcontrol_source));
+
+  gst_interpolation_control_source_unset_all (self->a_acontrol_source);
+  gst_interpolation_control_source_set (self->a_acontrol_source, 0, &one);
+  gst_interpolation_control_source_set (self->a_acontrol_source,
+      duration, &zero);
+
+  gst_interpolation_control_source_unset_all (self->a_bcontrol_source);
+  gst_interpolation_control_source_set (self->a_bcontrol_source, 0, &zero);
+  gst_interpolation_control_source_set (self->a_bcontrol_source,
+      duration, &one);
+
+  GST_LOG ("done updating controller");
+}
+
 GESTrackAudioTransition *
 ges_track_audio_transition_new (void)
 {

diff --git a/ges/ges-track-transition.c b/ges/ges-track-transition.c
index de428bdb17663cbba3bdd35e8405c0002462b66f..10f84cee693ca0035541c43077d032eff3e531f1 100644 (file)
--- a/ges/ges-track-transition.c
+++ b/ges/ges-track-transition.c
@@ -72,53 +72,6 @@ ges_track_transition_update_vcontroller (GESTrackTransition * self,
   GST_LOG ("done updating controller");
 }
 
-static void
-ges_track_transition_update_acontroller (GESTrackTransition * self,
-    GstElement * gnlobj)
-{
-  guint64 duration;
-  GValue zero = { 0, };
-  GValue one = { 0, };
-
-  GST_LOG ("updating controller: gnlobj (%p) acontroller(%p) bcontroller(%p)",
-      gnlobj, self->a_acontroller, self->a_bcontroller);
-
-  if (!gnlobj)
-    return;
-
-  if (!(self->a_acontroller) || !(self->a_bcontroller))
-    return;
-
-  GST_LOG ("getting properties");
-  g_object_get (G_OBJECT (gnlobj), "duration", (guint64 *) & duration, NULL);
-
-  GST_INFO ("duration: %lud\n", duration);
-  g_value_init (&zero, G_TYPE_DOUBLE);
-  g_value_init (&one, G_TYPE_DOUBLE);
-  g_value_set_double (&zero, 0.0);
-  g_value_set_double (&one, 1.0);
-
-  GST_LOG ("setting values on controller");
-
-  g_assert (GST_IS_CONTROLLER (self->a_acontroller));
-  g_assert (GST_IS_CONTROL_SOURCE (self->a_acontrol_source));
-
-  g_assert (GST_IS_CONTROLLER (self->a_bcontroller));
-  g_assert (GST_IS_CONTROL_SOURCE (self->a_bcontrol_source));
-
-  gst_interpolation_control_source_unset_all (self->a_acontrol_source);
-  gst_interpolation_control_source_set (self->a_acontrol_source, 0, &one);
-  gst_interpolation_control_source_set (self->a_acontrol_source,
-      duration, &zero);
-
-  gst_interpolation_control_source_unset_all (self->a_bcontrol_source);
-  gst_interpolation_control_source_set (self->a_bcontrol_source, 0, &zero);
-  gst_interpolation_control_source_set (self->a_bcontrol_source,
-      duration, &one);
-
-  GST_LOG ("done updating controller");
-}
-
 static void
 gnlobject_duration_cb (GstElement * gnlobject, GParamSpec * arg
     G_GNUC_UNUSED, GESTrackTransition * self)
@@ -139,11 +92,8 @@ ges_track_transition_duration_changed (GESTrackTransition * self, GstElement
   GESTrackType type;
   type = ((GESTrackObject *) self)->track->type;
 
-  if (type == GES_TRACK_TYPE_VIDEO)
+  if (type == GES_TRACK_TYPE_VIDEO) {
     ges_track_transition_update_vcontroller (self, gnlobject);
-  else if (type == GES_TRACK_TYPE_AUDIO) {
-    GST_LOG ("transition is an audio transition");
-    ges_track_transition_update_acontroller (self, gnlobject);
   }
 }
 
@@ -255,18 +205,6 @@ link_element_to_mixer_with_smpte (GstBin * bin, GstElement * element,
   return G_OBJECT (smptealpha);
 }
 
-static GObject *
-link_element_to_mixer_with_volume (GstBin * bin, GstElement * element,
-    GstElement * mixer)
-{
-  GstElement *volume = gst_element_factory_make ("volume", NULL);
-  gst_bin_add (bin, volume);
-
-  gst_element_link_many (element, volume, mixer, NULL);
-
-  return G_OBJECT (volume);
-}
-
 static GstElement *
 create_video_bin (GESTrackTransition * self)
 {
@@ -344,84 +282,6 @@ create_video_bin (GESTrackTransition * self)
   return topbin;
 }
 
-static GstElement *
-create_audio_bin (GESTrackTransition * self)
-{
-  GstElement *topbin, *iconva, *iconvb, *oconv;
-  GObject *atarget, *btarget = NULL;
-  const gchar *propname = "volume";
-  GstElement *mixer = NULL;
-  GstPad *sinka_target, *sinkb_target, *src_target, *sinka, *sinkb, *src;
-  GstController *acontroller, *bcontroller;
-  GstInterpolationControlSource *acontrol_source, *bcontrol_source;
-
-
-  GST_LOG ("creating an audio bin");
-
-  topbin = gst_bin_new ("transition-bin");
-  iconva = gst_element_factory_make ("audioconvert", "tr-aconv-a");
-  iconvb = gst_element_factory_make ("audioconvert", "tr-aconv-b");
-  oconv = gst_element_factory_make ("audioconvert", "tr-aconv-output");
-
-  gst_bin_add_many (GST_BIN (topbin), iconva, iconvb, oconv, NULL);
-
-  mixer = gst_element_factory_make ("adder", NULL);
-  gst_bin_add (GST_BIN (topbin), mixer);
-
-  atarget = link_element_to_mixer_with_volume (GST_BIN (topbin), iconva, mixer);
-  btarget = link_element_to_mixer_with_volume (GST_BIN (topbin), iconvb, mixer);
-
-  g_assert (atarget && btarget);
-
-  gst_element_link (mixer, oconv);
-
-  sinka_target = gst_element_get_static_pad (iconva, "sink");
-  sinkb_target = gst_element_get_static_pad (iconvb, "sink");
-  src_target = gst_element_get_static_pad (oconv, "src");
-
-  sinka = gst_ghost_pad_new ("sinka", sinka_target);
-  sinkb = gst_ghost_pad_new ("sinkb", sinkb_target);
-  src = gst_ghost_pad_new ("src", src_target);
-
-  gst_element_add_pad (topbin, src);
-  gst_element_add_pad (topbin, sinka);
-  gst_element_add_pad (topbin, sinkb);
-
-  /* set up interpolation */
-
-  gst_object_unref (sinka_target);
-  gst_object_unref (sinkb_target);
-  gst_object_unref (src_target);
-
-
-  //g_object_set(atarget, propname, (gdouble) 0, NULL);
-  //g_object_set(btarget, propname, (gdouble) 0, NULL);
-
-  acontroller = gst_object_control_properties (atarget, propname, NULL);
-  bcontroller = gst_object_control_properties (btarget, propname, NULL);
-
-  g_assert (acontroller && bcontroller);
-
-  acontrol_source = gst_interpolation_control_source_new ();
-  gst_controller_set_control_source (acontroller,
-      propname, GST_CONTROL_SOURCE (acontrol_source));
-  gst_interpolation_control_source_set_interpolation_mode (acontrol_source,
-      GST_INTERPOLATE_LINEAR);
-
-  bcontrol_source = gst_interpolation_control_source_new ();
-  gst_controller_set_control_source (bcontroller,
-      propname, GST_CONTROL_SOURCE (bcontrol_source));
-  gst_interpolation_control_source_set_interpolation_mode (bcontrol_source,
-      GST_INTERPOLATE_LINEAR);
-
-  self->a_acontroller = acontroller;
-  self->a_bcontroller = bcontroller;
-  self->a_acontrol_source = acontrol_source;
-  self->a_bcontrol_source = bcontrol_source;
-
-  return topbin;
-}
-
 static gboolean
 ges_track_transition_create_gnl_object (GESTrackObject * object)
 {
@@ -460,10 +320,6 @@ ges_track_transition_create_element (GESTrackTransition * self,
     return create_video_bin (self);
   }
 
-  else if ((track->type) == GES_TRACK_TYPE_AUDIO) {
-    return create_audio_bin (self);
-  }
-
   return gst_element_factory_make ("identity", "invalid-track-type");
 }