aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--src/Makefile.am28
-rw-r--r--src/decoder/_flac_common.c (renamed from src/inputPlugins/_flac_common.c)0
-rw-r--r--src/decoder/_flac_common.h (renamed from src/inputPlugins/_flac_common.h)0
-rw-r--r--src/decoder/_ogg_common.c (renamed from src/inputPlugins/_ogg_common.c)0
-rw-r--r--src/decoder/_ogg_common.h (renamed from src/inputPlugins/_ogg_common.h)0
-rw-r--r--src/decoder/aac_plugin.c (renamed from src/inputPlugins/aac_plugin.c)0
-rw-r--r--src/decoder/audiofile_plugin.c (renamed from src/inputPlugins/audiofile_plugin.c)0
-rw-r--r--src/decoder/ffmpeg_plugin.c (renamed from src/inputPlugins/ffmpeg_plugin.c)0
-rw-r--r--src/decoder/flac_plugin.c (renamed from src/inputPlugins/flac_plugin.c)0
-rw-r--r--src/decoder/mod_plugin.c (renamed from src/inputPlugins/mod_plugin.c)0
-rw-r--r--src/decoder/mp3_plugin.c (renamed from src/inputPlugins/mp3_plugin.c)0
-rw-r--r--src/decoder/mp4_plugin.c (renamed from src/inputPlugins/mp4_plugin.c)0
-rw-r--r--src/decoder/mpc_plugin.c (renamed from src/inputPlugins/mpc_plugin.c)0
-rw-r--r--src/decoder/oggflac_plugin.c (renamed from src/inputPlugins/oggflac_plugin.c)0
-rw-r--r--src/decoder/oggvorbis_plugin.c (renamed from src/inputPlugins/oggvorbis_plugin.c)0
-rw-r--r--src/decoder/wavpack_plugin.c (renamed from src/inputPlugins/wavpack_plugin.c)0
16 files changed, 14 insertions, 14 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index 967dfb861..5438c0abf 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -45,8 +45,8 @@ mpd_headers = \
dirvec.h \
gcc.h \
decoder_list.h \
- inputPlugins/_flac_common.h \
- inputPlugins/_ogg_common.h \
+ decoder/_flac_common.h \
+ decoder/_ogg_common.h \
inputStream.h \
inputStream_file.h \
inputStream_http.h \
@@ -193,51 +193,51 @@ endif
# decoder plugins
if HAVE_MAD
-mpd_SOURCES += inputPlugins/mp3_plugin.c
+mpd_SOURCES += decoder/mp3_plugin.c
endif
if HAVE_MPCDEC
-mpd_SOURCES += inputPlugins/mpc_plugin.c
+mpd_SOURCES += decoder/mpc_plugin.c
endif
if HAVE_WAVPACK
-mpd_SOURCES += inputPlugins/wavpack_plugin.c
+mpd_SOURCES += decoder/wavpack_plugin.c
endif
if HAVE_FAAD
-mpd_SOURCES += inputPlugins/aac_plugin.c inputPlugins/mp4_plugin.c
+mpd_SOURCES += decoder/aac_plugin.c decoder/mp4_plugin.c
endif
if HAVE_OGG_COMMON
-mpd_SOURCES += inputPlugins/_ogg_common.c
+mpd_SOURCES += decoder/_ogg_common.c
endif
if HAVE_FLAC_COMMON
-mpd_SOURCES += inputPlugins/_flac_common.c
+mpd_SOURCES += decoder/_flac_common.c
endif
if HAVE_OGGVORBIS
-mpd_SOURCES += inputPlugins/oggvorbis_plugin.c
+mpd_SOURCES += decoder/oggvorbis_plugin.c
endif
if HAVE_FLAC
-mpd_SOURCES += inputPlugins/flac_plugin.c
+mpd_SOURCES += decoder/flac_plugin.c
endif
if HAVE_OGGFLAC
-mpd_SOURCES += inputPlugins/oggflac_plugin.c
+mpd_SOURCES += decoder/oggflac_plugin.c
endif
if HAVE_AUDIOFILE
-mpd_SOURCES += inputPlugins/audiofile_plugin.c
+mpd_SOURCES += decoder/audiofile_plugin.c
endif
if HAVE_MIKMOD
-mpd_SOURCES += inputPlugins/mod_plugin.c
+mpd_SOURCES += decoder/mod_plugin.c
endif
if HAVE_FFMPEG
-mpd_SOURCES += inputPlugins/ffmpeg_plugin.c
+mpd_SOURCES += decoder/ffmpeg_plugin.c
endif
diff --git a/src/inputPlugins/_flac_common.c b/src/decoder/_flac_common.c
index db43e0003..db43e0003 100644
--- a/src/inputPlugins/_flac_common.c
+++ b/src/decoder/_flac_common.c
diff --git a/src/inputPlugins/_flac_common.h b/src/decoder/_flac_common.h
index 45714b4bd..45714b4bd 100644
--- a/src/inputPlugins/_flac_common.h
+++ b/src/decoder/_flac_common.h
diff --git a/src/inputPlugins/_ogg_common.c b/src/decoder/_ogg_common.c
index 841b2ad3f..841b2ad3f 100644
--- a/src/inputPlugins/_ogg_common.c
+++ b/src/decoder/_ogg_common.c
diff --git a/src/inputPlugins/_ogg_common.h b/src/decoder/_ogg_common.h
index 7c9e7b630..7c9e7b630 100644
--- a/src/inputPlugins/_ogg_common.h
+++ b/src/decoder/_ogg_common.h
diff --git a/src/inputPlugins/aac_plugin.c b/src/decoder/aac_plugin.c
index 7842bcc22..7842bcc22 100644
--- a/src/inputPlugins/aac_plugin.c
+++ b/src/decoder/aac_plugin.c
diff --git a/src/inputPlugins/audiofile_plugin.c b/src/decoder/audiofile_plugin.c
index 99846e853..99846e853 100644
--- a/src/inputPlugins/audiofile_plugin.c
+++ b/src/decoder/audiofile_plugin.c
diff --git a/src/inputPlugins/ffmpeg_plugin.c b/src/decoder/ffmpeg_plugin.c
index 6455cd1ce..6455cd1ce 100644
--- a/src/inputPlugins/ffmpeg_plugin.c
+++ b/src/decoder/ffmpeg_plugin.c
diff --git a/src/inputPlugins/flac_plugin.c b/src/decoder/flac_plugin.c
index 7b9fce27d..7b9fce27d 100644
--- a/src/inputPlugins/flac_plugin.c
+++ b/src/decoder/flac_plugin.c
diff --git a/src/inputPlugins/mod_plugin.c b/src/decoder/mod_plugin.c
index 5916a24ab..5916a24ab 100644
--- a/src/inputPlugins/mod_plugin.c
+++ b/src/decoder/mod_plugin.c
diff --git a/src/inputPlugins/mp3_plugin.c b/src/decoder/mp3_plugin.c
index a0de30ba7..a0de30ba7 100644
--- a/src/inputPlugins/mp3_plugin.c
+++ b/src/decoder/mp3_plugin.c
diff --git a/src/inputPlugins/mp4_plugin.c b/src/decoder/mp4_plugin.c
index 4a613744e..4a613744e 100644
--- a/src/inputPlugins/mp4_plugin.c
+++ b/src/decoder/mp4_plugin.c
diff --git a/src/inputPlugins/mpc_plugin.c b/src/decoder/mpc_plugin.c
index fb1b0b56c..fb1b0b56c 100644
--- a/src/inputPlugins/mpc_plugin.c
+++ b/src/decoder/mpc_plugin.c
diff --git a/src/inputPlugins/oggflac_plugin.c b/src/decoder/oggflac_plugin.c
index 091b00988..091b00988 100644
--- a/src/inputPlugins/oggflac_plugin.c
+++ b/src/decoder/oggflac_plugin.c
diff --git a/src/inputPlugins/oggvorbis_plugin.c b/src/decoder/oggvorbis_plugin.c
index 0eecb783f..0eecb783f 100644
--- a/src/inputPlugins/oggvorbis_plugin.c
+++ b/src/decoder/oggvorbis_plugin.c
diff --git a/src/inputPlugins/wavpack_plugin.c b/src/decoder/wavpack_plugin.c
index 14b7e5f69..14b7e5f69 100644
--- a/src/inputPlugins/wavpack_plugin.c
+++ b/src/decoder/wavpack_plugin.c