summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/command.c6
-rw-r--r--src/interface.c2
-rw-r--r--src/sink.h6
3 files changed, 7 insertions, 7 deletions
diff --git a/src/command.c b/src/command.c
index 1e9ddef..8f4b1c1 100644
--- a/src/command.c
+++ b/src/command.c
@@ -91,7 +91,7 @@ down(struct context *ctx, int key)
interface_redraw(ctx);
}
-static struct vol_ctl_object *
+static struct vol_ctl *
interface_get_current_ctl(struct context *ctx)
{
struct sink_info *sink;
@@ -117,7 +117,7 @@ interface_get_current_ctl(struct context *ctx)
static void
volume_change(struct context *ctx, gboolean volume_increment)
{
- struct vol_ctl_object *ctl;
+ struct vol_ctl *ctl;
pa_operation *o;
pa_cvolume volume;
pa_volume_t inc;
@@ -163,7 +163,7 @@ volume_up(struct context *ctx, int key)
static void
do_mute(struct context *ctx, int key)
{
- struct vol_ctl_object *ctl;
+ struct vol_ctl *ctl;
pa_operation *o;
if (!ctx->context_ready)
diff --git a/src/interface.c b/src/interface.c
index be332ba..1d23a30 100644
--- a/src/interface.c
+++ b/src/interface.c
@@ -122,7 +122,7 @@ print_input_list(struct context *ctx, struct sink_info *sink,
static void
set_max_name_len(struct context *ctx)
{
- struct vol_ctl_object *ctl;
+ struct vol_ctl *ctl;
guint len = 0;
ctx->max_name_len = len;
diff --git a/src/sink.h b/src/sink.h
index 7141a26..1d97752 100644
--- a/src/sink.h
+++ b/src/sink.h
@@ -25,7 +25,7 @@
struct context;
-struct vol_ctl_object {
+struct vol_ctl {
guint32 index;
pa_volume_t vol; // TOTO: exchange with the channel-list
gint mute;
@@ -41,12 +41,12 @@ struct vol_ctl_object {
};
struct sink_info {
- struct vol_ctl_object base;
+ struct vol_ctl base;
gint priority;
};
struct sink_input_info {
- struct vol_ctl_object base;
+ struct vol_ctl base;
guint32 sink;
};