diff options
author | ben <benjaminfranzke@googlemail.com> | 2010-07-22 00:05:22 +0200 |
---|---|---|
committer | ben <benjaminfranzke@googlemail.com> | 2010-07-22 00:05:22 +0200 |
commit | 1a1785595a9079850e1b9d490d486af6c6f47873 (patch) | |
tree | bb0e10925f3ecbcd490ad7e21a85f79d94f84a55 /src/sink.c | |
parent | bc5846ff488f8ec7418c2a91ef0794c3f0405d8d (diff) | |
download | pa-sink-ctl-1a1785595a9079850e1b9d490d486af6c6f47873.tar.gz pa-sink-ctl-1a1785595a9079850e1b9d490d486af6c6f47873.tar.bz2 pa-sink-ctl-1a1785595a9079850e1b9d490d486af6c6f47873.zip |
glib-ify datatype, functions etc + header cleanup
Diffstat (limited to 'src/sink.c')
-rw-r--r-- | src/sink.c | 37 |
1 files changed, 18 insertions, 19 deletions
@@ -1,29 +1,16 @@ -#include <stdio.h> #include <glib.h> -#include <pulse/pulseaudio.h> -#include <ncurses.h> -#include <string.h> -#include <stdlib.h> #include "sink_input.h" #include "sink.h" extern GArray *sink_list; -sink_info *sink_list_get(int index) { - return &g_array_index(sink_list, sink_info, index); -} - -sink_input_info *sink_input_get(int sink_list_index, int index) { - return &g_array_index(sink_list_get(sink_list_index)->input_list, sink_input_info, index); -} - /* * init a sink list */ GArray *sink_list_alloc(void) { - return g_array_sized_new(false, false, sizeof(sink_info), 16); + return g_array_sized_new(FALSE, FALSE, sizeof(sink_info), 16); } /* @@ -31,10 +18,8 @@ GArray *sink_list_alloc(void) */ static void sink_clear(sink_info* sink) { - if (sink->name != NULL) - free(sink->name); - if (sink->device != NULL) - free(sink->device); + g_free(sink->name); + g_free(sink->device); sink_input_list_free(sink->input_list); } @@ -45,7 +30,21 @@ void sink_list_free(GArray *sink_list) { for (int i = 0; i < sink_list->len; ++i) sink_clear(&g_array_index(sink_list, sink_info, i)); - g_array_free(sink_list, true); + g_array_free(sink_list, TRUE); } +/* + * get sink at index from sink_list + */ +sink_info *sink_list_get(gint index) +{ + return &g_array_index(sink_list, sink_info, index); +} +/* + * get an input association to an sink by their indizes + */ +sink_input_info *sink_input_get(gint sink_list_index, gint index) +{ + return &g_array_index(sink_list_get(sink_list_index)->input_list, sink_input_info, index); +} |