aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/Makefile.am2
-rw-r--r--src/decoder_api.c2
-rw-r--r--src/decoder_control.c2
-rw-r--r--src/decoder_control.h (renamed from src/decode.h)1
-rw-r--r--src/decoder_thread.c2
-rw-r--r--src/playerData.c2
-rw-r--r--src/player_thread.c2
7 files changed, 7 insertions, 6 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index ff4db3523..612a039f4 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -40,8 +40,8 @@ mpd_headers = \
conf.h \
crossfade.h \
dbUtils.h \
- decode.h \
decoder_thread.h \
+ decoder_control.h \
decoder_api.h \
decoder_internal.h \
directory.h \
diff --git a/src/decoder_api.c b/src/decoder_api.c
index 4ce9ee980..016c27400 100644
--- a/src/decoder_api.c
+++ b/src/decoder_api.c
@@ -19,7 +19,7 @@
#include "decoder_internal.h"
#include "decoder_list.h"
-#include "decode.h"
+#include "decoder_control.h"
#include "player.h"
#include "audio.h"
diff --git a/src/decoder_control.c b/src/decoder_control.c
index 7fc04de7d..49842b445 100644
--- a/src/decoder_control.c
+++ b/src/decoder_control.c
@@ -16,7 +16,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "decode.h"
+#include "decoder_control.h"
struct decoder_control dc;
diff --git a/src/decode.h b/src/decoder_control.h
index 0b1fe389f..f492b6aba 100644
--- a/src/decode.h
+++ b/src/decoder_control.h
@@ -1,5 +1,6 @@
/* the Music Player Daemon (MPD)
* Copyright (C) 2003-2007 by Warren Dukes (warren.dukes@gmail.com)
+ * Copyright (C) 2008 Max Kellermann <max@duempel.org>
* This project's homepage is: http://www.musicpd.org
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/decoder_thread.c b/src/decoder_thread.c
index 4104b585f..cb153b6e5 100644
--- a/src/decoder_thread.c
+++ b/src/decoder_thread.c
@@ -18,7 +18,7 @@
*/
#include "decoder_thread.h"
-#include "decode.h"
+#include "decoder_control.h"
#include "decoder_internal.h"
#include "player.h"
diff --git a/src/playerData.c b/src/playerData.c
index 308fc4b59..019c8a906 100644
--- a/src/playerData.c
+++ b/src/playerData.c
@@ -17,8 +17,8 @@
*/
#include "playerData.h"
-#include "decode.h"
#include "player.h"
+#include "decoder_control.h"
#include "outputBuffer.h"
#include "conf.h"
#include "log.h"
diff --git a/src/player_thread.c b/src/player_thread.c
index 9cccc1ab2..bb4746132 100644
--- a/src/player_thread.c
+++ b/src/player_thread.c
@@ -19,7 +19,7 @@
#include "player_thread.h"
#include "player.h"
#include "playerData.h"
-#include "decode.h"
+#include "decoder_control.h"
#include "audio.h"
#include "pcm_utils.h"
#include "path.h"