diff options
| author | Warren Dukes <warren.dukes@gmail.com> | 2004-11-02 12:46:52 +0000 |
|---|---|---|
| committer | Warren Dukes <warren.dukes@gmail.com> | 2004-11-02 12:46:52 +0000 |
| commit | 0adfd8ae76cb669cde111b87ada8481aa9354e6e (patch) | |
| tree | b5c6830df92d8525621942440dce73e8bf75b461 | |
| parent | ebc4418e01a4c2292462b79283219d1652174d9f (diff) | |
| download | mpd-0adfd8ae76cb669cde111b87ada8481aa9354e6e.tar.gz mpd-0adfd8ae76cb669cde111b87ada8481aa9354e6e.tar.xz mpd-0adfd8ae76cb669cde111b87ada8481aa9354e6e.zip | |
move audioOutput plugins to audioOutput directory
git-svn-id: https://svn.musicpd.org/mpd/trunk@2470 09075e82-0dd4-0310-85a5-a0d7c8717e4f
| -rw-r--r-- | src/Makefile.am | 9 | ||||
| -rw-r--r-- | src/audioOutput.h | 2 | ||||
| -rw-r--r-- | src/audioOutput/audioOutput_ao.c (renamed from src/audioOutput_ao.c) | 8 | ||||
| -rw-r--r-- | src/audioOutput/audioOutput_oss.c (renamed from src/audioOutput_oss.c) | 9 | ||||
| -rw-r--r-- | src/audioOutput/audioOutput_shout.c (renamed from src/audioOutput_shout.c) | 15 |
5 files changed, 20 insertions, 23 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 2fced704c..b8cb508a8 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,6 +1,11 @@ bin_PROGRAMS = mpd SUBDIRS = $(ID3_SUBDIR) $(MAD_SUBDIR) $(MP4FF_SUBDIR) +mpd_audioOutput = \ + audioOutput/audioOutput_ao.c \ + audioOutput/audioOutput_oss.c \ + audioOutput/audioOutput_shout.c + mpd_inputPlugins = \ inputPlugins/aac_plugin.c \ inputPlugins/audiofile_plugin.c \ @@ -54,12 +59,10 @@ mpd_headers = \ mpd_SOURCES = \ $(mpd_headers) \ + $(mpd_audioOutput) \ $(mpd_inputPlugins) \ audio.c \ audioOutput.c \ - audioOutput_ao.c \ - audioOutput_oss.c \ - audioOutput_shout.c \ buffer2array.c \ charConv.c \ command.c \ diff --git a/src/audioOutput.h b/src/audioOutput.h index 49c7110f9..ce1a2949e 100644 --- a/src/audioOutput.h +++ b/src/audioOutput.h @@ -26,8 +26,6 @@ #include "tag.h" #include "conf.h" -#define AUDIO_AO_DRIVER_DEFAULT "default" - typedef struct _AudioOutput AudioOutput; typedef int (* AudioOutputInitDriverFunc) (AudioOutput * audioOutput, diff --git a/src/audioOutput_ao.c b/src/audioOutput/audioOutput_ao.c index e328c1bb4..366c42c1d 100644 --- a/src/audioOutput_ao.c +++ b/src/audioOutput/audioOutput_ao.c @@ -16,10 +16,10 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "audioOutput.h" -#include "conf.h" -#include "log.h" -#include "sig_handlers.h" +#include "../audioOutput.h" +#include "../conf.h" +#include "../log.h" +#include "../sig_handlers.h" #include <string.h> #include <assert.h> diff --git a/src/audioOutput_oss.c b/src/audioOutput/audioOutput_oss.c index c677c90d2..c8e86b7a4 100644 --- a/src/audioOutput_oss.c +++ b/src/audioOutput/audioOutput_oss.c @@ -18,16 +18,15 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "../config.h" -#include "audioOutput.h" +#include "../audioOutput.h" #include <stdlib.h> #ifdef HAVE_OSS -#include "conf.h" -#include "log.h" -#include "sig_handlers.h" +#include "../conf.h" +#include "../log.h" +#include "../sig_handlers.h" #include <string.h> #include <assert.h> diff --git a/src/audioOutput_shout.c b/src/audioOutput/audioOutput_shout.c index 7ffdbb31b..8b8e789fb 100644 --- a/src/audioOutput_shout.c +++ b/src/audioOutput/audioOutput_shout.c @@ -16,18 +16,17 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "../config.h" +#include "../audioOutput.h" -#include "audioOutput.h" +#include <stdlib.h> #ifdef HAVE_SHOUT -#include "conf.h" -#include "log.h" -#include "sig_handlers.h" -#include "pcm_utils.h" +#include "../conf.h" +#include "../log.h" +#include "../sig_handlers.h" +#include "../pcm_utils.h" -#include <stdlib.h> #include <string.h> #include <assert.h> #include <signal.h> @@ -568,8 +567,6 @@ AudioOutputPlugin shoutPlugin = #else -#include <stdlib.h> - AudioOutputPlugin shoutPlugin = { NULL, |