mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-27 04:01:08 +00:00
Code Issues 1 Projects Releases Wiki Activity

pulse: rename "client" properties to "client-name"

Browse source 
Better name, but also matches the property on the jack
elements (where "client" is used for something else).
This commit is contained in:
Tim-Philipp Müller 2011-12-09 16:04:56 +00:00
parent 501642dd63
commit adb15bf34a
2 changed files with 12 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
ext/pulse/pulsesink.c
View file

@ -79,7 +79,7 @@ enum
PROP_DEVICE_NAME, PROP_DEVICE_NAME,
PROP_VOLUME, PROP_VOLUME,
PROP_MUTE, PROP_MUTE,
PROP_CLIENT, PROP_CLIENT_NAME,
PROP_STREAM_PROPERTIES, PROP_STREAM_PROPERTIES,
PROP_LAST PROP_LAST
}; };
@ -1815,16 +1815,14 @@ gst_pulsesink_class_init (GstPulseSinkClass * klass)
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/** /**
* GstPulseSink:client * GstPulseSink:client-name
* *
* The PulseAudio client name to use. * The PulseAudio client name to use.
*
* Since: 0.10.25
*/ */
clientname = gst_pulse_client_name (); clientname = gst_pulse_client_name ();
g_object_class_install_property (gobject_class, g_object_class_install_property (gobject_class,
PROP_CLIENT, PROP_CLIENT_NAME,
g_param_spec_string ("client", "Client", g_param_spec_string ("client-name", "Client Name",
"The PulseAudio client name to use", clientname, "The PulseAudio client name to use", clientname,
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS |
GST_PARAM_MUTABLE_READY)); GST_PARAM_MUTABLE_READY));
@ -2526,7 +2524,7 @@ gst_pulsesink_set_property (GObject * object,
case PROP_MUTE: case PROP_MUTE:
gst_pulsesink_set_mute (pulsesink, g_value_get_boolean (value)); gst_pulsesink_set_mute (pulsesink, g_value_get_boolean (value));
break; break;
case PROP_CLIENT: case PROP_CLIENT_NAME:
g_free (pulsesink->client_name); g_free (pulsesink->client_name);
if (!g_value_get_string (value)) { if (!g_value_get_string (value)) {
GST_WARNING_OBJECT (pulsesink, GST_WARNING_OBJECT (pulsesink,
@ -2573,7 +2571,7 @@ gst_pulsesink_get_property (GObject * object,
case PROP_MUTE: case PROP_MUTE:
g_value_set_boolean (value, gst_pulsesink_get_mute (pulsesink)); g_value_set_boolean (value, gst_pulsesink_get_mute (pulsesink));
break; break;
case PROP_CLIENT: case PROP_CLIENT_NAME:
g_value_set_string (value, pulsesink->client_name); g_value_set_string (value, pulsesink->client_name);
break; break;
case PROP_STREAM_PROPERTIES: case PROP_STREAM_PROPERTIES:

14
ext/pulse/pulsesrc.c
View file

@ -66,7 +66,7 @@ enum
PROP_SERVER, PROP_SERVER,
PROP_DEVICE, PROP_DEVICE,
PROP_DEVICE_NAME, PROP_DEVICE_NAME,
PROP_CLIENT, PROP_CLIENT_NAME,
PROP_STREAM_PROPERTIES, PROP_STREAM_PROPERTIES,
PROP_SOURCE_OUTPUT_INDEX, PROP_SOURCE_OUTPUT_INDEX,
PROP_VOLUME, PROP_VOLUME,
@ -182,15 +182,13 @@ gst_pulsesrc_class_init (GstPulseSrcClass * klass)
clientname = gst_pulse_client_name (); clientname = gst_pulse_client_name ();
/** /**
* GstPulseSrc:client * GstPulseSrc:client-name
* *
* The PulseAudio client name to use. * The PulseAudio client name to use.
*
* Since: 0.10.27
*/ */
g_object_class_install_property (gobject_class, g_object_class_install_property (gobject_class,
PROP_CLIENT, PROP_CLIENT_NAME,
g_param_spec_string ("client", "Client", g_param_spec_string ("client-name", "Client Name",
"The PulseAudio client_name_to_use", clientname, "The PulseAudio client_name_to_use", clientname,
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS |
GST_PARAM_MUTABLE_READY)); GST_PARAM_MUTABLE_READY));
@ -721,7 +719,7 @@ gst_pulsesrc_set_property (GObject * object,
g_free (pulsesrc->device); g_free (pulsesrc->device);
pulsesrc->device = g_value_dup_string (value); pulsesrc->device = g_value_dup_string (value);
break; break;
case PROP_CLIENT: case PROP_CLIENT_NAME:
g_free (pulsesrc->client_name); g_free (pulsesrc->client_name);
if (!g_value_get_string (value)) { if (!g_value_get_string (value)) {
GST_WARNING_OBJECT (pulsesrc, GST_WARNING_OBJECT (pulsesrc,
@ -768,7 +766,7 @@ gst_pulsesrc_get_property (GObject * object,
case PROP_DEVICE_NAME: case PROP_DEVICE_NAME:
g_value_take_string (value, gst_pulsesrc_device_description (pulsesrc)); g_value_take_string (value, gst_pulsesrc_device_description (pulsesrc));
break; break;
case PROP_CLIENT: case PROP_CLIENT_NAME:
g_value_set_string (value, pulsesrc->client_name); g_value_set_string (value, pulsesrc->client_name);
break; break;
case PROP_STREAM_PROPERTIES: case PROP_STREAM_PROPERTIES: