summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2006-05-11 00:35:55 +0000
committerLennart Poettering <lennart@poettering.net>2006-05-11 00:35:55 +0000
commit07c51edad273c326a86c60c9ac9aa3eff1542463 (patch)
tree9405c678aa43dfcba3f344fd382b97269f07a41a
parentb9e130f643564de4bf44dd4fdc77f8e4e210c4f9 (diff)
s/ARG_/PROP_/
git-svn-id: file:///home/lennart/svn/public/gst-pulse/trunk@22 bb39ca4e-bce3-0310-b5d4-eea78a553289
-rw-r--r--src/polypmixer.c22
-rw-r--r--src/polypsink.c18
-rw-r--r--src/polypsrc.c18
3 files changed, 29 insertions, 29 deletions
diff --git a/src/polypmixer.c b/src/polypmixer.c
index dfc8166..ef5a846 100644
--- a/src/polypmixer.c
+++ b/src/polypmixer.c
@@ -29,9 +29,9 @@
#include "polypmixer.h"
enum {
- ARG_SERVER = 1,
- ARG_DEVICE,
- ARG_DEVICE_NAME
+ PROP_SERVER = 1,
+ PROP_DEVICE,
+ PROP_DEVICE_NAME
};
GST_DEBUG_CATEGORY_EXTERN(polyp_debug);
@@ -69,17 +69,17 @@ static void gst_polypmixer_class_init(GstPolypMixerClass *g_class) {
g_object_class_install_property(
gobject_class,
- ARG_SERVER,
+ PROP_SERVER,
g_param_spec_string("server", "Server", "The Polypaudio server to connect to", NULL, G_PARAM_READWRITE));
g_object_class_install_property(
gobject_class,
- ARG_DEVICE,
+ PROP_DEVICE,
g_param_spec_string("device", "Sink/Source", "The Polypaudio sink or source to control", NULL, G_PARAM_READWRITE));
g_object_class_install_property(
gobject_class,
- ARG_DEVICE_NAME,
+ PROP_DEVICE_NAME,
g_param_spec_string("device-name", "Device name", "Human-readable name of the sound device", NULL, G_PARAM_READABLE));
}
@@ -112,12 +112,12 @@ static void gst_polypmixer_set_property(
GstPolypMixer *this = GST_POLYPMIXER(object);
switch (prop_id) {
- case ARG_SERVER:
+ case PROP_SERVER:
g_free(this->server);
this->server = g_value_dup_string(value);
break;
- case ARG_DEVICE:
+ case PROP_DEVICE:
g_free(this->device);
this->device = g_value_dup_string(value);
break;
@@ -138,15 +138,15 @@ static void gst_polypmixer_get_property(
switch(prop_id) {
- case ARG_SERVER:
+ case PROP_SERVER:
g_value_set_string(value, this->server);
break;
- case ARG_DEVICE:
+ case PROP_DEVICE:
g_value_set_string(value, this->device);
break;
- case ARG_DEVICE_NAME:
+ case PROP_DEVICE_NAME:
if (this->mixer) {
char *t = g_strdup_printf("[%s] %s", this->mixer->name, this->mixer->description);
diff --git a/src/polypsink.c b/src/polypsink.c
index 140527f..02cb3d7 100644
--- a/src/polypsink.c
+++ b/src/polypsink.c
@@ -36,8 +36,8 @@ GST_DEBUG_CATEGORY_EXTERN(polyp_debug);
#define GST_CAT_DEFAULT polyp_debug
enum {
- ARG_SERVER = 1,
- ARG_DEVICE,
+ PROP_SERVER = 1,
+ PROP_DEVICE,
};
static GstAudioSinkClass *parent_class = NULL;
@@ -142,15 +142,15 @@ static void gst_polypsink_class_init(
gstaudiosink_class->write = GST_DEBUG_FUNCPTR(gst_polypsink_write);
gstaudiosink_class->delay = GST_DEBUG_FUNCPTR(gst_polypsink_delay);
gstaudiosink_class->reset = GST_DEBUG_FUNCPTR(gst_polypsink_reset);
-
+
/* Overwrite GObject fields */
g_object_class_install_property(
gobject_class,
- ARG_SERVER,
+ PROP_SERVER,
g_param_spec_string("server", "Server", "The Polypaudio server to connect to", NULL, G_PARAM_READWRITE));
g_object_class_install_property(
gobject_class,
- ARG_DEVICE,
+ PROP_DEVICE,
g_param_spec_string("device", "Sink", "The Polypaudio sink device to connect to", NULL, G_PARAM_READWRITE));
}
@@ -223,12 +223,12 @@ static void gst_polypsink_set_property(
GstPolypSink *polypsink = GST_POLYPSINK(object);
switch (prop_id) {
- case ARG_SERVER:
+ case PROP_SERVER:
g_free(polypsink->server);
polypsink->server = g_value_dup_string(value);
break;
- case ARG_DEVICE:
+ case PROP_DEVICE:
g_free(polypsink->device);
polypsink->device = g_value_dup_string(value);
break;
@@ -248,11 +248,11 @@ static void gst_polypsink_get_property(
GstPolypSink *polypsink = GST_POLYPSINK(object);
switch(prop_id) {
- case ARG_SERVER:
+ case PROP_SERVER:
g_value_set_string(value, polypsink->server);
break;
- case ARG_DEVICE:
+ case PROP_DEVICE:
g_value_set_string(value, polypsink->device);
break;
diff --git a/src/polypsrc.c b/src/polypsrc.c
index 88999fc..4939737 100644
--- a/src/polypsrc.c
+++ b/src/polypsrc.c
@@ -36,9 +36,9 @@ GST_DEBUG_CATEGORY_EXTERN(polyp_debug);
#define GST_CAT_DEFAULT polyp_debug
enum {
- ARG_0,
- ARG_SERVER,
- ARG_DEVICE,
+ PROP_0,
+ PROP_SERVER,
+ PROP_DEVICE,
};
static GstAudioSrcClass *parent_class = NULL;
@@ -140,11 +140,11 @@ static void gst_polypsrc_class_init(
/* Overwrite GObject fields */
g_object_class_install_property(
gobject_class,
- ARG_SERVER,
+ PROP_SERVER,
g_param_spec_string("server", "Server", "The Polypaudio server to connect to", NULL, G_PARAM_READWRITE));
g_object_class_install_property(
gobject_class,
- ARG_DEVICE,
+ PROP_DEVICE,
g_param_spec_string("device", "Source", "The Polypaudio source device to connect to", NULL, G_PARAM_READWRITE));
}
@@ -217,12 +217,12 @@ static void gst_polypsrc_set_property(
GstPolypSrc *polypsrc = GST_POLYPSRC(object);
switch (prop_id) {
- case ARG_SERVER:
+ case PROP_SERVER:
g_free(polypsrc->server);
polypsrc->server = g_value_dup_string(value);
break;
- case ARG_DEVICE:
+ case PROP_DEVICE:
g_free(polypsrc->device);
polypsrc->device = g_value_dup_string(value);
break;
@@ -242,11 +242,11 @@ static void gst_polypsrc_get_property(
GstPolypSrc *polypsrc = GST_POLYPSRC(object);
switch(prop_id) {
- case ARG_SERVER:
+ case PROP_SERVER:
g_value_set_string(value, polypsrc->server);
break;
- case ARG_DEVICE:
+ case PROP_DEVICE:
g_value_set_string(value, polypsrc->device);
break;