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/pulsemixerctrl.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'ext/pulse/pulsemixerctrl.h') diff --git a/ext/pulse/pulsemixerctrl.h b/ext/pulse/pulsemixerctrl.h index 360711a5..0dbc1391 100644 --- a/ext/pulse/pulsemixerctrl.h +++ b/ext/pulse/pulsemixerctrl.h @@ -42,6 +42,8 @@ typedef enum struct _GstPulseMixerCtrl { + GObject *object; + GList *tracklist; gchar *server, *device; @@ -67,7 +69,7 @@ struct _GstPulseMixerCtrl gboolean update_volume, update_mute; }; -GstPulseMixerCtrl *gst_pulsemixer_ctrl_new (const gchar * server, +GstPulseMixerCtrl *gst_pulsemixer_ctrl_new (GObject *object, const gchar * server, const gchar * device, GstPulseMixerType type); void gst_pulsemixer_ctrl_free (GstPulseMixerCtrl * mixer); -- cgit