From 7116fff3c59c1ac82cebb3a7bc4c8584fd436190 Mon Sep 17 00:00:00 2001
From: Philippe Normand <pnormand@igalia.com>
Date: Wed, 18 Aug 2010 16:37:41 +0200
Subject: [PATCH] pulsesink: Add "client" property to set the PA client name

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.
---
 ext/pulse/pulsesink.c | 27 ++++++++++++++++++++++++---
 ext/pulse/pulsesink.h |  2 +-
 2 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/ext/pulse/pulsesink.c b/ext/pulse/pulsesink.c
index bb77ee4..fcc1d17 100644
--- a/ext/pulse/pulsesink.c
+++ b/ext/pulse/pulsesink.c
@@ -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;
diff --git a/ext/pulse/pulsesink.h b/ext/pulse/pulsesink.h
index ae0ad95..9658c1e 100644
--- a/ext/pulse/pulsesink.h
+++ b/ext/pulse/pulsesink.h
@@ -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;
-- 
2.7.4