glib-ify datatype, functions etc + header cleanup

1 files changed, 7 insertions, 11 deletions

diff --git a/src/sink.h b/src/sink.h
index a9f64d1..4e46045 100644
--- a/src/sink.h
+++ b/src/sink.h
@@ -1,21 +1,17 @@
 #ifndef SINK_H
 #define SINK_H
 
-#include <stdio.h>
 #include <glib.h>
 #include <pulse/pulseaudio.h>
-#include <ncurses.h>
-#include <string.h>
-#include <stdlib.h>
 
 #include "sink_input.h"
 
 typedef struct _sink_info {
-	uint32_t index;
-	char* name;
-	char* device;
-	int mute;
-	uint8_t channels;
+	guint32 index;
+	gchar* name;
+	gchar* device;
+	gint mute;
+	guint8 channels;
 	pa_volume_t vol;
 	GArray *input_list;
 } sink_info;
@@ -23,7 +19,7 @@ typedef struct _sink_info {
 GArray *sink_list_alloc(void);
 void sink_list_free(GArray *sink_list);
 
-sink_info *sink_list_get(int index);
-sink_input_info *sink_input_get(int sink_list_index, int index);
+sink_info *sink_list_get(gint index);
+sink_input_info *sink_input_get(gint sink_list_index, gint index);
 
 #endif