X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=gst%2Fgstobject.c;h=9ce57fdf5deaf35e9582fc5141273358f63e0f2b;hb=321ee10bd6a3fec0951e93e3e112603693d86c33;hp=c1653153c9604863bfd9269868323541b48ff624;hpb=870a5b0e12a5da2564982803039c14490a764af9;p=platform%2Fupstream%2Fgstreamer.git

diff --git a/gst/gstobject.c b/gst/gstobject.c
index c165315..9ce57fd 100644
--- a/gst/gstobject.c
+++ b/gst/gstobject.c
@@ -113,16 +113,16 @@
  *   <listitem><para>
  *     create a #GstControlSource.
  *     csource = gst_interpolation_control_source_new ();
- *     gst_interpolation_control_source_set_interpolation_mode(csource, mode);
+ *     g_object_set (csource, "mode", GST_INTERPOLATION_MODE_LINEAR, NULL);
  *   </para></listitem>
  *   <listitem><para>
  *     Attach the #GstControlSource on the controller to a property.
- *     gst_object_set_control_source (object, "prop1", csource);
+ *     gst_object_add_control_binding (object, gst_control_binding_direct_new (objetct, "prop1", csource));
  *   </para></listitem>
  *   <listitem><para>
  *     Set the control values
- *     gst_interpolation_control_source_set (csource,0 * GST_SECOND, value1);
- *     gst_interpolation_control_source_set (csource,1 * GST_SECOND, value2);
+ *     gst_timed_value_control_source_set ((GstTimedValueControlSource *)csource,0 * GST_SECOND, value1);
+ *     gst_timed_value_control_source_set ((GstTimedValueControlSource *)csource,1 * GST_SECOND, value2);
  *   </para></listitem>
  *   <listitem><para>
  *     start your pipeline
@@ -140,6 +140,7 @@
 #include "gstobject.h"
 #include "gstmarshal.h"
 #include "gstclock.h"
+#include "gstcontrolbinding.h"
 #include "gstcontrolsource.h"
 #include "gstinfo.h"
 #include "gstparamspecs.h"
@@ -195,21 +196,6 @@ static guint gst_object_signals[LAST_SIGNAL] = { 0 };
 
 static GParamSpec *properties[PROP_LAST];
 
-/*
- * GstControlledProperty:
- */
-typedef struct _GstControlledProperty
-{
-  GParamSpec *pspec;            /* GParamSpec for this property */
-  const gchar *name;            /* name of the property */
-  GstControlSource *csource;    /* GstControlSource for this property */
-  gboolean disabled;
-  GValue last_value;
-} GstControlledProperty;
-
-static void gst_controlled_property_free (GstControlledProperty * prop);
-
-
 G_DEFINE_ABSTRACT_TYPE (GstObject, gst_object, G_TYPE_INITIALLY_UNOWNED);
 
 static void
@@ -218,7 +204,8 @@ gst_object_class_init (GstObjectClass * klass)
   GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
 
 #ifndef GST_DISABLE_TRACE
-  _gst_object_trace = gst_alloc_trace_register (g_type_name (GST_TYPE_OBJECT));
+  _gst_object_trace =
+      _gst_alloc_trace_register (g_type_name (GST_TYPE_OBJECT), 0);
 #endif
 
   gobject_class->set_property = gst_object_set_property;
@@ -227,14 +214,12 @@ gst_object_class_init (GstObjectClass * klass)
   properties[PROP_NAME] =
       g_param_spec_string ("name", "Name", "The name of the object", NULL,
       G_PARAM_READWRITE | G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS);
-  g_object_class_install_property (gobject_class, PROP_NAME,
-      properties[PROP_NAME]);
 
   properties[PROP_PARENT] =
       g_param_spec_object ("parent", "Parent", "The parent of the object",
       GST_TYPE_OBJECT, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
-  g_object_class_install_property (gobject_class, PROP_PARENT,
-      properties[PROP_PARENT]);
+
+  g_object_class_install_properties (gobject_class, PROP_LAST, properties);
 
   /**
    * GstObject::deep-notify:
@@ -266,13 +251,13 @@ gst_object_class_init (GstObjectClass * klass)
 static void
 gst_object_init (GstObject * object)
 {
-  object->lock = g_mutex_new ();
+  g_mutex_init (&object->lock);
   object->parent = NULL;
   object->name = NULL;
   GST_CAT_TRACE_OBJECT (GST_CAT_REFCOUNTING, object, "%p new", object);
 
 #ifndef GST_DISABLE_TRACE
-  gst_alloc_trace_new (_gst_object_trace, object);
+  _gst_alloc_trace_new (_gst_object_trace, object);
 #endif
 
   object->flags = 0;
@@ -425,14 +410,14 @@ gst_object_dispose (GObject * object)
   GST_OBJECT_PARENT (object) = NULL;
   GST_OBJECT_UNLOCK (object);
 
-  if (self->properties) {
+  if (self->control_bindings) {
     GList *node;
 
-    for (node = self->properties; node; node = g_list_next (node)) {
-      gst_controlled_property_free ((GstControlledProperty *) node->data);
+    for (node = self->control_bindings; node; node = g_list_next (node)) {
+      g_object_unref (node->data);
     }
-    g_list_free (self->properties);
-    self->properties = NULL;
+    g_list_free (self->control_bindings);
+    self->control_bindings = NULL;
   }
 
   ((GObjectClass *) gst_object_parent_class)->dispose (object);
@@ -464,10 +449,10 @@ gst_object_finalize (GObject * object)
   g_signal_handlers_destroy (object);
 
   g_free (gstobject->name);
-  g_mutex_free (gstobject->lock);
+  g_mutex_clear (&gstobject->lock);
 
 #ifndef GST_DISABLE_TRACE
-  gst_alloc_trace_free (_gst_object_trace, object);
+  _gst_alloc_trace_free (_gst_object_trace, object);
 #endif
 
   ((GObjectClass *) gst_object_parent_class)->finalize (object);
@@ -748,7 +733,7 @@ gst_object_set_parent (GstObject * object, GstObject * parent)
     goto had_parent;
 
   object->parent = parent;
-  g_object_ref_sink (object);
+  gst_object_ref_sink (object);
   GST_OBJECT_UNLOCK (object);
 
   /* FIXME, this does not work, the deep notify takes the lock from the parent
@@ -1037,211 +1022,37 @@ gst_object_get_path_string (GstObject * object)
 /* controller helper functions */
 
 /*
- * gst_controlled_property_new:
- * @object: for which object the controlled property should be set up
- * @name: the name of the property to be controlled
- *
- * Private method which initializes the fields of a new controlled property
- * structure.
- *
- * Returns: a freshly allocated structure or %NULL
- */
-static GstControlledProperty *
-gst_controlled_property_new (GstObject * object, const gchar * name)
-{
-  GstControlledProperty *prop = NULL;
-  GParamSpec *pspec;
-
-  GST_INFO ("trying to put property '%s' under control", name);
-
-  /* check if the object has a property of that name */
-  if ((pspec =
-          g_object_class_find_property (G_OBJECT_GET_CLASS (object), name))) {
-    GST_DEBUG ("  psec->flags : 0x%08x", pspec->flags);
-
-    /* check if this param is witable && controlable && !construct-only */
-    g_return_val_if_fail ((pspec->flags & (G_PARAM_WRITABLE |
-                GST_PARAM_CONTROLLABLE | G_PARAM_CONSTRUCT_ONLY)) ==
-        (G_PARAM_WRITABLE | GST_PARAM_CONTROLLABLE), NULL);
-
-    if ((prop = g_slice_new (GstControlledProperty))) {
-      prop->pspec = pspec;
-      prop->name = pspec->name;
-      prop->csource = NULL;
-      prop->disabled = FALSE;
-      memset (&prop->last_value, 0, sizeof (GValue));
-      g_value_init (&prop->last_value, G_PARAM_SPEC_VALUE_TYPE (prop->pspec));
-    }
-  } else {
-    GST_WARNING ("class '%s' has no property '%s'", G_OBJECT_TYPE_NAME (object),
-        name);
-  }
-  return prop;
-}
-
-/*
- * gst_controlled_property_free:
- * @prop: the object to free
- *
- * Private method which frees all data allocated by a #GstControlledProperty
- * instance.
- */
-static void
-gst_controlled_property_free (GstControlledProperty * prop)
-{
-  if (prop->csource)
-    g_object_unref (prop->csource);
-  g_value_unset (&prop->last_value);
-  g_slice_free (GstControlledProperty, prop);
-}
-
-/*
- * gst_object_find_controlled_property:
+ * gst_object_find_control_binding:
  * @self: the gobject to search for a property in
  * @name: the gobject property name to look for
  *
  * Searches the list of properties under control.
  *
- * Returns: a #GstControlledProperty or %NULL if the property is not being
+ * Returns: a #GstControlBinding or %NULL if the property is not being
  * controlled.
  */
-static GstControlledProperty *
-gst_object_find_controlled_property (GstObject * self, const gchar * name)
+static GstControlBinding *
+gst_object_find_control_binding (GstObject * self, const gchar * name)
 {
-  GstControlledProperty *prop;
+  GstControlBinding *binding;
   GList *node;
 
-  for (node = self->properties; node; node = g_list_next (node)) {
-    prop = node->data;
+  for (node = self->control_bindings; node; node = g_list_next (node)) {
+    binding = node->data;
     /* FIXME: eventually use GQuark to speed it up */
-    if (!strcmp (prop->name, name)) {
-      return prop;
+    if (!strcmp (binding->name, name)) {
+      GST_DEBUG_OBJECT (self, "found control binding for property '%s'", name);
+      return binding;
     }
   }
-  GST_DEBUG ("controller does not (yet) manage property '%s'", name);
+  GST_DEBUG_OBJECT (self, "controller does not manage property '%s'", name);
 
   return NULL;
 }
 
-/*
- * gst_object_add_controlled_property:
- * @self: the object
- * @name: name of projecty in @object
- *
- * Creates a new #GstControlledProperty if there is none for property @name yet.
- *
- * Returns: %TRUE if the property has been added to the controller
- */
-static gboolean
-gst_object_add_controlled_property (GstObject * self, const gchar * name)
-{
-  gboolean res = TRUE;
-
-  /* test if this property isn't yet controlled */
-  if (!gst_object_find_controlled_property (self, name)) {
-    GstControlledProperty *prop;
-
-    /* create GstControlledProperty and add to self->properties list */
-    if ((prop = gst_controlled_property_new (self, name))) {
-      self->properties = g_list_prepend (self->properties, prop);
-      GST_DEBUG_OBJECT (self, "property %s added", name);
-    } else
-      res = FALSE;
-  } else {
-    GST_WARNING_OBJECT (self, "trying to control property %s again", name);
-  }
-  return res;
-}
-
-/*
- * gst_object_remove_controlled_property:
- * @self: the object
- * @name: name of projecty in @object
- *
- * Removes a #GstControlledProperty for property @name.
- *
- * Returns: %TRUE if the property has been removed from the controller
- */
-static gboolean
-gst_object_remove_controlled_property (GstObject * self, const gchar * name)
-{
-  gboolean res = TRUE;
-  GstControlledProperty *prop;
-
-  if ((prop = gst_object_find_controlled_property (self, name))) {
-    self->properties = g_list_remove (self->properties, prop);
-    //g_signal_handler_disconnect (self->object, prop->notify_handler_id);
-    gst_controlled_property_free (prop);
-    GST_DEBUG_OBJECT (self, "property %s removed", name);
-  } else {
-    res = FALSE;
-  }
-  return res;
-}
-
 /* controller functions */
 
 /**
- * gst_object_control_properties:
- * @object: the object of which some properties should be controlled
- * @...: %NULL terminated list of property names that should be controlled
- *
- * Creates a GstController that allows you to dynamically control one, or more,
- * GObject properties. If the given GstObject already has a GstController,
- * it adds the given properties to the existing
- * controller and returns that controller.
- *
- * Returns: %TRUE if the properties have been made controllable.
- */
-gboolean
-gst_object_control_properties (GstObject * object, ...)
-{
-  gboolean res = TRUE;
-  va_list var_args;
-  gchar *name;
-
-  g_return_val_if_fail (GST_IS_OBJECT (object), FALSE);
-
-  va_start (var_args, object);
-  GST_OBJECT_LOCK (object);
-  while ((name = va_arg (var_args, gchar *))) {
-    res &= gst_object_add_controlled_property (object, name);
-  }
-  GST_OBJECT_UNLOCK (object);
-  va_end (var_args);
-  return res;
-}
-
-/**
- * gst_object_uncontrol_properties:
- * @object: the object of which some properties should not be controlled anymore
- * @...: %NULL terminated list of property names that should be controlled
- *
- * Removes the given element's properties from it's controller
- *
- * Returns: %FALSE if one of the given property names isn't handled by the
- * controller, %TRUE otherwise
- */
-gboolean
-gst_object_uncontrol_properties (GstObject * object, ...)
-{
-  gboolean res = TRUE;
-  va_list var_args;
-  gchar *name;
-
-  g_return_val_if_fail (GST_IS_OBJECT (object), FALSE);
-
-  va_start (var_args, object);
-  GST_OBJECT_LOCK (object);
-  while ((name = va_arg (var_args, gchar *))) {
-    res &= gst_object_remove_controlled_property (object, name);
-  }
-  GST_OBJECT_UNLOCK (object);
-  va_end (var_args);
-  return (res);
-}
-
-/**
  * gst_object_suggest_next_sync:
  * @object: the object that has controlled properties
  *
@@ -1290,48 +1101,22 @@ gst_object_suggest_next_sync (GstObject * object)
 gboolean
 gst_object_sync_values (GstObject * object, GstClockTime timestamp)
 {
-  GstControlledProperty *prop;
   GList *node;
-  gboolean ret = TRUE, val_ret;
-  GValue value = { 0, };
+  gboolean ret = TRUE;
 
   g_return_val_if_fail (GST_IS_OBJECT (object), FALSE);
   g_return_val_if_fail (GST_CLOCK_TIME_IS_VALID (timestamp), FALSE);
 
-  GST_LOG ("sync_values");
+  GST_LOG_OBJECT (object, "sync_values");
+  if (!object->control_bindings)
+    return TRUE;
 
   /* FIXME: this deadlocks */
   /* GST_OBJECT_LOCK (object); */
   g_object_freeze_notify ((GObject *) object);
-  /* go over the controlled properties of the controller */
-  for (node = object->properties; node; node = g_list_next (node)) {
-    prop = node->data;
-
-    if (!prop->csource || prop->disabled)
-      continue;
-
-    GST_LOG ("property '%s' at ts=%" G_GUINT64_FORMAT, prop->name, timestamp);
-
-    /* we can make this faster
-     * http://bugzilla.gnome.org/show_bug.cgi?id=536939
-     */
-    g_value_init (&value, G_PARAM_SPEC_VALUE_TYPE (prop->pspec));
-    val_ret = gst_control_source_get_value (prop->csource, timestamp, &value);
-    if (G_LIKELY (val_ret)) {
-      /* always set the value for first time, but then only if it changed
-       * this should limit g_object_notify invocations.
-       * FIXME: can we detect negative playback rates?
-       */
-      if ((timestamp < object->last_sync) ||
-          gst_value_compare (&value, &prop->last_value) != GST_VALUE_EQUAL) {
-        g_object_set_property ((GObject *) object, prop->name, &value);
-        g_value_copy (&value, &prop->last_value);
-      }
-    } else {
-      GST_DEBUG ("no control value for param %s", prop->name);
-    }
-    g_value_unset (&value);
-    ret &= val_ret;
+  for (node = object->control_bindings; node; node = g_list_next (node)) {
+    ret &= gst_control_binding_sync_values ((GstControlBinding *) node->data,
+        object, timestamp, object->last_sync);
   }
   object->last_sync = timestamp;
   g_object_thaw_notify ((GObject *) object);
@@ -1340,8 +1125,9 @@ gst_object_sync_values (GstObject * object, GstClockTime timestamp)
   return ret;
 }
 
+
 /**
- * gst_object_has_active_controlled_properties:
+ * gst_object_has_active_control_bindings:
  * @object: the object that has controlled properties
  *
  * Check if the @object has an active controlled properties.
@@ -1349,51 +1135,47 @@ gst_object_sync_values (GstObject * object, GstClockTime timestamp)
  * Returns: %TRUE if the object has active controlled properties
  */
 gboolean
-gst_object_has_active_controlled_properties (GstObject * object)
+gst_object_has_active_control_bindings (GstObject * object)
 {
   gboolean res = FALSE;
   GList *node;
-  GstControlledProperty *prop;
 
   g_return_val_if_fail (GST_IS_OBJECT (object), FALSE);
 
   GST_OBJECT_LOCK (object);
-  for (node = object->properties; node; node = node->next) {
-    prop = node->data;
-    res |= !prop->disabled;
+  for (node = object->control_bindings; node; node = g_list_next (node)) {
+    res |= !gst_control_binding_is_disabled ((GstControlBinding *) node->data);
   }
   GST_OBJECT_UNLOCK (object);
   return res;
 }
 
 /**
- * gst_object_set_controlled_properties_disabled:
+ * gst_object_set_control_bindings_disabled:
  * @object: the object that has controlled properties
  * @disabled: boolean that specifies whether to disable the controller
  * or not.
  *
  * This function is used to disable all controlled properties of the @object for
- * some time, i.e. gst_object_sync_values() will do nothing..
+ * some time, i.e. gst_object_sync_values() will do nothing.
  */
 void
-gst_object_set_controlled_properties_disabled (GstObject * object,
-    gboolean disabled)
+gst_object_set_control_bindings_disabled (GstObject * object, gboolean disabled)
 {
   GList *node;
-  GstControlledProperty *prop;
 
   g_return_if_fail (GST_IS_OBJECT (object));
 
   GST_OBJECT_LOCK (object);
-  for (node = object->properties; node; node = node->next) {
-    prop = node->data;
-    prop->disabled = disabled;
+  for (node = object->control_bindings; node; node = g_list_next (node)) {
+    gst_control_binding_set_disabled ((GstControlBinding *) node->data,
+        disabled);
   }
   GST_OBJECT_UNLOCK (object);
 }
 
 /**
- * gst_object_set_controlled_property_disabled:
+ * gst_object_set_control_binding_disabled:
  * @object: the object that has controlled properties
  * @property_name: property to disable
  * @disabled: boolean that specifies whether to disable the controller
@@ -1404,88 +1186,113 @@ gst_object_set_controlled_properties_disabled (GstObject * object,
  * property.
  */
 void
-gst_object_set_controlled_property_disabled (GstObject * object,
+gst_object_set_control_binding_disabled (GstObject * object,
     const gchar * property_name, gboolean disabled)
 {
-  GstControlledProperty *prop;
+  GstControlBinding *binding;
 
   g_return_if_fail (GST_IS_OBJECT (object));
   g_return_if_fail (property_name);
 
   GST_OBJECT_LOCK (object);
-  if ((prop = gst_object_find_controlled_property (object, property_name))) {
-    prop->disabled = disabled;
+  if ((binding = gst_object_find_control_binding (object, property_name))) {
+    gst_control_binding_set_disabled (binding, disabled);
   }
   GST_OBJECT_UNLOCK (object);
 }
 
+
 /**
- * gst_object_set_control_source:
+ * gst_object_add_control_binding:
  * @object: the controller object
- * @property_name: name of the property for which the #GstControlSource should be set
- * @csource: the #GstControlSource that should be used for the property
+ * @binding: (transfer full): the #GstControlBinding that should be used
  *
- * Sets the #GstControlSource for @property_name. If there already was a #GstControlSource
- * for this property it will be unreferenced.
+ * Sets the #GstControlBinding. If there already was a #GstControlBinding
+ * for this property it will be replaced.
+ * The @object will take ownership of the @binding.
  *
- * Returns: %FALSE if the given property isn't handled by the controller or the new #GstControlSource
- * couldn't be bound to the property, %TRUE if everything worked as expected.
+ * Returns: %FALSE if the given @binding has not been setup for this object  or
+ * %TRUE otherwise.
  */
 gboolean
-gst_object_set_control_source (GstObject * object, const gchar * property_name,
-    GstControlSource * csource)
+gst_object_add_control_binding (GstObject * object, GstControlBinding * binding)
 {
-  GstControlledProperty *prop;
-  gboolean ret = FALSE;
+  GstControlBinding *old;
 
   g_return_val_if_fail (GST_IS_OBJECT (object), FALSE);
-  g_return_val_if_fail (property_name, FALSE);
-  g_return_val_if_fail ((!csource || GST_IS_CONTROL_SOURCE (csource)), FALSE);
+  g_return_val_if_fail (GST_IS_CONTROL_BINDING (binding), FALSE);
+  //g_return_val_if_fail (g_type_is_a (binding->pspec->owner_type,
+  //        G_OBJECT_TYPE (object)), FALSE);
 
   GST_OBJECT_LOCK (object);
-  if ((prop = gst_object_find_controlled_property (object, property_name))) {
-    GstControlSource *old = prop->csource;
-
-    if (csource && (ret = gst_control_source_bind (csource, prop->pspec))) {
-      prop->csource = g_object_ref (csource);
-    } else if (!csource) {
-      ret = TRUE;
-      prop->csource = NULL;
-    }
-
-    if (ret && old)
-      g_object_unref (old);
+  if ((old = gst_object_find_control_binding (object, binding->name))) {
+    GST_DEBUG_OBJECT (object, "controlled property %s removed", old->name);
+    object->control_bindings = g_list_remove (object->control_bindings, old);
+    gst_object_unparent (GST_OBJECT_CAST (old));
   }
+  object->control_bindings = g_list_prepend (object->control_bindings, binding);
+  gst_object_set_parent (GST_OBJECT_CAST (binding), object);
+  GST_DEBUG_OBJECT (object, "controlled property %s added", binding->name);
   GST_OBJECT_UNLOCK (object);
 
-  return ret;
+  return TRUE;
 }
 
 /**
- * gst_object_get_control_source:
+ * gst_object_get_control_binding:
  * @object: the object
- * @property_name: name of the property for which the #GstControlSource should be get
+ * @property_name: name of the property
  *
- * Gets the corresponding #GstControlSource for the property. This should be unreferenced
- * again after use.
+ * Gets the corresponding #GstControlBinding for the property. This should be
+ * unreferenced again after use.
  *
- * Returns: (transfer full): the #GstControlSource for @property_name or NULL if
- * the property is not controlled by this controller or no #GstControlSource was
- * assigned yet.
+ * Returns: (transfer full): the #GstControlBinding for @property_name or %NULL if
+ * the property is not controlled.
  */
-GstControlSource *
-gst_object_get_control_source (GstObject * object, const gchar * property_name)
+GstControlBinding *
+gst_object_get_control_binding (GstObject * object, const gchar * property_name)
 {
-  GstControlledProperty *prop;
-  GstControlSource *ret = NULL;
+  GstControlBinding *binding;
 
   g_return_val_if_fail (GST_IS_OBJECT (object), NULL);
   g_return_val_if_fail (property_name, NULL);
 
   GST_OBJECT_LOCK (object);
-  if ((prop = gst_object_find_controlled_property (object, property_name))) {
-    if ((ret = prop->csource))
-      g_object_ref (ret);
+  if ((binding = gst_object_find_control_binding (object, property_name))) {
+    g_object_ref (binding);
+  }
+  GST_OBJECT_UNLOCK (object);
+
+  return binding;
+}
+
+/**
+ * gst_object_remove_control_binding:
+ * @object: the object
+ * @binding: the binding
+ *
+ * Removes the corresponding #GstControlBinding. If it was the
+ * last ref of the binding, it will be disposed.  
+ *
+ * Returns: %TRUE if the binding could be removed.
+ */
+gboolean
+gst_object_remove_control_binding (GstObject * object,
+    GstControlBinding * binding)
+{
+  GList *node;
+  gboolean ret = FALSE;
+
+  g_return_val_if_fail (GST_IS_OBJECT (object), FALSE);
+  g_return_val_if_fail (GST_IS_CONTROL_BINDING (binding), FALSE);
+
+  GST_OBJECT_LOCK (object);
+  if ((node = g_list_find (object->control_bindings, binding))) {
+    GST_DEBUG_OBJECT (object, "controlled property %s removed", binding->name);
+    object->control_bindings =
+        g_list_delete_link (object->control_bindings, node);
+    gst_object_unparent (GST_OBJECT_CAST (binding));
+    ret = TRUE;
   }
   GST_OBJECT_UNLOCK (object);
 
@@ -1498,7 +1305,7 @@ gst_object_get_control_source (GstObject * object, const gchar * property_name)
  * @property_name: the name of the property to get
  * @timestamp: the time the control-change should be read from
  *
- * Gets the value for the given controllered property at the requested time.
+ * Gets the value for the given controlled property at the requested time.
  *
  * Returns: the GValue of the property at the given time, or %NULL if the
  * property isn't controlled.
@@ -1507,7 +1314,7 @@ GValue *
 gst_object_get_value (GstObject * object, const gchar * property_name,
     GstClockTime timestamp)
 {
-  GstControlledProperty *prop;
+  GstControlBinding *binding;
   GValue *val = NULL;
 
   g_return_val_if_fail (GST_IS_OBJECT (object), NULL);
@@ -1515,21 +1322,8 @@ gst_object_get_value (GstObject * object, const gchar * property_name,
   g_return_val_if_fail (GST_CLOCK_TIME_IS_VALID (timestamp), NULL);
 
   GST_OBJECT_LOCK (object);
-  if ((prop = gst_object_find_controlled_property (object, property_name))) {
-    val = g_new0 (GValue, 1);
-    g_value_init (val, G_PARAM_SPEC_VALUE_TYPE (prop->pspec));
-    if (prop->csource) {
-      gboolean res;
-
-      /* get current value via control source */
-      res = gst_control_source_get_value (prop->csource, timestamp, val);
-      if (!res) {
-        g_free (val);
-        val = NULL;
-      }
-    } else {
-      g_object_get_property ((GObject *) object, prop->name, val);
-    }
+  if ((binding = gst_object_find_control_binding (object, property_name))) {
+    val = gst_control_binding_get_value (binding, timestamp);
   }
   GST_OBJECT_UNLOCK (object);
 
@@ -1537,84 +1331,47 @@ gst_object_get_value (GstObject * object, const gchar * property_name,
 }
 
 /**
- * gst_object_get_value_arrays:
- * @object: the object that has controlled properties
- * @timestamp: the time that should be processed
- * @value_arrays: list to return the control-values in
- *
- * Function to be able to get an array of values for one or more given element
- * properties.
- *
- * If the GstValueArray->values array in list nodes is NULL, it will be created
- * by the function.
- * The type of the values in the array are the same as the property's type.
- *
- * The g_object_* functions are just convenience functions for GObject
- *
- * Returns: %TRUE if the given array(s) could be filled, %FALSE otherwise
- */
-gboolean
-gst_object_get_value_arrays (GstObject * object, GstClockTime timestamp,
-    GSList * value_arrays)
-{
-  gboolean res = TRUE;
-  GSList *node;
-
-  g_return_val_if_fail (GST_IS_OBJECT (object), FALSE);
-  g_return_val_if_fail (GST_CLOCK_TIME_IS_VALID (timestamp), FALSE);
-  g_return_val_if_fail (value_arrays, FALSE);
-
-  for (node = value_arrays; (res && node); node = g_slist_next (node)) {
-    res = gst_object_get_value_array (object, timestamp, node->data);
-  }
-  return res;
-}
-
-/**
  * gst_object_get_value_array:
  * @object: the object that has controlled properties
+ * @property_name: the name of the property to get
  * @timestamp: the time that should be processed
- * @value_array: array to put control-values in
+ * @interval: the time spacing between subsequent values
+ * @n_values: the number of values
+ * @values: array to put control-values in
  *
- * Function to be able to get an array of values for one element properties
+ * Gets a number of values for the given controllered property starting at the
+ * requested time. The array @values need to hold enough space for @n_values of
+ * the same type as the objects property's type.
  *
- * If the GstValueArray->values array is NULL, it will be created by the function.
- * The type of the values in the array are the same as the property's type.
+ * This function is useful if one wants to e.g. draw a graph of the control
+ * curve or apply a control curve sample by sample.
  *
- * The g_object_* functions are just convenience functions for GObject
- *
- * Returns: %TRUE if the given array(s) could be filled, %FALSE otherwise
+ * Returns: %TRUE if the given array could be filled, %FALSE otherwise
  */
 gboolean
-gst_object_get_value_array (GstObject * object, GstClockTime timestamp,
-    GstValueArray * value_array)
+gst_object_get_value_array (GstObject * object, const gchar * property_name,
+    GstClockTime timestamp, GstClockTime interval, guint n_values,
+    GValue * values)
 {
   gboolean res = FALSE;
-  GstControlledProperty *prop;
+  GstControlBinding *binding;
 
   g_return_val_if_fail (GST_IS_OBJECT (object), FALSE);
+  g_return_val_if_fail (property_name, FALSE);
   g_return_val_if_fail (GST_CLOCK_TIME_IS_VALID (timestamp), FALSE);
-  g_return_val_if_fail (value_array, FALSE);
-  g_return_val_if_fail (value_array->property_name, FALSE);
-  g_return_val_if_fail (value_array->values, FALSE);
+  g_return_val_if_fail (GST_CLOCK_TIME_IS_VALID (interval), FALSE);
+  g_return_val_if_fail (values, FALSE);
 
   GST_OBJECT_LOCK (object);
-
-  if ((prop = gst_object_find_controlled_property (object,
-              value_array->property_name))) {
-    /* get current value_array via control source */
-    if (!prop->csource)
-      goto out;
-
-    res = gst_control_source_get_value_array (prop->csource, timestamp,
-        value_array);
+  if ((binding = gst_object_find_control_binding (object, property_name))) {
+    res = gst_control_binding_get_value_array (binding, timestamp, interval,
+        n_values, values);
   }
-
-out:
   GST_OBJECT_UNLOCK (object);
   return res;
 }
 
+
 /**
  * gst_object_get_control_rate:
  * @object: the object that has controlled properties