aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/Makefile.am30
-rw-r--r--src/output/alsa_plugin.c (renamed from src/audioOutputs/audioOutput_alsa.c)0
-rw-r--r--src/output/ao_plugin.c (renamed from src/audioOutputs/audioOutput_ao.c)0
-rw-r--r--src/output/fifo_plugin.c (renamed from src/audioOutputs/audioOutput_fifo.c)0
-rw-r--r--src/output/jack_plugin.c (renamed from src/audioOutputs/audioOutput_jack.c)0
-rw-r--r--src/output/mvp_plugin.c (renamed from src/audioOutputs/audioOutput_mvp.c)0
-rw-r--r--src/output/null_plugin.c (renamed from src/audioOutputs/audioOutput_null.c)0
-rw-r--r--src/output/oss_plugin.c (renamed from src/audioOutputs/audioOutput_oss.c)0
-rw-r--r--src/output/osx_plugin.c (renamed from src/audioOutputs/audioOutput_osx.c)0
-rw-r--r--src/output/pulse_plugin.c (renamed from src/audioOutputs/audioOutput_pulse.c)0
-rw-r--r--src/output/shout_mp3.c (renamed from src/audioOutputs/audioOutput_shout_mp3.c)3
-rw-r--r--src/output/shout_ogg.c (renamed from src/audioOutputs/audioOutput_shout_ogg.c)2
-rw-r--r--src/output/shout_plugin.c (renamed from src/audioOutputs/audioOutput_shout.c)2
-rw-r--r--src/output/shout_plugin.h (renamed from src/audioOutputs/audioOutput_shout.h)0
14 files changed, 18 insertions, 19 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index 5438c0abf..7e2386dc8 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,18 +1,18 @@
bin_PROGRAMS = mpd
-mpd_audioOutputs = \
- audioOutputs/audioOutput_shout.c \
- audioOutputs/audioOutput_shout_ogg.c \
- audioOutputs/audioOutput_shout_mp3.c \
- audioOutputs/audioOutput_null.c \
- audioOutputs/audioOutput_fifo.c \
- audioOutputs/audioOutput_alsa.c \
- audioOutputs/audioOutput_ao.c \
- audioOutputs/audioOutput_oss.c \
- audioOutputs/audioOutput_osx.c \
- audioOutputs/audioOutput_pulse.c \
- audioOutputs/audioOutput_mvp.c \
- audioOutputs/audioOutput_jack.c
+mpd_output = \
+ output/shout_plugin.c \
+ output/shout_ogg.c \
+ output/shout_mp3.c \
+ output/null_plugin.c \
+ output/fifo_plugin.c \
+ output/alsa_plugin.c \
+ output/ao_plugin.c \
+ output/oss_plugin.c \
+ output/osx_plugin.c \
+ output/pulse_plugin.c \
+ output/mvp_plugin.c \
+ output/jack_plugin.c
mpd_headers = \
notify.h \
@@ -25,7 +25,7 @@ mpd_headers = \
output_list.h \
output_thread.h \
output_control.h \
- audioOutputs/audioOutput_shout.h \
+ output/shout_plugin.h \
buffer2array.h \
command.h \
idle.h \
@@ -104,7 +104,7 @@ mpd_headers = \
mpd_SOURCES = \
$(mpd_headers) \
- $(mpd_audioOutputs) \
+ $(mpd_output) \
notify.c \
audio.c \
audioOutput.c \
diff --git a/src/audioOutputs/audioOutput_alsa.c b/src/output/alsa_plugin.c
index 1845f1b76..1845f1b76 100644
--- a/src/audioOutputs/audioOutput_alsa.c
+++ b/src/output/alsa_plugin.c
diff --git a/src/audioOutputs/audioOutput_ao.c b/src/output/ao_plugin.c
index e731f972a..e731f972a 100644
--- a/src/audioOutputs/audioOutput_ao.c
+++ b/src/output/ao_plugin.c
diff --git a/src/audioOutputs/audioOutput_fifo.c b/src/output/fifo_plugin.c
index d7eb91ff6..d7eb91ff6 100644
--- a/src/audioOutputs/audioOutput_fifo.c
+++ b/src/output/fifo_plugin.c
diff --git a/src/audioOutputs/audioOutput_jack.c b/src/output/jack_plugin.c
index 6f2bcd3a1..6f2bcd3a1 100644
--- a/src/audioOutputs/audioOutput_jack.c
+++ b/src/output/jack_plugin.c
diff --git a/src/audioOutputs/audioOutput_mvp.c b/src/output/mvp_plugin.c
index 70dd25f9d..70dd25f9d 100644
--- a/src/audioOutputs/audioOutput_mvp.c
+++ b/src/output/mvp_plugin.c
diff --git a/src/audioOutputs/audioOutput_null.c b/src/output/null_plugin.c
index ff3a9833c..ff3a9833c 100644
--- a/src/audioOutputs/audioOutput_null.c
+++ b/src/output/null_plugin.c
diff --git a/src/audioOutputs/audioOutput_oss.c b/src/output/oss_plugin.c
index 67ea11fe4..67ea11fe4 100644
--- a/src/audioOutputs/audioOutput_oss.c
+++ b/src/output/oss_plugin.c
diff --git a/src/audioOutputs/audioOutput_osx.c b/src/output/osx_plugin.c
index 65060cc8c..65060cc8c 100644
--- a/src/audioOutputs/audioOutput_osx.c
+++ b/src/output/osx_plugin.c
diff --git a/src/audioOutputs/audioOutput_pulse.c b/src/output/pulse_plugin.c
index b1ce3d049..b1ce3d049 100644
--- a/src/audioOutputs/audioOutput_pulse.c
+++ b/src/output/pulse_plugin.c
diff --git a/src/audioOutputs/audioOutput_shout_mp3.c b/src/output/shout_mp3.c
index 722079b29..e57b0c385 100644
--- a/src/audioOutputs/audioOutput_shout_mp3.c
+++ b/src/output/shout_mp3.c
@@ -16,12 +16,11 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "../output_api.h"
+#include "shout_plugin.h"
#ifdef HAVE_SHOUT_MP3
#include "../utils.h"
-#include "audioOutput_shout.h"
#include <lame/lame.h>
struct lame_data {
diff --git a/src/audioOutputs/audioOutput_shout_ogg.c b/src/output/shout_ogg.c
index 5983b4d89..248ffd1e8 100644
--- a/src/audioOutputs/audioOutput_shout_ogg.c
+++ b/src/output/shout_ogg.c
@@ -16,7 +16,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "audioOutput_shout.h"
+#include "shout_plugin.h"
#ifdef HAVE_SHOUT_OGG
diff --git a/src/audioOutputs/audioOutput_shout.c b/src/output/shout_plugin.c
index ae31b07ea..dd909bdae 100644
--- a/src/audioOutputs/audioOutput_shout.c
+++ b/src/output/shout_plugin.c
@@ -16,7 +16,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "audioOutput_shout.h"
+#include "shout_plugin.h"
#ifdef HAVE_SHOUT
diff --git a/src/audioOutputs/audioOutput_shout.h b/src/output/shout_plugin.h
index 2cfe68f29..2cfe68f29 100644
--- a/src/audioOutputs/audioOutput_shout.h
+++ b/src/output/shout_plugin.h