From 2310d43d6410de464dbd5ffa7edc7fd2785f21d3 Mon Sep 17 00:00:00 2001 From: Benjamin Franzke Date: Fri, 21 Oct 2011 11:53:39 +0200 Subject: 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. --- src/sink.h | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) (limited to 'src/sink.h') 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 #include @@ -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 -- cgit