From 1a04e571686ea9c9bfca2701564a41f7d9d12a9e Mon Sep 17 00:00:00 2001
From: Viliam Mateicka <viliam.mateicka@gmail.com>
Date: Sun, 4 Jan 2009 17:35:51 +0100
Subject: renaming mixer.h to mixer_api.h

---
 src/audio.c              |  2 +-
 src/mixer.h              | 33 ---------------------------------
 src/mixer/alsa_mixer.c   |  2 +-
 src/mixer/oss_mixer.c    |  6 +++---
 src/mixer_api.h          | 33 +++++++++++++++++++++++++++++++++
 src/output/alsa_plugin.c |  2 +-
 src/output/oss_plugin.c  |  2 +-
 7 files changed, 40 insertions(+), 40 deletions(-)
 delete mode 100644 src/mixer.h
 create mode 100644 src/mixer_api.h

diff --git a/src/audio.c b/src/audio.c
index fd01296b2..4b3a60718 100644
--- a/src/audio.c
+++ b/src/audio.c
@@ -24,7 +24,7 @@
 #include "path.h"
 #include "client.h"
 #include "idle.h"
-#include "mixer.h"
+#include "mixer_api.h"
 
 #include <glib.h>
 
diff --git a/src/mixer.h b/src/mixer.h
deleted file mode 100644
index 43dc3299d..000000000
--- a/src/mixer.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-#ifndef MPD_MIXER_H
-#define MPD_MIXER_H
-
-#include "conf.h"
-
-/**
- * alsa mixer
- */
-
-struct alsa_mixer;
-
-struct alsa_mixer *alsa_mixer_init(void);
-void alsa_mixer_finish(struct alsa_mixer *am);
-void alsa_mixer_configure(struct alsa_mixer *am, ConfigParam *param);
-bool alsa_mixer_open(struct alsa_mixer *am);
-bool alsa_mixer_control(struct alsa_mixer *am, int cmd, void *arg);
-void alsa_mixer_close(struct alsa_mixer *am);
-
-/**
- * oss mixer
- */
-
-struct oss_mixer;
-
-struct oss_mixer *oss_mixer_init(void);
-void oss_mixer_finish(struct oss_mixer *am);
-void oss_mixer_configure(struct oss_mixer *am, ConfigParam *param);
-bool oss_mixer_open(struct oss_mixer *am);
-bool oss_mixer_control(struct oss_mixer *am, int cmd, void *arg);
-void oss_mixer_close(struct oss_mixer *am);
-
-#endif
diff --git a/src/mixer/alsa_mixer.c b/src/mixer/alsa_mixer.c
index fa97211aa..c1331993b 100644
--- a/src/mixer/alsa_mixer.c
+++ b/src/mixer/alsa_mixer.c
@@ -1,6 +1,6 @@
 
 #include "../output_api.h"
-#include "../mixer.h"
+#include "../mixer_api.h"
 
 #include <glib.h>
 #include <alsa/asoundlib.h>
diff --git a/src/mixer/oss_mixer.c b/src/mixer/oss_mixer.c
index f3030d212..b4b2ed7c6 100644
--- a/src/mixer/oss_mixer.c
+++ b/src/mixer/oss_mixer.c
@@ -1,4 +1,7 @@
 
+#include "../output_api.h"
+#include "../mixer_api.h"
+
 #include <glib.h>
 #include <sys/stat.h>
 #include <sys/ioctl.h>
@@ -7,9 +10,6 @@
 #include <stdlib.h>
 #include <unistd.h>
 
-#include "../output_api.h"
-#include "../mixer.h"
-
 #if defined(__OpenBSD__) || defined(__NetBSD__)
 # include <soundcard.h>
 #else /* !(defined(__OpenBSD__) || defined(__NetBSD__) */
diff --git a/src/mixer_api.h b/src/mixer_api.h
new file mode 100644
index 000000000..43dc3299d
--- /dev/null
+++ b/src/mixer_api.h
@@ -0,0 +1,33 @@
+
+#ifndef MPD_MIXER_H
+#define MPD_MIXER_H
+
+#include "conf.h"
+
+/**
+ * alsa mixer
+ */
+
+struct alsa_mixer;
+
+struct alsa_mixer *alsa_mixer_init(void);
+void alsa_mixer_finish(struct alsa_mixer *am);
+void alsa_mixer_configure(struct alsa_mixer *am, ConfigParam *param);
+bool alsa_mixer_open(struct alsa_mixer *am);
+bool alsa_mixer_control(struct alsa_mixer *am, int cmd, void *arg);
+void alsa_mixer_close(struct alsa_mixer *am);
+
+/**
+ * oss mixer
+ */
+
+struct oss_mixer;
+
+struct oss_mixer *oss_mixer_init(void);
+void oss_mixer_finish(struct oss_mixer *am);
+void oss_mixer_configure(struct oss_mixer *am, ConfigParam *param);
+bool oss_mixer_open(struct oss_mixer *am);
+bool oss_mixer_control(struct oss_mixer *am, int cmd, void *arg);
+void oss_mixer_close(struct oss_mixer *am);
+
+#endif
diff --git a/src/output/alsa_plugin.c b/src/output/alsa_plugin.c
index b33ee39d8..0d97438eb 100644
--- a/src/output/alsa_plugin.c
+++ b/src/output/alsa_plugin.c
@@ -17,7 +17,7 @@
  */
 
 #include "../output_api.h"
-#include "../mixer.h"
+#include "../mixer_api.h"
 
 #include <glib.h>
 #include <alsa/asoundlib.h>
diff --git a/src/output/oss_plugin.c b/src/output/oss_plugin.c
index 1fa887bea..98d0fd94d 100644
--- a/src/output/oss_plugin.c
+++ b/src/output/oss_plugin.c
@@ -20,7 +20,7 @@
  */
 
 #include "../output_api.h"
-#include "../mixer.h"
+#include "../mixer_api.h"
 
 #include <glib.h>
 
-- 
cgit v1.2.3