summaryrefslogtreecommitdiff
path: root/src/sink.h
diff options
context:
space:
mode:
authorBenjamin Franzke <benjaminfranzke@googlemail.com>2011-10-21 11:53:39 +0200
committerBenjamin Franzke <benjaminfranzke@googlemail.com>2011-10-21 23:13:11 +0200
commit2310d43d6410de464dbd5ffa7edc7fd2785f21d3 (patch)
treed6a888b1b973b829a87bad67d210eb3b3d633ed6 /src/sink.h
parent478d7fe56a9927133b87b80e21d507c90bd8800d (diff)
downloadpa-sink-ctl-2310d43d6410de464dbd5ffa7edc7fd2785f21d3.tar.gz
pa-sink-ctl-2310d43d6410de464dbd5ffa7edc7fd2785f21d3.tar.bz2
pa-sink-ctl-2310d43d6410de464dbd5ffa7edc7fd2785f21d3.zip
Use a GList instead of GArray for sinks.
This lets us drop our ugly GArray wrappers sink.c and sink_input.c. It will make gradual updates of sinks easier, since elements can be added and dropped everywhere in the list easily.
Diffstat (limited to 'src/sink.h')
-rw-r--r--src/sink.h14
1 files changed, 1 insertions, 13 deletions
diff --git a/src/sink.h b/src/sink.h
index cccbe1b..083f0d8 100644
--- a/src/sink.h
+++ b/src/sink.h
@@ -1,12 +1,6 @@
#ifndef SINK_H
#define SINK_H
-#ifdef SINK_C
-GArray *sink_list;
-#else
-extern GArray *sink_list;
-#endif
-
#include <glib.h>
#include <pulse/pulseaudio.h>
@@ -19,13 +13,7 @@ typedef struct _sink_info {
gint mute;
guint8 channels;
pa_volume_t vol;
- GArray *input_list;
+ GList *input_list;
} sink_info;
-GArray *sink_list_alloc(void);
-void sink_list_free(GArray *sink_list);
-
-sink_info *sink_list_get(gint index);
-sink_input_info *sink_input_get(gint sink_list_index, gint index);
-
#endif