ges/ges-track-transition.{c,h}: add ability to change smptealpha type

diff --git a/ges/ges-track-transition.c b/ges/ges-track-transition.c
index e6eddd9e780cee8710360539c55a4a8c3b3620cb..ee3b00727084e726310829d3340e9578ccea979d 100644 (file)
--- a/ges/ges-track-transition.c
+++ b/ges/ges-track-transition.c
@@ -173,6 +173,10 @@ ges_track_transition_dispose (GObject * object)
     self->a_bcontrol_source = NULL;
   }
 
+  if (self->vsmpte) {
+    g_object_unref (self->vsmpte);
+  }
+
   G_OBJECT_CLASS (ges_track_transition_parent_class)->dispose (object);
 }
 
@@ -198,7 +202,7 @@ link_element_to_mixer (GstElement * element, GstElement * mixer)
 
 static GObject *
 link_element_to_mixer_with_smpte (GstBin * bin, GstElement * element,
-    GstElement * mixer, gint type)
+    GstElement * mixer, gint type, GstElement ** smpteref)
 {
   GstElement *smptealpha = gst_element_factory_make ("smptealpha", NULL);
   g_object_set (G_OBJECT (smptealpha),
@@ -207,6 +211,11 @@ link_element_to_mixer_with_smpte (GstBin * bin, GstElement * element,
 
   gst_element_link_many (element, smptealpha, mixer, NULL);
 
+  /* crack */
+  if (smpteref) {
+    *smpteref = smptealpha;
+  }
+
   return G_OBJECT (smptealpha);
 }
 
@@ -247,9 +256,10 @@ create_video_bin (GESTrackTransition * self)
 
   if (self->vtype) {
     link_element_to_mixer_with_smpte (GST_BIN (topbin), iconva, mixer,
-        self->vtype);
+        self->vtype, NULL);
     target = link_element_to_mixer_with_smpte (GST_BIN (topbin), iconvb,
-        mixer, self->vtype);
+        mixer, self->vtype, &self->vsmpte);
+    g_object_ref (self->vsmpte);
     propname = "position";
     self->vstart_value = 1.0;
     self->vend_value = 0.0;
@@ -426,6 +436,7 @@ ges_track_transition_init (GESTrackTransition * self)
 {
   self->vcontroller = NULL;
   self->vcontrol_source = NULL;
+  self->vsmpte = NULL;
   self->vtype = 0;
   self->vstart_value = 0.0;
   self->vend_value = 0.0;
@@ -437,6 +448,18 @@ ges_track_transition_init (GESTrackTransition * self)
   self->a_bcontrol_source = NULL;
 }
 
+gboolean
+ges_track_transition_set_vtype (GESTrackTransition * self, gint vtype)
+{
+  if ((!vtype && (self->vtype)) || (vtype && !(self->vtype))) {
+    GST_WARNING
+        ("Changing between 'crossfade' and other types is not supported\n");
+  }
+  self->vtype = vtype;
+  if (self->vsmpte && (vtype != 0))
+    g_object_set (self->vsmpte, "type", (gint) vtype, NULL);
+}
+
 GESTrackTransition *
 ges_track_transition_new (gint value)
 {

diff --git a/ges/ges-track-transition.h b/ges/ges-track-transition.h
index 6d2d3c22aebb62149f809d404b6bc31d2e4cfcaf..1fa302f88be2e03659257d7b85ddeab5673cb07d 100644 (file)
--- a/ges/ges-track-transition.h
+++ b/ges/ges-track-transition.h
@@ -72,6 +72,9 @@ struct _GESTrackTransition
   /* these enable video interpolation */
   GstController                 *vcontroller;
   GstInterpolationControlSource *vcontrol_source;
+
+  /* so we can support changing between wipes */
+  GstElement                    *vsmpte;
   
   /* these will be different depending on whether smptealpha or alpha element
    * is used */