Menu
▾
▴
[gst-cvs] rbultje gst-plugins: gst-plugins/gst-libs/gst/propertyprobe/
|
From: Ronald B. <rb...@us...> - 2003-11-05 23:00:01
|
CVS Root: /cvsroot/gstreamer
Module: gst-plugins
Changes by: rbultje
Date: Wed Nov 05 2003 14:59:58 PST
Log message:
Some prettification fixes to this interface... Make it look good, make it simple and make it more GObject'ific. This means that it now works largely almost the same as GObject (concerning arguments that you give to the functions, and layout of the virtual functions). I've also got an OSS implementation for this, but it needs one small change before I commit that. Expect that this weekend or so.
Modified files:
gst-libs/gst/propertyprobe: propertyprobe.c propertyprobe.h
Links:
http://cvs.sf.net/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins/gst-libs/gst/propertyprobe/propertyprobe.c.diff?r1=1.1&r2=1.2
http://cvs.sf.net/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins/gst-libs/gst/propertyprobe/propertyprobe.h.diff?r1=1.1&r2=1.2
====Begin Diffs====
Index: propertyprobe.c
===================================================================
RCS file: /cvsroot/gstreamer/gst-plugins/gst-libs/gst/propertyprobe/propertyprobe.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- propertyprobe.c 30 Oct 2003 02:32:00 -0000 1.1
+++ propertyprobe.c 5 Nov 2003 22:59:46 -0000 1.2
@@ -23,15 +23,17 @@
#include "config.h"
#endif
-#include <gst/propertyprobe/propertyprobe.h>
+#include <string.h>
-static void gst_property_probe_iface_init (GstPropertyProbeInterface *iface);
+#include "propertyprobe.h"
enum {
- NEED_PROBE,
+ SIGNAL_PROBE_NEEDED,
LAST_SIGNAL
};
+static void gst_property_probe_iface_init (GstPropertyProbeInterface *iface);
+
static guint gst_property_probe_signals[LAST_SIGNAL] = { 0 };
GType
@@ -52,11 +54,10 @@
NULL,
};
- gst_property_probe_type = g_type_register_static (G_TYPE_INTERFACE,
- "GstPropertyProbe",
- &gst_property_probe_info, 0);
-
- g_type_interface_add_prerequisite (gst_property_probe_type, G_TYPE_OBJECT);
+ gst_property_probe_type =
+ g_type_register_static (G_TYPE_INTERFACE,
+ "GstPropertyProbe",
+ &gst_property_probe_info, 0);
}
return gst_property_probe_type;
@@ -68,109 +69,190 @@
static gboolean initialized = FALSE;
if (!initialized) {
- gst_property_probe_signals[NEED_PROBE] =
- g_signal_new ("need_probe",
- GST_TYPE_PROPERTY_PROBE,
- G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET (GstPropertyProbeInterface, need_probe),
- NULL,
- NULL,
- gst_marshal_VOID__STRING,
- G_TYPE_NONE, 1,
- G_TYPE_STRING);
-
+ gst_property_probe_signals[SIGNAL_PROBE_NEEDED] =
+ g_signal_new ("probe_needed", G_TYPE_FROM_CLASS (iface), G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (GstPropertyProbeInterface, probe_needed),
+ NULL, NULL, g_cclosure_marshal_VOID__POINTER,
+ G_TYPE_NONE, 1, G_TYPE_POINTER);
initialized = TRUE;
}
/* default virtual functions */
- iface->get_list = NULL;
- iface->probe_property = NULL;
- iface->get_property_info = NULL;
- iface->is_probed = NULL;
+ iface->get_properties = NULL;
+ iface->get_values = NULL;
}
-char **
-gst_property_probe_get_list (GstElement *element)
+const GList *
+gst_property_probe_get_properties (GstPropertyProbe *probe)
{
GstPropertyProbeInterface *iface;
-
- g_return_val_if_fail (GST_IS_PROPERTY_PROBE (element), NULL);
- iface = GST_PROPERTY_PROBE_GET_IFACE (element);
- if (iface->get_list) {
- return iface->get_list (element);
+ g_return_val_if_fail (probe != NULL, NULL);
+
+ iface = GST_PROPERTY_PROBE_GET_IFACE (probe);
+
+ if (iface->get_properties)
+ return iface->get_properties (probe);
+
+ return NULL;
+}
+
+const GParamSpec *
+gst_property_probe_get_property (GstPropertyProbe *probe,
+ const gchar *name)
+{
+ const GList *pspecs = gst_property_probe_get_properties (probe);
+
+ g_return_val_if_fail (probe != NULL, NULL);
+ g_return_val_if_fail (name != NULL, NULL);
+
+ while (pspecs) {
+ const GParamSpec *pspec = pspecs->data;
+
+ if (!strcmp (pspec->name, name))
+ return pspec;
+
+ pspecs = pspecs->next;
}
return NULL;
}
void
-gst_property_probe_probe_property (GstElement *element,
- const char *property)
+gst_property_probe_probe_property (GstPropertyProbe *probe,
+ const GParamSpec *pspec)
{
GstPropertyProbeInterface *iface;
- GParamSpec *ps;
-
- g_return_if_fail (GST_IS_PROPERTY_PROBE (element));
- g_return_if_fail (GST_STATE (element) == GST_STATE_NULL);
- ps = g_object_class_find_property (G_OBJECT_CLASS (element), property);
- if (ps == NULL) return;
-
- iface = GST_PROPERTY_PROBE_GET_IFACE (element);
- if (iface->probe_property) {
- iface->probe_property (element, ps);
- }
+ g_return_if_fail (probe != NULL);
+ g_return_if_fail (pspec != NULL);
+
+ iface = GST_PROPERTY_PROBE_GET_IFACE (probe);
+
+ if (iface->probe_property)
+ iface->probe_property (probe, pspec->param_id, pspec);
}
-gchar **
-gst_property_probe_get_property_info (GstElement *element,
- const gchar *property)
+void
+gst_property_probe_probe_property_name (GstPropertyProbe *probe,
+ const gchar *name)
{
- GstPropertyProbeInterface *iface;
- GParamSpec *ps;
-
- g_return_val_if_fail (GST_IS_PROPERTY_PROBE (element), NULL);
+ const GParamSpec *pspec;
- ps = g_object_class_find_property (G_OBJECT_CLASS (element), property);
- if (ps == NULL) return NULL;
-
- iface = GST_PROPERTY_PROBE_GET_IFACE (element);
- if (iface->get_property_info) {
- return iface->get_property_info (element, ps);
+ g_return_if_fail (probe != NULL);
+ g_return_if_fail (name != NULL);
+
+ pspec = g_object_class_find_property (G_OBJECT_CLASS (probe), name);
+ if (!pspec) {
+ g_warning ("No such property %s", name);
+ return;
}
- return NULL;
+
+ gst_property_probe_probe_property (probe, pspec);
}
gboolean
-gst_property_probe_is_probed (GstElement *element,
- const char *property)
+gst_property_probe_needs_probe (GstPropertyProbe *probe,
+ const GParamSpec *pspec)
{
GstPropertyProbeInterface *iface;
- GParamSpec *ps;
-
- g_return_val_if_fail (GST_IS_PROPERTY_PROBE (element), FALSE);
- ps = g_object_class_find_property (G_OBJECT_CLASS (element), property);
- if (ps == NULL) return FALSE;
+ g_return_val_if_fail (probe != NULL, FALSE);
+ g_return_val_if_fail (pspec != NULL, FALSE);
+
+ iface = GST_PROPERTY_PROBE_GET_IFACE (probe);
+
+ if (iface->needs_probe)
+ return iface->needs_probe (probe, pspec->param_id, pspec);
- iface = GST_PROPERTY_PROBE_GET_IFACE (element);
- if (iface->is_probed) {
- return iface->is_probed (element, ps);
- }
return FALSE;
}
-gchar **
-gst_property_probe_get_possibilities (GstElement *element,
- const char *property)
+gboolean
+gst_property_probe_needs_probe_name (GstPropertyProbe *probe,
+ const gchar *name)
{
- g_return_val_if_fail (GST_IS_PROPERTY_PROBE (element), NULL);
+ const GParamSpec *pspec;
- if (!gst_property_probe_is_probed (element, property)){
- gst_property_probe_probe_property (element, property);
+ g_return_val_if_fail (probe != NULL, FALSE);
+ g_return_val_if_fail (name != NULL, FALSE);
+
+ pspec = g_object_class_find_property (G_OBJECT_CLASS (probe), name);
+ if (!pspec) {
+ g_warning ("No such property %s", name);
+ return FALSE;
}
- return gst_property_probe_get_property_info (element, property);
+ return gst_property_probe_needs_probe (probe, pspec);
+}
+
+GValueArray *
+gst_property_probe_get_values (GstPropertyProbe *probe,
+ const GParamSpec *pspec)
+{
+ GstPropertyProbeInterface *iface;
+
+ g_return_val_if_fail (probe != NULL, NULL);
+ g_return_val_if_fail (pspec != NULL, NULL);
+
+ iface = GST_PROPERTY_PROBE_GET_IFACE (probe);
+
+ if (iface->get_values)
+ return iface->get_values (probe, pspec->param_id, pspec);
+
+ return NULL;
+}
+
+GValueArray *
+gst_property_probe_get_values_name (GstPropertyProbe *probe,
+ const gchar *name)
+{
+ const GParamSpec *pspec;
+
+ g_return_val_if_fail (probe != NULL, NULL);
+ g_return_val_if_fail (name != NULL, NULL);
+
+ pspec = g_object_class_find_property (G_OBJECT_CLASS (probe), name);
+ if (!pspec) {
+ g_warning ("No such property %s", name);
+ return NULL;
+ }
+
+ return gst_property_probe_get_values (probe, pspec);
+}
+
+
+GValueArray *
+gst_property_probe_probe_and_get_values (GstPropertyProbe *probe,
+ const GParamSpec *pspec)
+{
+ GstPropertyProbeInterface *iface;
+
+ g_return_val_if_fail (probe != NULL, NULL);
+ g_return_val_if_fail (pspec != NULL, NULL);
+
+ iface = GST_PROPERTY_PROBE_GET_IFACE (probe);
+
+ if (gst_property_probe_needs_probe (probe, pspec))
+ gst_property_probe_probe_property (probe, pspec);
+
+ return gst_property_probe_get_values (probe, pspec);
}
+GValueArray *
+gst_property_probe_probe_and_get_values_name (GstPropertyProbe *probe,
+ const gchar *name)
+{
+ const GParamSpec *pspec;
+
+ g_return_val_if_fail (probe != NULL, NULL);
+ g_return_val_if_fail (name != NULL, NULL);
+
+ pspec = g_object_class_find_property (G_OBJECT_CLASS (probe), name);
+ if (!pspec) {
+ g_warning ("No such property %s", name);
+ return NULL;
+ }
+
+ return gst_property_probe_probe_and_get_values (probe, pspec);
+}
Index: propertyprobe.h
===================================================================
RCS file: /cvsroot/gstreamer/gst-plugins/gst-libs/gst/propertyprobe/propertyprobe.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- propertyprobe.h 30 Oct 2003 02:32:00 -0000 1.1
+++ propertyprobe.h 5 Nov 2003 22:59:46 -0000 1.2
@@ -41,32 +41,56 @@
GTypeInterface klass;
/* signals */
- void (*need_probe) (GstPropertyProbe *property_probe, const gchar *property);
+ void (*probe_needed) (GstPropertyProbe *probe,
+ const GParamSpec *pspec);
/* virtual functions */
- gchar ** (*get_list) (GstElement *property_probe);
- void (*probe_property) (GstElement *property_probe, const GParamSpec *property);
- gchar ** (*get_property_info) (GstElement *property_probe,
- const GParamSpec *property);
- gboolean (*is_probed) (GstElement *element, const GParamSpec *property);
-
+ const GList * (*get_properties) (GstPropertyProbe *probe);
+ gboolean (*needs_probe) (GstPropertyProbe *probe,
+ guint prop_id,
+ const GParamSpec *pspec);
+ void (*probe_property) (GstPropertyProbe *probe,
+ guint prop_id,
+ const GParamSpec *pspec);
+ GValueArray * (*get_values) (GstPropertyProbe *probe,
+ guint prop_id,
+ const GParamSpec *pspec);
+
GST_CLASS_PADDING
} GstPropertyProbeInterface;
-GType gst_property_probe_get_type (void);
+GType gst_property_probe_get_type (void);
/* virtual class function wrappers */
-gchar ** gst_property_probe_get_list (GstElement *element);
-void gst_property_probe_probe_property (GstElement *element,
- const gchar *property);
-gchar ** gst_property_probe_get_property_info (GstElement *element,
- const gchar *property);
-gboolean gst_property_probe_is_probed (GstElement *element,
- const gchar *property);
-/* utility functions */
-gchar ** gst_property_probe_get_possibilities (GstElement *element,
- const gchar *property);
+/* returns list of GParamSpecs */
+const GList * gst_property_probe_get_properties (GstPropertyProbe *probe);
+const GParamSpec *gst_property_probe_get_property (GstPropertyProbe *probe,
+ const gchar *name);
+
+/* probe one property */
+void gst_property_probe_probe_property (GstPropertyProbe *probe,
+ const GParamSpec *pspec);
+void gst_property_probe_probe_property_name (GstPropertyProbe *probe,
+ const gchar *name);
+
+/* do we need a probe? */
+gboolean gst_property_probe_needs_probe (GstPropertyProbe *probe,
+ const GParamSpec *pspec);
+gboolean gst_property_probe_needs_probe_name (GstPropertyProbe *probe,
+ const gchar *name);
+
+/* returns list of GValues */
+GValueArray * gst_property_probe_get_values (GstPropertyProbe *probe,
+ const GParamSpec *pspec);
+GValueArray * gst_property_probe_get_values_name (GstPropertyProbe *probe,
+ const gchar *name);
+
+/* sugar */
+GValueArray * gst_property_probe_probe_and_get_values (GstPropertyProbe *probe,
+ const GParamSpec *pspec);
+GValueArray * gst_property_probe_probe_and_get_values_name (GstPropertyProbe *probe,
+ const gchar *name);
G_END_DECLS
|