oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

move audioOutput plugins to audioOutput directory

Browse Source 
git-svn-id: https://svn.musicpd.org/mpd/trunk@2470 09075e82-0dd4-0310-85a5-a0d7c8717e4f
This commit is contained in:
Warren Dukes 2004-11-02 12:46:52 +00:00
parent ebc4418e01
commit 0adfd8ae76
5 changed files with 20 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/Makefile.am
View File

@ -1,6 +1,11 @@
bin_PROGRAMS = mpd bin_PROGRAMS = mpd
SUBDIRS = $(ID3_SUBDIR) $(MAD_SUBDIR) $(MP4FF_SUBDIR) SUBDIRS = $(ID3_SUBDIR) $(MAD_SUBDIR) $(MP4FF_SUBDIR)
mpd_audioOutput = \
audioOutput/audioOutput_ao.c \
audioOutput/audioOutput_oss.c \
audioOutput/audioOutput_shout.c
mpd_inputPlugins = \ mpd_inputPlugins = \
inputPlugins/aac_plugin.c \ inputPlugins/aac_plugin.c \
inputPlugins/audiofile_plugin.c \ inputPlugins/audiofile_plugin.c \
@ -54,12 +59,10 @@ mpd_headers = \
mpd_SOURCES = \ mpd_SOURCES = \
$(mpd_headers) \ $(mpd_headers) \
$(mpd_audioOutput) \
$(mpd_inputPlugins) \ $(mpd_inputPlugins) \
audio.c \ audio.c \
audioOutput.c \ audioOutput.c \
audioOutput_ao.c \
audioOutput_oss.c \
audioOutput_shout.c \
buffer2array.c \ buffer2array.c \
charConv.c \ charConv.c \
command.c \ command.c \

2
src/audioOutput.h
View File

@ -26,8 +26,6 @@
#include "tag.h" #include "tag.h"
#include "conf.h" #include "conf.h"
#define AUDIO_AO_DRIVER_DEFAULT "default"
typedef struct _AudioOutput AudioOutput; typedef struct _AudioOutput AudioOutput;
typedef int (* AudioOutputInitDriverFunc) (AudioOutput * audioOutput, typedef int (* AudioOutputInitDriverFunc) (AudioOutput * audioOutput,

8
src/audioOutput_ao.c → src/audioOutput/audioOutput_ao.c
View File

@ -16,10 +16,10 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
#include "audioOutput.h" #include "../audioOutput.h"
#include "conf.h" #include "../conf.h"
#include "log.h" #include "../log.h"
#include "sig_handlers.h" #include "../sig_handlers.h"
#include <string.h> #include <string.h>
#include <assert.h> #include <assert.h>

9
src/audioOutput_oss.c → src/audioOutput/audioOutput_oss.c
View File

@ -18,16 +18,15 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
#include "../config.h" #include "../audioOutput.h"
#include "audioOutput.h"
#include <stdlib.h> #include <stdlib.h>
#ifdef HAVE_OSS #ifdef HAVE_OSS
#include "conf.h" #include "../conf.h"
#include "log.h" #include "../log.h"
#include "sig_handlers.h" #include "../sig_handlers.h"
#include <string.h> #include <string.h>
#include <assert.h> #include <assert.h>

15
src/audioOutput_shout.c → src/audioOutput/audioOutput_shout.c
View File

@ -16,18 +16,17 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * 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 #ifdef HAVE_SHOUT
#include "conf.h" #include "../conf.h"
#include "log.h" #include "../log.h"
#include "sig_handlers.h" #include "../sig_handlers.h"
#include "pcm_utils.h" #include "../pcm_utils.h"
#include <stdlib.h>
#include <string.h> #include <string.h>
#include <assert.h> #include <assert.h>
#include <signal.h> #include <signal.h>
@ -568,8 +567,6 @@ AudioOutputPlugin shoutPlugin =
#else #else
#include <stdlib.h>
AudioOutputPlugin shoutPlugin = AudioOutputPlugin shoutPlugin =
{ {
NULL, NULL,