Merge remote-tracking branch 'origin/0.10'

Conflicts:
	bindings/python/ges.defs
	ges/ges-track-video-transition.c

docs/libs/ges-sections.txt

@@ -232,6 +232,8 @@ ges_track_video_transition_set_transition_type
 ges_track_video_transition_get_transition_type
 ges_track_video_transition_set_border
 ges_track_video_transition_get_border
+ges_track_video_transition_set_inverted
+ges_track_video_transition_is_inverted
 <SUBSECTION Standard>
 GESTrackVideoTransitionClass
 GESTrackVideoTransitionPrivate

ges/ges-timeline-object.c

@@ -390,7 +390,7 @@ ges_timeline_object_class_init (GESTimelineObjectClass * klass)
    */
   g_object_class_install_property (object_class, PROP_MAX_DURATION,
       g_param_spec_uint64 ("max-duration", "Maximum duration",
-          "The duration of the object", 0, G_MAXUINT64, G_MAXUINT64,
+          "The maximum duration of the object", 0, G_MAXUINT64, G_MAXUINT64,
           G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
 
   klass->need_fill_track = TRUE;
@@ -833,11 +833,7 @@ void
 ges_timeline_object_set_start (GESTimelineObject * object, guint64 start)
 {
   if (ges_timeline_object_set_start_internal (object, start))
-#if GLIB_CHECK_VERSION(2,26,0)
     g_object_notify_by_pspec (G_OBJECT (object), properties[PROP_START]);
-#else
-    g_object_notify (G_OBJECT (object), "start");
-#endif
 }
 
 static gboolean
@@ -876,11 +872,7 @@ void
 ges_timeline_object_set_inpoint (GESTimelineObject * object, guint64 inpoint)
 {
   if (ges_timeline_object_set_inpoint_internal (object, inpoint))
-#if GLIB_CHECK_VERSION(2,26,0)
     g_object_notify_by_pspec (G_OBJECT (object), properties[PROP_INPOINT]);
-#else
-    g_object_notify (G_OBJECT (object), "in-point");
-#endif
 }
 
 static gboolean
@@ -939,11 +931,7 @@ void
 ges_timeline_object_set_duration (GESTimelineObject * object, guint64 duration)
 {
   if (ges_timeline_object_set_duration_internal (object, duration))
-#if GLIB_CHECK_VERSION(2,26,0)
     g_object_notify_by_pspec (G_OBJECT (object), properties[PROP_DURATION]);
-#else
-    g_object_notify (G_OBJECT (object), "duration");
-#endif
 }
 
 static gboolean
@@ -1377,8 +1365,6 @@ ges_timeline_object_edit (GESTimelineObject * object, GList * layers,
     GST_WARNING_OBJECT (object, "Trying to edit, but not containing"
         "any TrackObject yet.");
     return FALSE;
-  } else if (position < 0) {
-    GST_DEBUG_OBJECT (object, "Trying to move before 0, not moving");
   }
 
   for (tmp = object->priv->trackobjects; tmp; tmp = g_list_next (tmp)) {

ges/ges-timeline.c

@@ -1727,11 +1727,7 @@ track_duration_cb (GstElement * track,
 
     timeline->priv->duration = max_duration;
 
-#if GLIB_CHECK_VERSION(2,26,0)
     g_object_notify_by_pspec (G_OBJECT (timeline), properties[PROP_DURATION]);
-#else
-    g_object_notify (G_OBJECT (timeline), "duration");
-#endif
   }
 }
 

ges/ges-track-object.c

@@ -308,8 +308,8 @@ ges_track_object_class_init (GESTrackObjectClass * klass)
    */
   g_object_class_install_property (object_class, PROP_MAX_DURATION,
       g_param_spec_uint64 ("max-duration", "Maximum duration",
-          "The duration of the object", GST_CLOCK_TIME_NONE, G_MAXUINT64,
+          "The maximum duration of the object", 0, G_MAXUINT64, G_MAXUINT64,
-          G_MAXUINT64, G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
+          G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
 
   /**
    * GESTrackObject::deep-notify:
@@ -380,11 +380,7 @@ ges_track_object_set_start (GESTrackObject * object, guint64 start)
   g_return_if_fail (GES_IS_TRACK_OBJECT (object));
 
   if (ges_track_object_set_start_internal (object, start))
-#if GLIB_CHECK_VERSION(2,26,0)
     g_object_notify_by_pspec (G_OBJECT (object), properties[PROP_START]);
-#else
-    g_object_notify (G_OBJECT (object), "start");
-#endif
 }
 
 static inline gboolean
@@ -418,11 +414,7 @@ ges_track_object_set_inpoint (GESTrackObject * object, guint64 inpoint)
   g_return_if_fail (GES_IS_TRACK_OBJECT (object));
 
   if (ges_track_object_set_inpoint_internal (object, inpoint))
-#if GLIB_CHECK_VERSION(2,26,0)
     g_object_notify_by_pspec (G_OBJECT (object), properties[PROP_INPOINT]);
-#else
-    g_object_notify (G_OBJECT (object), "in-point");
-#endif
 }
 
 static inline gboolean
@@ -464,11 +456,7 @@ ges_track_object_set_duration (GESTrackObject * object, guint64 duration)
   g_return_if_fail (GES_IS_TRACK_OBJECT (object));
 
   if (ges_track_object_set_duration_internal (object, duration))
-#if GLIB_CHECK_VERSION(2,26,0)
     g_object_notify_by_pspec (G_OBJECT (object), properties[PROP_DURATION]);
-#else
-    g_object_notify (G_OBJECT (object), "duration");
-#endif
 }
 
 static inline gboolean
@@ -504,11 +492,7 @@ void
 ges_track_object_set_priority (GESTrackObject * object, guint32 priority)
 {
   if (ges_track_object_set_priority_internal (object, priority))
-#if GLIB_CHECK_VERSION(2,26,0)
     g_object_notify_by_pspec (G_OBJECT (object), properties[PROP_PRIORITY]);
-#else
-    g_object_notify (G_OBJECT (object), "priority");
-#endif
 }
 
 
@@ -977,11 +961,7 @@ ges_track_object_set_locked (GESTrackObject * object, gboolean locked)
   GST_DEBUG_OBJECT (object, "%s object", locked ? "Locking" : "Unlocking");
 
   ges_track_object_set_locked_internal (object, locked);
-#if GLIB_CHECK_VERSION(2,26,0)
   g_object_notify_by_pspec (G_OBJECT (object), properties[PROP_LOCKED]);
-#else
-  g_object_notify (G_OBJECT (object), "locked");
-#endif
 
 }
 
@@ -1637,9 +1617,6 @@ ges_track_object_edit (GESTrackObject * object,
     GST_WARNING_OBJECT (object, "Trying to edit in %d mode but not in"
         "any Track yet.", mode);
     return FALSE;
-  } else if (position < 0) {
-    GST_DEBUG_OBJECT (object, "Trying to move before 0, not moving");
-    return FALSE;
   }
 
   timeline = GES_TIMELINE (ges_track_get_timeline (track));

ges/ges-track-video-transition.c

@@ -31,6 +31,15 @@
 G_DEFINE_TYPE (GESTrackVideoTransition, ges_track_video_transition,
     GES_TYPE_TRACK_TRANSITION);
 
+static inline void
+ges_track_video_transition_set_border_internal (GESTrackVideoTransition * self,
+    guint border);
+static inline void
+ges_track_video_transition_set_inverted_internal (GESTrackVideoTransition *
+    self, gboolean inverted);
+static inline gboolean
+ges_track_video_transition_set_transition_type_internal (GESTrackVideoTransition
+    * self, GESVideoStandardTransitionType type);
 struct _GESTrackVideoTransitionPrivate
 {
   GESVideoStandardTransitionType type;
@@ -48,9 +57,6 @@ struct _GESTrackVideoTransitionPrivate
   GstPad *sinka;
   GstPad *sinkb;
 
-  gulong switch_to_smpte_prob;
-  gulong switch_to_cfade_prob;
-
   /* these will be different depending on whether smptealpha or alpha element
    * is used */
   gdouble start_value;
@@ -59,13 +65,20 @@ struct _GESTrackVideoTransitionPrivate
 
   /* This is in case the smpte doesn't exist yet */
   gint pending_border_value;
+  gboolean pending_inverted;
 };
 
 enum
 {
   PROP_0,
+  PROP_BORDER,
+  PROP_TRANSITION_TYPE,
+  PROP_INVERT,
+  PROP_LAST
 };
 
+static GParamSpec *properties[PROP_LAST];
+
 #define fast_element_link(a,b) gst_element_link_pads_full((a),"src",(b),"sink",GST_PAD_LINK_CHECK_NOTHING)
 
 static GObject *link_element_to_mixer (GstElement * element,
@@ -101,13 +114,50 @@ ges_track_video_transition_class_init (GESTrackVideoTransitionClass * klass)
   g_type_class_add_private (klass, sizeof (GESTrackVideoTransitionPrivate));
 
   object_class = G_OBJECT_CLASS (klass);
-  toclass = GES_TRACK_OBJECT_CLASS (klass);
 
   object_class->get_property = ges_track_video_transition_get_property;
   object_class->set_property = ges_track_video_transition_set_property;
   object_class->dispose = ges_track_video_transition_dispose;
   object_class->finalize = ges_track_video_transition_finalize;
 
+  /**
+   * GESTrackVideoTransition:border
+   *
+   * This value represents the border width of the transition.
+   *
+   */
+  properties[PROP_BORDER] =
+      g_param_spec_uint ("border", "Border", "The border width", 0,
+      G_MAXUINT, 0, G_PARAM_READWRITE);
+  g_object_class_install_property (object_class, PROP_BORDER,
+      properties[PROP_BORDER]);
+
+  /**
+   * GESTrackVideoTransition:type
+   *
+   * The #GESVideoStandardTransitionType currently applied on the object
+   *
+   */
+  properties[PROP_TRANSITION_TYPE] =
+      g_param_spec_enum ("transition-type", "Transition type",
+      "The type of the transition", GES_VIDEO_STANDARD_TRANSITION_TYPE_TYPE,
+      GES_VIDEO_STANDARD_TRANSITION_TYPE_NONE, G_PARAM_READWRITE);
+  g_object_class_install_property (object_class, PROP_TRANSITION_TYPE,
+      properties[PROP_TRANSITION_TYPE]);
+
+  /**
+   * GESTrackVideoTransition:invert
+   *
+   * This value represents the direction of the transition.
+   *
+   */
+  properties[PROP_INVERT] =
+      g_param_spec_boolean ("invert", "Invert",
+      "Whether the transition is inverted", FALSE, G_PARAM_READWRITE);
+  g_object_class_install_property (object_class, PROP_INVERT,
+      properties[PROP_INVERT]);
+
+  toclass = GES_TRACK_OBJECT_CLASS (klass);
   toclass->duration_changed = ges_track_video_transition_duration_changed;
   toclass->create_element = ges_track_video_transition_create_element;
 }
@@ -130,9 +180,7 @@ ges_track_video_transition_init (GESTrackVideoTransition * self)
   self->priv->end_value = 0.0;
   self->priv->dur = 42;
   self->priv->pending_border_value = -1;
-
+  self->priv->pending_inverted = FALSE;
-  self->priv->switch_to_smpte_prob = -1;
-  self->priv->switch_to_cfade_prob = -1;
 }
 
 static void
@@ -180,7 +228,19 @@ static void
 ges_track_video_transition_get_property (GObject * object,
     guint property_id, GValue * value, GParamSpec * pspec)
 {
+  GESTrackVideoTransition *tr = GES_TRACK_VIDEO_TRANSITION (object);
+
   switch (property_id) {
+    case PROP_BORDER:
+      g_value_set_uint (value, ges_track_video_transition_get_border (tr));
+      break;
+    case PROP_TRANSITION_TYPE:
+      g_value_set_enum (value,
+          ges_track_video_transition_get_transition_type (tr));
+      break;
+    case PROP_INVERT:
+      g_value_set_boolean (value, ges_track_video_transition_is_inverted (tr));
+      break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
   }
@@ -190,7 +250,21 @@ static void
 ges_track_video_transition_set_property (GObject * object,
     guint property_id, const GValue * value, GParamSpec * pspec)
 {
+  GESTrackVideoTransition *tr = GES_TRACK_VIDEO_TRANSITION (object);
+
   switch (property_id) {
+    case PROP_BORDER:
+      ges_track_video_transition_set_border_internal (tr,
+          g_value_get_uint (value));
+      break;
+    case PROP_TRANSITION_TYPE:
+      ges_track_video_transition_set_transition_type_internal (tr,
+          g_value_get_enum (value));
+      break;
+    case PROP_INVERT:
+      ges_track_video_transition_set_inverted_internal (tr,
+          g_value_get_boolean (value));
+      break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
   }
@@ -226,9 +300,6 @@ create_mixer (GstElement * topbin)
 {
   GstElement *mixer = NULL;
 
-  /* Prefer videomixer2 to videomixer */
-  mixer = gst_element_factory_make ("videomixer2", NULL);
-  if (mixer == NULL)
   mixer = gst_element_factory_make ("videomixer", NULL);
   g_object_set (G_OBJECT (mixer), "background", 1, NULL);
   gst_bin_add (GST_BIN (topbin), mixer);
@@ -412,8 +483,6 @@ switch_to_smpte_cb (GstPad * sink, gboolean blocked,
   GstElement *smptealphab = gst_element_factory_make ("smptealpha", NULL);
   GESTrackVideoTransitionPrivate *priv = transition->priv;
 
-  GST_ERROR ("EHE");
-
   if (priv->pending_type == GES_VIDEO_STANDARD_TRANSITION_TYPE_CROSSFADE)
     goto beach;
 
@@ -427,6 +496,11 @@ switch_to_smpte_cb (GstPad * sink, gboolean blocked,
     priv->pending_border_value = -1;
   }
 
+  if (priv->pending_inverted) {
+    g_object_set (smptealphab, "invert", priv->pending_inverted, NULL);
+    priv->pending_inverted = FALSE;
+  }
+
   replace_mixer (priv);
 
   priv->start_value = 1.0;
@@ -448,9 +522,8 @@ switch_to_smpte_cb (GstPad * sink, gboolean blocked,
 
 beach:
   priv->pending_type = GES_VIDEO_STANDARD_TRANSITION_TYPE_NONE;
-  gst_pad_remove_probe (sink, priv->switch_to_smpte_prob);
 
-  return GST_PAD_PROBE_OK;
+  return GST_PAD_PROBE_REMOVE;
 }
 
 static GstElement *
@@ -493,8 +566,6 @@ switch_to_crossfade_cb (GstPad * sink, gboolean blocked,
   GstElement *peerb;
   GESTrackVideoTransitionPrivate *priv = transition->priv;
 
-  GST_ERROR ("EHE");
-
   GST_INFO ("Bin %p switching from smpte to crossfade", priv->topbin);
 
   if (priv->pending_type != GES_VIDEO_STANDARD_TRANSITION_TYPE_CROSSFADE)
@@ -527,15 +598,14 @@ switch_to_crossfade_cb (GstPad * sink, gboolean blocked,
 
 beach:
   priv->pending_type = GES_VIDEO_STANDARD_TRANSITION_TYPE_NONE;
-  gst_pad_remove_probe (sink, priv->switch_to_cfade_prob);
 
-  return GST_PAD_PROBE_OK;
+  return GST_PAD_PROBE_REMOVE;
 }
 
 static GObject *
 link_element_to_mixer (GstElement * element, GstElement * mixer)
 {
-  GstPad *sinkpad = gst_element_get_request_pad (mixer, "sink_%d");
+  GstPad *sinkpad = gst_element_get_request_pad (mixer, "sink_%u");
   GstPad *srcpad = gst_element_get_static_pad (element, "src");
 
   gst_pad_link_full (srcpad, sinkpad, GST_PAD_LINK_CHECK_NOTHING);
@@ -597,18 +667,8 @@ ges_track_video_transition_duration_changed (GESTrackObject * object,
   GST_LOG ("done updating controller");
 }
 
-/**
+static inline void
- * ges_track_video_transition_get_border:
+ges_track_video_transition_set_border_internal (GESTrackVideoTransition * self,
- * @self: The #GESTrackVideoTransition to get the border from
- * @value: The value of the borer to set on @object
- *
- * Set the border property of @self, this value represents
- * the border width of the transition. In case this value does
- * not make sense for the current transition type, it is cached
- * for later use.
- */
-void
-ges_track_video_transition_set_border (GESTrackVideoTransition * self,
     guint value)
 {
   GESTrackVideoTransitionPrivate *priv = self->priv;
@@ -620,42 +680,23 @@ ges_track_video_transition_set_border (GESTrackVideoTransition * self,
   g_object_set (priv->smpte, "border", value, NULL);
 }
 
-/**
+static inline void
- * ges_track_video_transition_get_border:
+ges_track_video_transition_set_inverted_internal (GESTrackVideoTransition *
- * @self: The #GESTrackVideoTransition to get the border from
+    self, gboolean inverted)
- *
- * Get the border property of @self, this value represents
- * the border width of the transition.
- *
- * Returns: The border values of @self or -1 if not meaningfull
- * (this will happen when not using a smpte transition).
- */
-gint
-ges_track_video_transition_get_border (GESTrackVideoTransition * self)
 {
-  gint value;
+  GESTrackVideoTransitionPrivate *priv = self->priv;
 
-  if (!self->priv->smpte) {
+  if (!priv->smpte) {
-    return -1;
+    priv->pending_inverted = inverted;
+    return;
+  }
+  g_object_set (priv->smpte, "invert", inverted, NULL);
 }
 
-  g_object_get (self->priv->smpte, "border", &value, NULL);
 
-  return value;
+static inline gboolean
-}
+ges_track_video_transition_set_transition_type_internal (GESTrackVideoTransition
-
+    * self, GESVideoStandardTransitionType type)
-/**
- * ges_track_video_transition_set_transition_type:
- * @self: a #GESTrackVideoTransition
- * @type: a #GESVideoStandardTransitionType
- *
- * Sets the transition being used to @type.
- *
- * Returns: %TRUE if the transition type was properly changed, else %FALSE.
- */
-gboolean
-ges_track_video_transition_set_transition_type (GESTrackVideoTransition * self,
-    GESVideoStandardTransitionType type)
 {
   GESTrackVideoTransitionPrivate *priv = self->priv;
 
@@ -681,19 +722,15 @@ ges_track_video_transition_set_transition_type (GESTrackVideoTransition * self,
     if (type != GES_VIDEO_STANDARD_TRANSITION_TYPE_CROSSFADE) {
       if (!priv->topbin)
         return FALSE;
-      GST_ERROR ("OO");
       priv->smpte = NULL;
-      priv->switch_to_smpte_prob =
+      gst_pad_add_probe (pad, GST_PAD_PROBE_TYPE_IDLE,
-          gst_pad_add_probe (pad, GST_PAD_PROBE_TYPE_BLOCK_UPSTREAM,
           (GstPadProbeCallback) switch_to_smpte_cb, self, NULL);
-      GST_ERROR ("OO");
     } else {
       if (!priv->topbin)
         return FALSE;
       priv->start_value = 1.0;
       priv->end_value = 0.0;
-      priv->switch_to_cfade_prob =
+      gst_pad_add_probe (pad, GST_PAD_PROBE_TYPE_IDLE,
-          gst_pad_add_probe (pad, GST_PAD_PROBE_TYPE_BLOCK_UPSTREAM,
           (GstPadProbeCallback) switch_to_crossfade_cb, self, NULL);
     }
     return TRUE;
@@ -705,6 +742,112 @@ ges_track_video_transition_set_transition_type (GESTrackVideoTransition * self,
   return TRUE;
 }
 
+/**
+ * ges_track_video_transition_set_border:
+ * @self: The #GESTrackVideoTransition to set the border to
+ * @value: The value of the border to set on @object
+ *
+ * Set the border property of @self, this value represents
+ * the border width of the transition. In case this value does
+ * not make sense for the current transition type, it is cached
+ * for later use.
+ */
+void
+ges_track_video_transition_set_border (GESTrackVideoTransition * self,
+    guint value)
+{
+  ges_track_video_transition_set_border_internal (self, value);
+
+  g_object_notify_by_pspec (G_OBJECT (self), properties[PROP_BORDER]);
+}
+
+/**
+ * ges_track_video_transition_get_border:
+ * @self: The #GESTrackVideoTransition to get the border from
+ *
+ * Get the border property of @self, this value represents
+ * the border width of the transition.
+ *
+ * Returns: The border values of @self or -1 if not meaningful
+ * (this will happen when not using a smpte transition).
+ */
+gint
+ges_track_video_transition_get_border (GESTrackVideoTransition * self)
+{
+  gint value;
+
+  if (!self->priv->smpte) {
+    return -1;
+  }
+
+  g_object_get (self->priv->smpte, "border", &value, NULL);
+
+  return value;
+}
+
+/**
+ * ges_track_video_transition_set_inverted:
+ * @self: The #GESTrackVideoTransition to set invert on
+ * @value: The value of the  to set on @object
+ *
+ * Set the invert property of @self, this value represents
+ * the direction of the transition. In case this value does
+ * not make sense for the current transition type, it is cached
+ * for later use.
+ */
+void
+ges_track_video_transition_set_inverted (GESTrackVideoTransition * self,
+    gboolean inverted)
+{
+  ges_track_video_transition_set_inverted (self, inverted);
+
+  g_object_notify_by_pspec (G_OBJECT (self), properties[PROP_INVERT]);
+}
+
+/**
+ * ges_track_video_transition_is_inverted:
+ * @self: The #GESTrackVideoTransition to get the inversion from
+ *
+ * Get the invert property of @self, this value represents
+ * the direction of the transition.
+ *
+ * Returns: The invert value of @self
+ */
+gboolean
+ges_track_video_transition_is_inverted (GESTrackVideoTransition * self)
+{
+  gboolean inverted;
+
+  if (!self->priv->smpte) {
+    return FALSE;
+  }
+
+  g_object_get (self->priv->smpte, "invert", &inverted, NULL);
+
+  return inverted;
+}
+
+/**
+ * ges_track_video_transition_set_transition_type:
+ * @self: a #GESTrackVideoTransition
+ * @type: a #GESVideoStandardTransitionType
+ *
+ * Sets the transition being used to @type.
+ *
+ * Returns: %TRUE if the transition type was properly changed, else %FALSE.
+ */
+gboolean
+ges_track_video_transition_set_transition_type (GESTrackVideoTransition * self,
+    GESVideoStandardTransitionType type)
+{
+  gboolean ret =
+      ges_track_video_transition_set_transition_type_internal (self, type);
+
+  g_object_notify_by_pspec (G_OBJECT (self), properties[PROP_TRANSITION_TYPE]);
+
+  return ret;
+}
+
 /**
  * ges_track_video_transition_get_transition_type:
  * @trans: a #GESTrackVideoTransition

ges/ges-track-video-transition.h

@@ -87,6 +87,10 @@ void ges_track_video_transition_set_border              (GESTrackVideoTransition
                                                          guint value);
 gint ges_track_video_transition_get_border              (GESTrackVideoTransition * self);
 
+void ges_track_video_transition_set_inverted            (GESTrackVideoTransition * self,
+                                                         gboolean inverted);
+gboolean ges_track_video_transition_is_inverted        (GESTrackVideoTransition * self);
+
 G_END_DECLS
 
 #endif /* _GES_TRACK_VIDEO_transition */

ges/ges-track.c

@@ -625,11 +625,7 @@ composition_duration_cb (GstElement * composition,
 
     obj->priv->duration = duration;
 
-#if GLIB_CHECK_VERSION(2,26,0)
     g_object_notify_by_pspec (G_OBJECT (obj), properties[ARG_DURATION]);
-#else
-    g_object_notify (G_OBJECT (obj), "duration");
-#endif
   }
 }