gst/playback/gstplaybasebin.*: API: GstPlayBaseBin::stream-info-value-array property...

Original commit message from CVS:
2006-05-11  Thomas Vander Stichele  <thomas at apestaart dot org>

patch by: Sjoerd Simons (sjoerd@luon.net)

* gst/playback/gstplaybasebin.c: (gst_play_base_bin_class_init),
(group_create), (group_destroy), (add_stream),
(gst_play_base_bin_get_property),
(gst_play_base_bin_get_streaminfo_value_array):
* gst/playback/gstplaybasebin.h:
API: GstPlayBaseBin::stream-info-value-array property
use a more bindings-friendly way of exposing streaminfo
using a GValueArray.  Tested in ipython.
Closes #341114

diff --git a/ChangeLog b/ChangeLog
index 7e3c94d..d50ff2e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2006-05-11  Thomas Vander Stichele  <thomas at apestaart dot org>
+
+       patch by: Sjoerd Simons (sjoerd@luon.net)
+
+       * gst/playback/gstplaybasebin.c: (gst_play_base_bin_class_init),
+       (group_create), (group_destroy), (add_stream),
+       (gst_play_base_bin_get_property),
+       (gst_play_base_bin_get_streaminfo_value_array):
+       * gst/playback/gstplaybasebin.h:
+         API: GstPlayBaseBin::stream-info-value-array property
+         use a more bindings-friendly way of exposing streaminfo
+         using a GValueArray.  Tested in ipython.
+         Closes #341114
+
 2006-05-11  Wim Taymans  <wim@fluendo.com>
 
        * gst/playback/gstdecodebin.c: (try_to_link_1), (queue_enlarge),

diff --git a/gst/playback/gstplaybasebin.c b/gst/playback/gstplaybasebin.c
index 913ba33..b8d1e57 100644 (file)
--- a/gst/playback/gstplaybasebin.c
+++ b/gst/playback/gstplaybasebin.c
@@ -67,6 +67,7 @@ enum
   ARG_QUEUE_THRESHOLD,
   ARG_NSTREAMS,
   ARG_STREAMINFO,
+  ARG_STREAMINFO_VALUES,
   ARG_SOURCE,
   ARG_VIDEO,
   ARG_AUDIO,
@@ -85,6 +86,8 @@ static void gst_play_base_bin_get_property (GObject * object, guint prop_id,
 static GstStateChangeReturn gst_play_base_bin_change_state (GstElement *
     element, GstStateChange transition);
 const GList *gst_play_base_bin_get_streaminfo (GstPlayBaseBin * play_base_bin);
+const GValueArray *gst_play_base_bin_get_streaminfo_value_array (GstPlayBaseBin
+    * play_base_bin);
 
 static gboolean prepare_output (GstPlayBaseBin * play_base_bin);
 static void set_active_source (GstPlayBaseBin * play_base_bin,
@@ -163,6 +166,11 @@ gst_play_base_bin_class_init (GstPlayBaseBinClass * klass)
   g_object_class_install_property (gobject_klass, ARG_STREAMINFO,
       g_param_spec_pointer ("stream-info", "Stream info", "List of streaminfo",
           G_PARAM_READABLE));
+  g_object_class_install_property (gobject_klass, ARG_STREAMINFO_VALUES,
+      g_param_spec_value_array ("stream-info-value-array",
+          "StreamInfo GValueArray", "value array of streaminfo",
+          g_param_spec_object ("streaminfo", "StreamInfo", "Streaminfo object",
+              GST_TYPE_STREAM_INFO, G_PARAM_READABLE), G_PARAM_READABLE));
   g_object_class_install_property (gobject_klass, ARG_SOURCE,
       g_param_spec_object ("source", "Source", "Source element",
           GST_TYPE_ELEMENT, G_PARAM_READABLE));
@@ -247,6 +255,7 @@ group_create (GstPlayBaseBin * play_base_bin)
 
   group = g_new0 (GstPlayBaseGroup, 1);
   group->bin = play_base_bin;
+  group->streaminfo_value_array = g_value_array_new (0);
 
   return group;
 }
@@ -338,7 +347,7 @@ group_destroy (GstPlayBaseGroup * group)
       }
     }
 
-    /* if the group is currently being played, we have to remove the element 
+    /* if the group is currently being played, we have to remove the element
      * from the thread */
     gst_element_set_state (element, GST_STATE_NULL);
     gst_element_set_state (group->type[n].selector, GST_STATE_NULL);
@@ -356,11 +365,12 @@ group_destroy (GstPlayBaseGroup * group)
   /* free the streaminfo too */
   g_list_foreach (group->streaminfo, (GFunc) g_object_unref, NULL);
   g_list_free (group->streaminfo);
+  g_value_array_free (group->streaminfo_value_array);
   g_free (group);
 }
 
 /*
- * is called when the current building group is completely finished 
+ * is called when the current building group is completely finished
  * and ready for playback
  *
  * This function grabs lock, so take care when calling.
@@ -792,19 +802,23 @@ remove_groups (GstPlayBaseBin * play_base_bin)
   GROUP_UNLOCK (play_base_bin);
 }
 
-/* 
- * Add/remove a single stream to current  building group.
+/*
+ * Add/remove a single stream to current building group.
  *
  * Must be called with group-lock held.
  */
 static void
 add_stream (GstPlayBaseGroup * group, GstStreamInfo * info)
 {
+  GValue v = { 0, };
   GST_DEBUG ("add stream to group %p", group);
 
   /* keep ref to the group */
   g_object_set_data (G_OBJECT (info), "group", group);
 
+  g_value_init (&v, G_TYPE_OBJECT);
+  g_value_set_object (&v, info);
+  g_value_array_append (group->streaminfo_value_array, &v);
   group->streaminfo = g_list_append (group->streaminfo, info);
   if (info->type > 0 && info->type <= NUM_TYPES) {
     group->type[info->type - 1].npads++;
@@ -1836,6 +1850,11 @@ gst_play_base_bin_get_property (GObject * object, guint prop_id, GValue * value,
       g_value_set_pointer (value,
           (gpointer) gst_play_base_bin_get_streaminfo (play_base_bin));
       break;
+    case ARG_STREAMINFO_VALUES:{
+      g_value_set_boxed (value,
+          gst_play_base_bin_get_streaminfo_value_array (play_base_bin));
+      break;
+    }
     case ARG_SOURCE:
       _gst_gvalue_set_gstobject (value, play_base_bin->source);
       break;
@@ -1922,3 +1941,16 @@ gst_play_base_bin_get_streaminfo (GstPlayBaseBin * play_base_bin)
   }
   return info;
 }
+
+const GValueArray *
+gst_play_base_bin_get_streaminfo_value_array (GstPlayBaseBin * play_base_bin)
+{
+  GstPlayBaseGroup *group = get_active_group (play_base_bin);
+  GValueArray *array = NULL;
+
+  if (group) {
+    array = group->streaminfo_value_array;
+  }
+
+  return array;
+}

diff --git a/gst/playback/gstplaybasebin.h b/gst/playback/gstplaybasebin.h
index 0132f29..80e4007 100644 (file)
--- a/gst/playback/gstplaybasebin.h
+++ b/gst/playback/gstplaybasebin.h
@@ -53,6 +53,7 @@ typedef struct
 
   gint           nstreams;
   GList         *streaminfo;
+  GValueArray   *streaminfo_value_array;
 
   /* contained decoded elementary streams */
   struct {