diff options
| author | Benjamin Franzke <benjaminfranzke@googlemail.com> | 2011-10-21 11:58:56 +0200 |
|---|---|---|
| committer | Benjamin Franzke <benjaminfranzke@googlemail.com> | 2011-10-21 23:13:16 +0200 |
| commit | 1e3484f06cc86e963110a5ea85727db9a7be3005 (patch) | |
| tree | 77f04154c73bb411e052d17d5f1cad90140315d8 | |
| parent | 2310d43d6410de464dbd5ffa7edc7fd2785f21d3 (diff) | |
| download | pa-sink-ctl-1e3484f06cc86e963110a5ea85727db9a7be3005.tar.gz pa-sink-ctl-1e3484f06cc86e963110a5ea85727db9a7be3005.tar.bz2 pa-sink-ctl-1e3484f06cc86e963110a5ea85727db9a7be3005.zip | |
Merge sink.h and sink_input.h
| -rw-r--r-- | src/Makefile.am | 2 | ||||
| -rw-r--r-- | src/pa-sink-ctl.c | 1 | ||||
| -rw-r--r-- | src/sink.h | 12 | ||||
| -rw-r--r-- | src/sink_input.h | 17 |
4 files changed, 11 insertions, 21 deletions
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" @@ -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 |