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/Makefile.am   |  2 +-
 src/pa-sink-ctl.c |  1 -
 src/sink.h        | 12 ++++++++++--
 src/sink_input.h  | 17 -----------------
 4 files changed, 11 insertions(+), 21 deletions(-)
 delete mode 100644 src/sink_input.h

(limited to 'src')

diff --git a/src/Makefile.am b/src/Makefile.am
index 327376b..3fc41ad 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -11,4 +11,4 @@ AM_CPPFLAGS = $(PULSE_CFLAGS) $(PULSE_MAINLOOP_CFLAGS) $(GLIB_CFLAGS) \
 	      -include $(top_builddir)/config.h
 pa_sink_ctl_LDADD = $(GLIB_LIBS) $(PULSE_LIBS) $(PULSE_MAINLOOP_LIBS) $(CURSES_LIBS)
 
-noinst_HEADERS = interface.h pa-sink-ctl.h sink.h sink_input.h unix_signal.h
+noinst_HEADERS = interface.h pa-sink-ctl.h sink.h unix_signal.h
diff --git a/src/pa-sink-ctl.c b/src/pa-sink-ctl.c
index 3591df3..a2d8afe 100644
--- a/src/pa-sink-ctl.c
+++ b/src/pa-sink-ctl.c
@@ -2,7 +2,6 @@
 #include <pulse/pulseaudio.h>
 #include <pulse/glib-mainloop.h>
 
-#include "sink_input.h"
 #include "sink.h"
 #include "interface.h"
 #include "pa-sink-ctl.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
diff --git a/src/sink_input.h b/src/sink_input.h
deleted file mode 100644
index 82797c0..0000000
--- a/src/sink_input.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#ifndef SINK_INPUT_H
-#define SINK_INPUT_H
-
-#include <glib.h>
-#include <pulse/pulseaudio.h>
-
-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