ges/ges-timeline-transition.{c,h},tests/.../transition.c: type change of vtype

to gint from GEnumValue

diff --git a/ges/ges-timeline-transition.c b/ges/ges-timeline-transition.c
index 201a0683c545be44c4d22b2e134233331da973e4..2b74df3d8923a9780da9156c9a9457d192d25e2b 100644 (file)
--- a/ges/ges-timeline-transition.c
+++ b/ges/ges-timeline-transition.c
@@ -83,7 +83,7 @@ ges_timeline_transition_class_init (GESTimelineTransitionClass * klass)
 static void
 ges_timeline_transition_init (GESTimelineTransition * self)
 {
-  self->vtype = NULL;
+  self->vtype = 0;
 }
 
 static GESTrackObject *
@@ -95,11 +95,7 @@ ges_tl_transition_create_track_object (GESTimelineObject * obj,
 
   GST_DEBUG ("Creating a GESTrackTransition");
 
-  gint type = 0;
-  if (transition->vtype)
-    type = transition->vtype->value;
-
-  res = GES_TRACK_OBJECT (ges_track_transition_new (type));
+  res = GES_TRACK_OBJECT (ges_track_transition_new (transition->vtype));
 
   return res;
 }
@@ -110,7 +106,7 @@ ges_timeline_transition_new (GEnumValue * vtype)
   GESTimelineTransition *ret = g_object_new
       (GES_TYPE_TIMELINE_TRANSITION, NULL);
 
-  ret->vtype = vtype;
+  ret->vtype = vtype ? vtype->value : 0;
   return ret;
 }
 

diff --git a/ges/ges-timeline-transition.h b/ges/ges-timeline-transition.h
index 330b6557d22f2ccc14faa2705cf61f58edeb35d9..f3547535d8321c1d56456ee5428aca974d199373 100644 (file)
--- a/ges/ges-timeline-transition.h
+++ b/ges/ges-timeline-transition.h
@@ -51,7 +51,7 @@ G_BEGIN_DECLS
 struct _GESTimelineTransition {
   GESTimelineObject parent;
   /*< public >*/
-  GEnumValue *vtype;
+  gint vtype;
 };
 
 /**

diff --git a/tests/check/ges/transition.c b/tests/check/ges/transition.c
index 3e144d5404d8b49978abdbb278bbb8d62a205383..935d8cd831be6d0acd8b8a1d1cb8baab03dbe122 100644 (file)
--- a/tests/check/ges/transition.c
+++ b/tests/check/ges/transition.c
@@ -43,7 +43,7 @@ GST_START_TEST (test_transition_basic)
 
   tr2 = ges_timeline_transition_new_for_nick ("bar-wipe-lr");
   fail_unless (tr2 != 0);
-  fail_unless (tr2->vtype->value == 1);
+  fail_unless (tr2->vtype == 1);
 
   /* Make sure track object is created and vtype is set */
   trackobject =