From adb15bf34a72cd94d442f4d6eeb2d29340846ffd Mon Sep 17 00:00:00 2001
From: =?utf8?q?Tim-Philipp=20M=C3=BCller?= <tim.muller@collabora.co.uk>
Date: Fri, 9 Dec 2011 16:04:56 +0000
Subject: [PATCH] pulse: rename "client" properties to "client-name"

Better name, but also matches the property on the jack
elements (where "client" is used for something else).
---
 ext/pulse/pulsesink.c | 14 ++++++--------
 ext/pulse/pulsesrc.c  | 14 ++++++--------
 2 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/ext/pulse/pulsesink.c b/ext/pulse/pulsesink.c
index f02a065..3bcd433 100644
--- a/ext/pulse/pulsesink.c
+++ b/ext/pulse/pulsesink.c
@@ -79,7 +79,7 @@ enum
   PROP_DEVICE_NAME,
   PROP_VOLUME,
   PROP_MUTE,
-  PROP_CLIENT,
+  PROP_CLIENT_NAME,
   PROP_STREAM_PROPERTIES,
   PROP_LAST
 };
@@ -1815,16 +1815,14 @@ gst_pulsesink_class_init (GstPulseSinkClass * klass)
           G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
   /**
-   * GstPulseSink:client
+   * GstPulseSink:client-name
    *
    * The PulseAudio client name to use.
-   *
-   * Since: 0.10.25
    */
   clientname = gst_pulse_client_name ();
   g_object_class_install_property (gobject_class,
-      PROP_CLIENT,
-      g_param_spec_string ("client", "Client",
+      PROP_CLIENT_NAME,
+      g_param_spec_string ("client-name", "Client Name",
           "The PulseAudio client name to use", clientname,
           G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS |
           GST_PARAM_MUTABLE_READY));
@@ -2526,7 +2524,7 @@ gst_pulsesink_set_property (GObject * object,
     case PROP_MUTE:
       gst_pulsesink_set_mute (pulsesink, g_value_get_boolean (value));
       break;
-    case PROP_CLIENT:
+    case PROP_CLIENT_NAME:
       g_free (pulsesink->client_name);
       if (!g_value_get_string (value)) {
         GST_WARNING_OBJECT (pulsesink,
@@ -2573,7 +2571,7 @@ gst_pulsesink_get_property (GObject * object,
     case PROP_MUTE:
       g_value_set_boolean (value, gst_pulsesink_get_mute (pulsesink));
       break;
-    case PROP_CLIENT:
+    case PROP_CLIENT_NAME:
       g_value_set_string (value, pulsesink->client_name);
       break;
     case PROP_STREAM_PROPERTIES:
diff --git a/ext/pulse/pulsesrc.c b/ext/pulse/pulsesrc.c
index 0599deb..219fc60 100644
--- a/ext/pulse/pulsesrc.c
+++ b/ext/pulse/pulsesrc.c
@@ -66,7 +66,7 @@ enum
   PROP_SERVER,
   PROP_DEVICE,
   PROP_DEVICE_NAME,
-  PROP_CLIENT,
+  PROP_CLIENT_NAME,
   PROP_STREAM_PROPERTIES,
   PROP_SOURCE_OUTPUT_INDEX,
   PROP_VOLUME,
@@ -182,15 +182,13 @@ gst_pulsesrc_class_init (GstPulseSrcClass * klass)
 
   clientname = gst_pulse_client_name ();
   /**
-   * GstPulseSrc:client
+   * GstPulseSrc:client-name
    *
    * The PulseAudio client name to use.
-   *
-   * Since: 0.10.27
    */
   g_object_class_install_property (gobject_class,
-      PROP_CLIENT,
-      g_param_spec_string ("client", "Client",
+      PROP_CLIENT_NAME,
+      g_param_spec_string ("client-name", "Client Name",
           "The PulseAudio client_name_to_use", clientname,
           G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS |
           GST_PARAM_MUTABLE_READY));
@@ -721,7 +719,7 @@ gst_pulsesrc_set_property (GObject * object,
       g_free (pulsesrc->device);
       pulsesrc->device = g_value_dup_string (value);
       break;
-    case PROP_CLIENT:
+    case PROP_CLIENT_NAME:
       g_free (pulsesrc->client_name);
       if (!g_value_get_string (value)) {
         GST_WARNING_OBJECT (pulsesrc,
@@ -768,7 +766,7 @@ gst_pulsesrc_get_property (GObject * object,
     case PROP_DEVICE_NAME:
       g_value_take_string (value, gst_pulsesrc_device_description (pulsesrc));
       break;
-    case PROP_CLIENT:
+    case PROP_CLIENT_NAME:
       g_value_set_string (value, pulsesrc->client_name);
       break;
     case PROP_STREAM_PROPERTIES:
-- 
2.7.4