summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2006-05-11 00:13:18 +0000
committerLennart Poettering <lennart@poettering.net>2006-05-11 00:13:18 +0000
commitb9e130f643564de4bf44dd4fdc77f8e4e210c4f9 (patch)
tree993d98d8fda457dba69684851b550c484133a1c2 /src
parent1502e5ad98627cba1995c3722ecb239249a62b89 (diff)
rename "sink" and "source" properties of GstPolypSink and GstPolySource to "device" to match the device property of GstPolypMixer
git-svn-id: file:///home/lennart/svn/public/gst-pulse/trunk@21 bb39ca4e-bce3-0310-b5d4-eea78a553289
Diffstat (limited to 'src')
-rw-r--r--src/polypsink.c13
-rw-r--r--src/polypsrc.c10
2 files changed, 11 insertions, 12 deletions
diff --git a/src/polypsink.c b/src/polypsink.c
index f64685d..140527f 100644
--- a/src/polypsink.c
+++ b/src/polypsink.c
@@ -37,7 +37,7 @@ GST_DEBUG_CATEGORY_EXTERN(polyp_debug);
enum {
ARG_SERVER = 1,
- ARG_SINK,
+ ARG_DEVICE,
};
static GstAudioSinkClass *parent_class = NULL;
@@ -150,8 +150,8 @@ static void gst_polypsink_class_init(
g_param_spec_string("server", "Server", "The Polypaudio server to connect to", NULL, G_PARAM_READWRITE));
g_object_class_install_property(
gobject_class,
- ARG_SINK,
- g_param_spec_string("sink", "Sink", "The Polypaudio sink device to connect to", NULL, G_PARAM_READWRITE));
+ ARG_DEVICE,
+ g_param_spec_string("device", "Sink", "The Polypaudio sink device to connect to", NULL, G_PARAM_READWRITE));
}
static void gst_polypsink_init(
@@ -219,8 +219,7 @@ static void gst_polypsink_set_property(
GObject * object,
guint prop_id,
const GValue * value,
- GParamSpec * pspec) {
-
+ GParamSpec * pspec) {
GstPolypSink *polypsink = GST_POLYPSINK(object);
switch (prop_id) {
@@ -229,7 +228,7 @@ static void gst_polypsink_set_property(
polypsink->server = g_value_dup_string(value);
break;
- case ARG_SINK:
+ case ARG_DEVICE:
g_free(polypsink->device);
polypsink->device = g_value_dup_string(value);
break;
@@ -253,7 +252,7 @@ static void gst_polypsink_get_property(
g_value_set_string(value, polypsink->server);
break;
- case ARG_SINK:
+ case ARG_DEVICE:
g_value_set_string(value, polypsink->device);
break;
diff --git a/src/polypsrc.c b/src/polypsrc.c
index 00d5657..88999fc 100644
--- a/src/polypsrc.c
+++ b/src/polypsrc.c
@@ -38,7 +38,7 @@ GST_DEBUG_CATEGORY_EXTERN(polyp_debug);
enum {
ARG_0,
ARG_SERVER,
- ARG_SOURCE,
+ ARG_DEVICE,
};
static GstAudioSrcClass *parent_class = NULL;
@@ -144,8 +144,8 @@ static void gst_polypsrc_class_init(
g_param_spec_string("server", "Server", "The Polypaudio server to connect to", NULL, G_PARAM_READWRITE));
g_object_class_install_property(
gobject_class,
- ARG_SOURCE,
- g_param_spec_string("source", "source", "The Polypaudio source device to connect to", NULL, G_PARAM_READWRITE));
+ ARG_DEVICE,
+ g_param_spec_string("device", "Source", "The Polypaudio source device to connect to", NULL, G_PARAM_READWRITE));
}
static void gst_polypsrc_init(
@@ -222,7 +222,7 @@ static void gst_polypsrc_set_property(
polypsrc->server = g_value_dup_string(value);
break;
- case ARG_SOURCE:
+ case ARG_DEVICE:
g_free(polypsrc->device);
polypsrc->device = g_value_dup_string(value);
break;
@@ -246,7 +246,7 @@ static void gst_polypsrc_get_property(
g_value_set_string(value, polypsrc->server);
break;
- case ARG_SOURCE:
+ case ARG_DEVICE:
g_value_set_string(value, polypsrc->device);
break;