diff options
| author | Max Kellermann <max@duempel.org> | 2011-10-10 08:57:51 +0200 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2011-10-10 10:13:43 +0200 |
| commit | 311e627463a17a499a88b50af2404e955115675b (patch) | |
| tree | 5233c85c3842df9b4124d2aadd11f6a741f73b8c | |
| parent | 8e1e36a0d57464d1295723b5d808f7ecf6774a4f (diff) | |
audio: rename audio.[ch] to audio_config.[ch]
| -rw-r--r-- | Makefile.am | 3 | ||||
| -rw-r--r-- | src/audio_config.c (renamed from src/audio.c) | 2 | ||||
| -rw-r--r-- | src/audio_config.h (renamed from src/audio.h) | 4 | ||||
| -rw-r--r-- | src/decoder_api.c | 2 | ||||
| -rw-r--r-- | src/main.c | 2 |
5 files changed, 6 insertions, 7 deletions
diff --git a/Makefile.am b/Makefile.am index 08f5eb472..f56b1f9aa 100644 --- a/Makefile.am +++ b/Makefile.am @@ -41,7 +41,6 @@ mpd_headers = \ src/notify.h \ src/ack.h \ src/ape.h \ - src/audio.h \ src/audio_format.h \ src/audio_check.h \ src/audio_parser.h \ @@ -231,7 +230,7 @@ src_mpd_SOURCES = \ $(MIXER_API_SRC) \ src/glib_socket.h \ src/notify.c \ - src/audio.c \ + src/audio_config.c src/audio_config.h \ src/audio_check.c \ src/audio_format.c \ src/audio_parser.c \ diff --git a/src/audio.c b/src/audio_config.c index 22879fc79..72869c384 100644 --- a/src/audio.c +++ b/src/audio_config.c @@ -18,7 +18,7 @@ */ #include "config.h" -#include "audio.h" +#include "audio_config.h" #include "audio_format.h" #include "audio_parser.h" #include "output_internal.h" diff --git a/src/audio.h b/src/audio_config.h index 61835d4d7..85143247f 100644 --- a/src/audio.h +++ b/src/audio_config.h @@ -17,8 +17,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifndef MPD_AUDIO_H -#define MPD_AUDIO_H +#ifndef MPD_AUDIO_CONFIG_H +#define MPD_AUDIO_CONFIG_H #include <stdbool.h> diff --git a/src/decoder_api.c b/src/decoder_api.c index 311f1f31b..203a7cebb 100644 --- a/src/decoder_api.c +++ b/src/decoder_api.c @@ -21,7 +21,7 @@ #include "decoder_api.h" #include "decoder_internal.h" #include "decoder_control.h" -#include "audio.h" +#include "audio_config.h" #include "song.h" #include "buffer.h" #include "pipe.h" diff --git a/src/main.c b/src/main.c index addf439d2..68f19f153 100644 --- a/src/main.c +++ b/src/main.c @@ -39,7 +39,7 @@ #include "player_control.h" #include "stats.h" #include "sig_handlers.h" -#include "audio.h" +#include "audio_config.h" #include "output_all.h" #include "volume.h" #include "log.h" |