From 9e572ebf0065421567134e942d24ae26f0cee55d Mon Sep 17 00:00:00 2001 From: Sebastian Dröge Date: Wed, 13 Aug 2008 12:34:13 +0000 Subject: ext/pulse/: Improve debugging a bit by including the parent object in pulsemixerctrl and pulseprobe objects and using... Original commit message from CVS: * ext/pulse/pulsemixer.c: (gst_pulsemixer_change_state): * ext/pulse/pulsemixerctrl.c: (gst_pulsemixer_ctrl_subscribe_cb), (gst_pulsemixer_ctrl_open), (gst_pulsemixer_ctrl_new), (gst_pulsemixer_ctrl_free), (gst_pulsemixer_ctrl_timeout_event): * ext/pulse/pulsemixerctrl.h: * ext/pulse/pulseprobe.c: (gst_pulseprobe_open), (gst_pulseprobe_enumerate), (gst_pulseprobe_new), (gst_pulseprobe_free), (gst_pulseprobe_needs_probe), (gst_pulseprobe_probe_property), (gst_pulseprobe_get_values): * ext/pulse/pulseprobe.h: * ext/pulse/pulsesink.c: (gst_pulsesink_init): * ext/pulse/pulsesrc.c: (gst_pulsesrc_init), (gst_pulsesrc_delay), (gst_pulsesrc_change_state): Improve debugging a bit by including the parent object in pulsemixerctrl and pulseprobe objects and using GST_WARNING_OBJECT instead of GST_WARNING. Use the parent GObject subclass instead of a random struct as GObject parameter for G_OBJECT_WARN_INVALID_PROPERTY_ID. This fixes a crash when probing for another property than "device". --- ext/pulse/pulseprobe.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'ext/pulse/pulseprobe.h') diff --git a/ext/pulse/pulseprobe.h b/ext/pulse/pulseprobe.h index d27c44d9..3baf6db6 100644 --- a/ext/pulse/pulseprobe.h +++ b/ext/pulse/pulseprobe.h @@ -34,6 +34,7 @@ typedef struct _GstPulseProbe GstPulseProbe; struct _GstPulseProbe { + GObject *object; gchar *server; GList *devices; int devices_valid; @@ -48,8 +49,8 @@ struct _GstPulseProbe int operation_success; }; -GstPulseProbe *gst_pulseprobe_new (GObjectClass * klass, guint prop_id, - const gchar * server, gboolean sinks, gboolean sources); +GstPulseProbe *gst_pulseprobe_new (GObject *object, GObjectClass * klass, + guint prop_id, const gchar * server, gboolean sinks, gboolean sources); void gst_pulseprobe_free (GstPulseProbe * probe); const GList *gst_pulseprobe_get_properties (GstPulseProbe * probe); -- cgit