diff options
Diffstat (limited to '')
| -rw-r--r-- | src/audio.c | 2 | ||||
| -rw-r--r-- | src/mixer/alsa_mixer.c | 2 | ||||
| -rw-r--r-- | src/mixer/oss_mixer.c | 6 | ||||
| -rw-r--r-- | src/mixer_api.h (renamed from src/mixer.h) | 0 | ||||
| -rw-r--r-- | src/output/alsa_plugin.c | 2 | ||||
| -rw-r--r-- | src/output/oss_plugin.c | 2 |
6 files changed, 7 insertions, 7 deletions
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/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.h b/src/mixer_api.h index 43dc3299d..43dc3299d 100644 --- a/src/mixer.h +++ b/src/mixer_api.h 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> |