CVS Root: /cvs/gstreamer
Module: gst-plugins-good
Changes by: slomo
Date: Wed Aug 13 2008 12:34:27 UTC
Log message:
* 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".
Modified files:
. : ChangeLog
ext/pulse : pulsemixer.c pulsemixerctrl.c pulsemixerctrl.h
pulseprobe.c pulseprobe.h pulsesink.c pulsesrc.c
Links:
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-good/ChangeLog.diff?r1=1.3671&r2=1.3672
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-good/ext/pulse/pulsemixer.c.diff?r1=1.5&r2=1.6
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-good/ext/pulse/pulsemixerctrl.c.diff?r1=1.2&r2=1.3
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-good/ext/pulse/pulsemixerctrl.h.diff?r1=1.1&r2=1.2
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-good/ext/pulse/pulseprobe.c.diff?r1=1.1&r2=1.2
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-good/ext/pulse/pulseprobe.h.diff?r1=1.1&r2=1.2
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-good/ext/pulse/pulsesink.c.diff?r1=1.4&r2=1.5
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-good/ext/pulse/pulsesrc.c.diff?r1=1.4&r2=1.5
====Begin Diffs====
Index: ChangeLog
===================================================================
RCS file: /cvs/gstreamer/gst-plugins-good/ChangeLog,v
retrieving revision 1.3671
retrieving revision 1.3672
diff -u -d -r1.3671 -r1.3672
--- ChangeLog 13 Aug 2008 12:11:32 -0000 1.3671
+++ ChangeLog 13 Aug 2008 12:34:10 -0000 1.3672
@@ -1,5 +1,28 @@
2008-08-13 Sebastian Dröge <sebastian.droege@...>
+ * 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".
+2008-08-13 Sebastian Dröge <sebastian.droege@...>
Patch by: Laszlo Pandy <laszlok2 at gmail dot com>
* ext/pulse/pulsemixer.c: (gst_pulsemixer_set_property):
Index: pulsemixer.c
RCS file: /cvs/gstreamer/gst-plugins-good/ext/pulse/pulsemixer.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- pulsemixer.c 13 Aug 2008 12:21:22 -0000 1.5
+++ pulsemixer.c 13 Aug 2008 12:34:12 -0000 1.6
@@ -271,8 +271,8 @@
if (!this->mixer)
this->mixer =
- gst_pulsemixer_ctrl_new (this->server, this->device,
- GST_PULSEMIXER_UNKNOWN);
+ gst_pulsemixer_ctrl_new (G_OBJECT (this), this->server,
+ this->device, GST_PULSEMIXER_UNKNOWN);
break;
Index: pulsemixerctrl.c
RCS file: /cvs/gstreamer/gst-plugins-good/ext/pulse/pulsemixerctrl.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- pulsemixerctrl.c 19 Jul 2008 13:50:53 -0000 1.2
+++ pulsemixerctrl.c 13 Aug 2008 12:34:12 -0000 1.3
@@ -176,7 +176,7 @@
gst_pulsemixer_ctrl_source_info_cb, c);
if (!o) {
- GST_WARNING ("Failed to get sink info: %s",
+ GST_WARNING_OBJECT (c->object, "Failed to get sink info: %s",
pa_strerror (pa_context_errno (c->context)));
return;
}
@@ -198,7 +198,7 @@
#define CHECK_DEAD_GOTO(c, label) do { \
if (!(c)->context || pa_context_get_state((c)->context) != PA_CONTEXT_READY) { \
- GST_WARNING("Not connected: %s", (c)->context ? pa_strerror(pa_context_errno((c)->context)) : "NULL"); \
+ GST_WARNING_OBJECT (c->object, "Not connected: %s", (c)->context ? pa_strerror(pa_context_errno((c)->context)) : "NULL"); \
goto label; \
} \
} while(0);
@@ -224,7 +224,7 @@
if (!(c->context =
pa_context_new (pa_threaded_mainloop_get_api (c->mainloop), name))) {
- GST_WARNING ("Failed to create context");
+ GST_WARNING_OBJECT (c->object, "Failed to create context");
goto unlock_and_fail;
@@ -234,7 +234,7 @@
gst_pulsemixer_ctrl_subscribe_cb, c);
if (pa_context_connect (c->context, c->server, 0, NULL) < 0) {
- GST_WARNING ("Failed to connect context: %s",
+ GST_WARNING_OBJECT (c->object, "Failed to connect context: %s",
@@ -243,7 +243,7 @@
pa_threaded_mainloop_wait (c->mainloop);
if (pa_context_get_state (c->context) != PA_CONTEXT_READY) {
@@ -254,7 +254,7 @@
pa_context_subscribe (c->context,
PA_SUBSCRIPTION_MASK_SINK | PA_SUBSCRIPTION_MASK_SOURCE,
gst_pulsemixer_ctrl_success_cb, c))) {
- GST_WARNING ("Failed to subscribe to events: %s",
+ GST_WARNING_OBJECT (c->object, "Failed to subscribe to events: %s",
@@ -266,7 +266,7 @@
if (!c->operation_success) {
@@ -277,7 +277,7 @@
if (!(o =
pa_context_get_sink_info_by_name (c->context, c->device,
gst_pulsemixer_ctrl_sink_info_cb, c))) {
- GST_WARNING ("Failed to get sink info: %s",
+ GST_WARNING_OBJECT (c->object, "Failed to get sink info: %s",
pa_strerror (pa_context_errno (c->context)));
goto unlock_and_fail;
}
@@ -293,7 +293,7 @@
if (!c->operation_success && (c->type == GST_PULSEMIXER_SINK
|| pa_context_errno (c->context) != PA_ERR_NOENTITY)) {
@@ -303,7 +303,7 @@
pa_context_get_source_info_by_name (c->context, c->device,
gst_pulsemixer_ctrl_source_info_cb, c))) {
- GST_WARNING ("Failed to get source info: %s",
+ GST_WARNING_OBJECT (c->object, "Failed to get source info: %s",
@@ -318,7 +318,7 @@
o = NULL;
if (!c->operation_success) {
@@ -380,12 +380,13 @@
}
GstPulseMixerCtrl *
-gst_pulsemixer_ctrl_new (const gchar * server, const gchar * device,
- GstPulseMixerType type)
+gst_pulsemixer_ctrl_new (GObject * object, const gchar * server,
+ const gchar * device, GstPulseMixerType type)
{
GstPulseMixerCtrl *c = NULL;
c = g_new (GstPulseMixerCtrl, 1);
+ c->object = g_object_ref (object);
c->tracklist = NULL;
c->server = g_strdup (server);
c->device = g_strdup (device);
@@ -424,6 +425,7 @@
g_free (c->device);
g_free (c->name);
g_free (c->description);
+ g_object_unref (c->object);
g_free (c);
@@ -452,7 +454,7 @@
&c->volume, NULL, NULL);
if (!o)
- GST_WARNING ("Failed to set device volume: %s",
+ GST_WARNING_OBJECT (c->object, "Failed to set device volume: %s",
else
pa_operation_unref (o);
@@ -469,7 +471,7 @@
NULL, NULL);
- GST_WARNING ("Failed to set device mute: %s",
+ GST_WARNING_OBJECT (c->object, "Failed to set device mute: %s",
Index: pulsemixerctrl.h
RCS file: /cvs/gstreamer/gst-plugins-good/ext/pulse/pulsemixerctrl.h,v
retrieving revision 1.1
diff -u -d -r1.1 -r1.2
--- pulsemixerctrl.h 10 Jun 2008 06:45:32 -0000 1.1
+++ pulsemixerctrl.h 13 Aug 2008 12:34:12 -0000 1.2
@@ -42,6 +42,8 @@
struct _GstPulseMixerCtrl
+ GObject *object;
GList *tracklist;
gchar *server, *device;
@@ -67,7 +69,7 @@
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);
Index: pulseprobe.c
RCS file: /cvs/gstreamer/gst-plugins-good/ext/pulse/pulseprobe.c,v
--- pulseprobe.c 10 Jun 2008 06:45:32 -0000 1.1
+++ pulseprobe.c 13 Aug 2008 12:34:12 -0000 1.2
@@ -114,7 +114,7 @@
@@ -122,7 +122,7 @@
c);
@@ -131,7 +131,7 @@
@@ -155,7 +155,7 @@
+ GST_WARNING_OBJECT((c)->object, "Not connected: %s", (c)->context ? pa_strerror(pa_context_errno((c)->context)) : "NULL"); \
@@ -173,7 +173,7 @@
pa_context_get_sink_info_list (c->context,
gst_pulseprobe_sink_info_cb, c))) {
@@ -185,7 +185,7 @@
@@ -200,7 +200,7 @@
pa_context_get_source_info_list (c->context,
gst_pulseprobe_source_info_cb, c))) {
@@ -212,7 +212,7 @@
@@ -258,12 +258,13 @@
GstPulseProbe *
-gst_pulseprobe_new (GObjectClass * klass, guint prop_id, const gchar * server,
- gboolean sinks, gboolean sources)
+gst_pulseprobe_new (GObject * object, GObjectClass * klass, guint prop_id,
+ const gchar * server, gboolean sinks, gboolean sources)
GstPulseProbe *c = NULL;
c = g_new (GstPulseProbe, 1);
c->enumerate_sinks = sinks;
c->enumerate_sources = sources;
@@ -293,6 +294,8 @@
g_list_foreach (c->devices, (GFunc) g_free, NULL);
g_list_free (c->devices);
@@ -310,7 +313,7 @@
if (prop_id == c->prop_id)
return !c->devices_valid;
- G_OBJECT_WARN_INVALID_PROPERTY_ID (c, prop_id, pspec);
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (c->object, prop_id, pspec);
return FALSE;
@@ -320,7 +323,7 @@
if (prop_id != c->prop_id) {
- G_OBJECT_WARN_INVALID_PROPERTY_ID (c, prop_id, pspec);
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (c->object, prop_id, pspec);
@@ -339,7 +342,7 @@
GList *item;
return NULL;
@@ -349,7 +352,8 @@
array = g_value_array_new (g_list_length (c->devices));
g_value_init (&value, G_TYPE_STRING);
for (item = c->devices; item != NULL; item = item->next) {
- GST_WARNING ("device found: %s", (const gchar *) item->data);
+ GST_WARNING_OBJECT (c->object, "device found: %s",
+ (const gchar *) item->data);
g_value_set_string (&value, (const gchar *) item->data);
g_value_array_append (array, &value);
Index: pulseprobe.h
RCS file: /cvs/gstreamer/gst-plugins-good/ext/pulse/pulseprobe.h,v
--- pulseprobe.h 10 Jun 2008 06:45:32 -0000 1.1
+++ pulseprobe.h 13 Aug 2008 12:34:13 -0000 1.2
@@ -34,6 +34,7 @@
struct _GstPulseProbe
gchar *server;
GList *devices;
int devices_valid;
@@ -48,8 +49,8 @@
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);
Index: pulsesink.c
RCS file: /cvs/gstreamer/gst-plugins-good/ext/pulse/pulsesink.c,v
retrieving revision 1.4
diff -u -d -r1.4 -r1.5
--- pulsesink.c 13 Aug 2008 12:01:01 -0000 1.4
+++ pulsesink.c 13 Aug 2008 12:34:13 -0000 1.5
@@ -249,7 +249,7 @@
e = pa_threaded_mainloop_start (pulsesink->mainloop);
g_assert (e == 0);
- pulsesink->probe = gst_pulseprobe_new (G_OBJECT_GET_CLASS (pulsesink), PROP_DEVICE, pulsesink->device, TRUE, FALSE); /* TRUE for sinks, FALSE for sources */
+ pulsesink->probe = gst_pulseprobe_new (G_OBJECT (pulsesink), G_OBJECT_GET_CLASS (pulsesink), PROP_DEVICE, pulsesink->device, TRUE, FALSE); /* TRUE for sinks, FALSE for sources */
static void
@@ -489,14 +489,16 @@
if (!pulsesink->context
|| pa_context_get_state (pulsesink->context) != PA_CONTEXT_READY) {
GST_ELEMENT_ERROR (pulsesink, RESOURCE, FAILED, ("Bad context state: %s",
- pulsesink->context ? pa_strerror (pa_context_errno (pulsesink->
- context)) : NULL), (NULL));
+ pulsesink->
+ context ? pa_strerror (pa_context_errno (pulsesink->context)) :
+ NULL), (NULL));
if (!(pulsesink->stream = pa_stream_new (pulsesink->context,
- pulsesink->stream_name ? pulsesink->
- stream_name : "Playback Stream", &pulsesink->sample_spec,
+ pulsesink->
+ stream_name ? pulsesink->stream_name : "Playback Stream",
+ &pulsesink->sample_spec,
gst_pulse_gst_to_channel_map (&channel_map, spec)))) {
GST_ELEMENT_ERROR (pulsesink, RESOURCE, FAILED,
("Failed to create stream: %s",
Index: pulsesrc.c
RCS file: /cvs/gstreamer/gst-plugins-good/ext/pulse/pulsesrc.c,v
--- pulsesrc.c 13 Aug 2008 12:01:01 -0000 1.4
+++ pulsesrc.c 13 Aug 2008 12:34:13 -0000 1.5
@@ -259,7 +259,7 @@
pulsesrc->mixer = NULL;
- pulsesrc->probe = gst_pulseprobe_new (G_OBJECT_GET_CLASS (pulsesrc), PROP_DEVICE, pulsesrc->device, FALSE, TRUE); /* FALSE for sinks, TRUE for sources */
+ pulsesrc->probe = gst_pulseprobe_new (G_OBJECT (pulsesrc), G_OBJECT_GET_CLASS (pulsesrc), PROP_DEVICE, pulsesrc->device, FALSE, TRUE); /* FALSE for sinks, TRUE for sources */
@@ -493,8 +493,9 @@
if (!pulsesrc->context
|| pa_context_get_state (pulsesrc->context) != PA_CONTEXT_READY) {
GST_ELEMENT_ERROR (pulsesrc, RESOURCE, FAILED, ("Bad context state: %s",
- pulsesrc->context ? pa_strerror (pa_context_errno (pulsesrc->
+ pulsesrc->
+ context ? pa_strerror (pa_context_errno (pulsesrc->context)) :
@@ -666,7 +667,7 @@
- GST_WARNING ("Not data while querying latency");
+ GST_WARNING_OBJECT (pulsesrc, "Not data while querying latency");
t = 0;
} else if (negative)
@@ -691,8 +692,8 @@
- GST_PULSEMIXER_SOURCE);
+ this->device, GST_PULSEMIXER_SOURCE);
|