From 1e3484f06cc86e963110a5ea85727db9a7be3005 Mon Sep 17 00:00:00 2001
From: Benjamin Franzke <benjaminfranzke@googlemail.com>
Date: Fri, 21 Oct 2011 11:58:56 +0200
Subject: Merge sink.h and sink_input.h

---
 src/sink.h | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

(limited to 'src/sink.h')

diff --git a/src/sink.h b/src/sink.h
index 083f0d8..14d9be2 100644
--- a/src/sink.h
+++ b/src/sink.h
@@ -4,8 +4,6 @@
 #include <glib.h>
 #include <pulse/pulseaudio.h>
 
-#include "sink_input.h"
-
 typedef struct _sink_info {
 	guint32 index;
 	gchar* name;
@@ -16,4 +14,14 @@ typedef struct _sink_info {
 	GList *input_list;
 } sink_info;
 
+typedef struct _sink_input_info {
+	guint32 index;
+	guint32 sink;
+	gchar *name;
+	gchar *pid;	// maybe useless?!!?
+	gint mute;
+	guint8 channels;
+	pa_volume_t vol; // TOTO: exchange with the channel-list
+} sink_input_info;
+
 #endif
-- 
cgit