From ece8c1347caae044db0fc4565ed3db6028d7b90e Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Sun, 26 Oct 2008 11:29:44 +0100 Subject: [PATCH] renamed src/audioOutputs/ to src/output/ Again, no CamelCase in the directory name. --- src/Makefile.am | 30 +++++++++---------- .../alsa_plugin.c} | 0 .../audioOutput_ao.c => output/ao_plugin.c} | 0 .../fifo_plugin.c} | 0 .../jack_plugin.c} | 0 .../audioOutput_mvp.c => output/mvp_plugin.c} | 0 .../null_plugin.c} | 0 .../audioOutput_oss.c => output/oss_plugin.c} | 0 .../audioOutput_osx.c => output/osx_plugin.c} | 0 .../pulse_plugin.c} | 0 .../shout_mp3.c} | 3 +- .../shout_ogg.c} | 2 +- .../shout_plugin.c} | 2 +- .../shout_plugin.h} | 0 14 files changed, 18 insertions(+), 19 deletions(-) rename src/{audioOutputs/audioOutput_alsa.c => output/alsa_plugin.c} (100%) rename src/{audioOutputs/audioOutput_ao.c => output/ao_plugin.c} (100%) rename src/{audioOutputs/audioOutput_fifo.c => output/fifo_plugin.c} (100%) rename src/{audioOutputs/audioOutput_jack.c => output/jack_plugin.c} (100%) rename src/{audioOutputs/audioOutput_mvp.c => output/mvp_plugin.c} (100%) rename src/{audioOutputs/audioOutput_null.c => output/null_plugin.c} (100%) rename src/{audioOutputs/audioOutput_oss.c => output/oss_plugin.c} (100%) rename src/{audioOutputs/audioOutput_osx.c => output/osx_plugin.c} (100%) rename src/{audioOutputs/audioOutput_pulse.c => output/pulse_plugin.c} (100%) rename src/{audioOutputs/audioOutput_shout_mp3.c => output/shout_mp3.c} (98%) rename src/{audioOutputs/audioOutput_shout_ogg.c => output/shout_ogg.c} (99%) rename src/{audioOutputs/audioOutput_shout.c => output/shout_plugin.c} (99%) rename src/{audioOutputs/audioOutput_shout.h => output/shout_plugin.h} (100%) 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 similarity index 100% rename from src/audioOutputs/audioOutput_alsa.c rename to src/output/alsa_plugin.c diff --git a/src/audioOutputs/audioOutput_ao.c b/src/output/ao_plugin.c similarity index 100% rename from src/audioOutputs/audioOutput_ao.c rename to src/output/ao_plugin.c diff --git a/src/audioOutputs/audioOutput_fifo.c b/src/output/fifo_plugin.c similarity index 100% rename from src/audioOutputs/audioOutput_fifo.c rename to src/output/fifo_plugin.c diff --git a/src/audioOutputs/audioOutput_jack.c b/src/output/jack_plugin.c similarity index 100% rename from src/audioOutputs/audioOutput_jack.c rename to src/output/jack_plugin.c diff --git a/src/audioOutputs/audioOutput_mvp.c b/src/output/mvp_plugin.c similarity index 100% rename from src/audioOutputs/audioOutput_mvp.c rename to src/output/mvp_plugin.c diff --git a/src/audioOutputs/audioOutput_null.c b/src/output/null_plugin.c similarity index 100% rename from src/audioOutputs/audioOutput_null.c rename to src/output/null_plugin.c diff --git a/src/audioOutputs/audioOutput_oss.c b/src/output/oss_plugin.c similarity index 100% rename from src/audioOutputs/audioOutput_oss.c rename to src/output/oss_plugin.c diff --git a/src/audioOutputs/audioOutput_osx.c b/src/output/osx_plugin.c similarity index 100% rename from src/audioOutputs/audioOutput_osx.c rename to src/output/osx_plugin.c diff --git a/src/audioOutputs/audioOutput_pulse.c b/src/output/pulse_plugin.c similarity index 100% rename from src/audioOutputs/audioOutput_pulse.c rename to src/output/pulse_plugin.c diff --git a/src/audioOutputs/audioOutput_shout_mp3.c b/src/output/shout_mp3.c similarity index 98% rename from src/audioOutputs/audioOutput_shout_mp3.c rename to 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 struct lame_data { diff --git a/src/audioOutputs/audioOutput_shout_ogg.c b/src/output/shout_ogg.c similarity index 99% rename from src/audioOutputs/audioOutput_shout_ogg.c rename to 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 similarity index 99% rename from src/audioOutputs/audioOutput_shout.c rename to 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 similarity index 100% rename from src/audioOutputs/audioOutput_shout.h rename to src/output/shout_plugin.h