mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-10-05 18:22:23 +00:00
Code Issues 1 Projects Releases Wiki Activity

pulsesink: Add "client" property to set the PA client name

Browse source 
Allows the application to modify the client name used to connect when
connecting to the PulseAudio daemon. Note however that updating the
property after the element reached the READY state will have no
effect until the next NULL->READY transition.

Fixes bug #627174.
This commit is contained in:
Philippe Normand 2010-08-18 16:37:41 +02:00 committed by Sebastian Dröge
parent d011e96028
commit 7116fff3c5
2 changed files with 25 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
ext/pulse/pulsesink.c
View file

@ -79,6 +79,7 @@ enum
PROP_DEVICE_NAME,
PROP_VOLUME,
PROP_MUTE,
PROP_CLIENT,
PROP_LAST
};
@ -436,7 +437,8 @@ gst_pulseringbuffer_open_device (GstRingBuffer * buf)
g_assert (!pbuf->stream);
pbuf->context_name = g_strdup_printf ("%s@%s", gst_pulse_client_name (),
g_assert (psink->client_name);
pbuf->context_name = g_strdup_printf ("%s@%s", psink->client_name,
GST_STR_NULL (psink->server));
pa_threaded_mainloop_lock (psink->mainloop);
@ -470,8 +472,6 @@ gst_pulseringbuffer_open_device (GstRingBuffer * buf)
if (pa_context_connect (pctx->context, psink->server,
PA_CONTEXT_NOAUTOSPAWN, NULL) < 0)
goto connect_failed;
} else {
GST_LOG_OBJECT (psink, "reusing shared pulseaudio context with name %s",
GST_STR_NULL (pbuf->context_name));
@ -1838,6 +1838,13 @@ gst_pulsesink_class_init (GstPulseSinkClass * klass)
"Mute state of this stream", DEFAULT_MUTE,
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
#endif
g_object_class_install_property (gobject_class,
PROP_CLIENT,
g_param_spec_string ("client", "Client",
"The PulseAudio client name to use", gst_pulse_client_name (),
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS |
GST_PARAM_MUTABLE_READY));
}
/* returns the current time of the sink ringbuffer */
@ -1888,6 +1895,7 @@ gst_pulsesink_init (GstPulseSink * pulsesink, GstPulseSinkClass * klass)
pulsesink->server = NULL;
pulsesink->device = NULL;
pulsesink->device_description = NULL;
pulsesink->client_name = gst_pulse_client_name ();
pulsesink->volume = DEFAULT_VOLUME;
pulsesink->volume_set = FALSE;
@ -1917,6 +1925,7 @@ gst_pulsesink_finalize (GObject * object)
g_free (pulsesink->server);
g_free (pulsesink->device);
g_free (pulsesink->device_description);
g_free (pulsesink->client_name);
if (pulsesink->probe) {
gst_pulseprobe_free (pulsesink->probe);
@ -2349,6 +2358,15 @@ gst_pulsesink_set_property (GObject * object,
gst_pulsesink_set_mute (pulsesink, g_value_get_boolean (value));
break;
#endif
case PROP_CLIENT:
g_free (pulsesink->client_name);
if (!g_value_get_string (value)) {
GST_WARNING_OBJECT (pulsesink,
"Empty PulseAudio client name not allowed. Resetting to default value");
pulsesink->client_name = gst_pulse_client_name ();
} else
pulsesink->client_name = g_value_dup_string (value);
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
@ -2380,6 +2398,9 @@ gst_pulsesink_get_property (GObject * object,
g_value_set_boolean (value, gst_pulsesink_get_mute (pulsesink));
break;
#endif
case PROP_CLIENT:
g_value_set_string (value, pulsesink->client_name);
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;

2
ext/pulse/pulsesink.h
View file

@ -54,7 +54,7 @@ struct _GstPulseSink
{
GstBaseAudioSink sink;
gchar *server, *device, *stream_name;
gchar *server, *device, *stream_name, *client_name;
gchar *device_description;
pa_threaded_mainloop *mainloop;