aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/Makefile.am8
-rw-r--r--src/decoder_api.h2
-rw-r--r--src/input_curl.c2
-rw-r--r--src/input_file.c (renamed from src/inputStream_file.c)2
-rw-r--r--src/input_file.h (renamed from src/inputStream_file.h)2
-rw-r--r--src/input_stream.c (renamed from src/inputStream.c)4
-rw-r--r--src/input_stream.h (renamed from src/inputStream.h)0
-rw-r--r--src/main.c2
8 files changed, 11 insertions, 11 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index 12e690cf7..15d15e175 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -47,8 +47,8 @@ mpd_headers = \
decoder_list.h \
decoder/_flac_common.h \
decoder/_ogg_common.h \
- inputStream.h \
- inputStream_file.h \
+ input_stream.h \
+ input_file.h \
client.h \
list.h \
dlist.h \
@@ -128,8 +128,8 @@ mpd_SOURCES = \
dirvec.c \
update.c \
decoder_list.c \
- inputStream.c \
- inputStream_file.c \
+ input_stream.c \
+ input_file.c \
client.c \
ioops.c \
list.c \
diff --git a/src/decoder_api.h b/src/decoder_api.h
index 7d8a1e567..8096d3cd8 100644
--- a/src/decoder_api.h
+++ b/src/decoder_api.h
@@ -26,7 +26,7 @@
*
*/
-#include "inputStream.h"
+#include "input_stream.h"
#include "replayGain.h"
#include "tag.h"
#include "tag_id3.h"
diff --git a/src/input_curl.c b/src/input_curl.c
index 3c32d7118..fc78adca0 100644
--- a/src/input_curl.c
+++ b/src/input_curl.c
@@ -17,7 +17,7 @@
*/
#include "input_curl.h"
-#include "inputStream.h"
+#include "input_stream.h"
#include "gcc.h"
#include "dlist.h"
diff --git a/src/inputStream_file.c b/src/input_file.c
index 9b5a1a62d..de7d0b5a3 100644
--- a/src/inputStream_file.c
+++ b/src/input_file.c
@@ -16,7 +16,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "inputStream_file.h"
+#include "input_file.h"
#include "log.h"
#include "os_compat.h"
diff --git a/src/inputStream_file.h b/src/input_file.h
index 9199d9c01..00d85a36c 100644
--- a/src/inputStream_file.h
+++ b/src/input_file.h
@@ -19,7 +19,7 @@
#ifndef INPUT_STREAM_FILE_H
#define INPUT_STREAM_FILE_H
-#include "inputStream.h"
+#include "input_stream.h"
void inputStream_initFile(void);
diff --git a/src/inputStream.c b/src/input_stream.c
index b293cb1cd..607cfc358 100644
--- a/src/inputStream.c
+++ b/src/input_stream.c
@@ -16,10 +16,10 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "inputStream.h"
+#include "input_stream.h"
#include "config.h"
-#include "inputStream_file.h"
+#include "input_file.h"
#ifdef HAVE_CURL
#include "input_curl.h"
diff --git a/src/inputStream.h b/src/input_stream.h
index db4d6ff57..db4d6ff57 100644
--- a/src/inputStream.h
+++ b/src/input_stream.h
diff --git a/src/main.c b/src/main.c
index 80f4fecf6..d870aaa7f 100644
--- a/src/main.c
+++ b/src/main.c
@@ -41,7 +41,7 @@
#include "replayGain.h"
#include "decoder_list.h"
#include "audioOutput.h"
-#include "inputStream.h"
+#include "input_stream.h"
#include "state_file.h"
#include "tag.h"
#include "dbUtils.h"