diff options
| author | Warren Dukes <warren.dukes@gmail.com> | 2004-10-28 05:14:55 +0000 |
|---|---|---|
| committer | Warren Dukes <warren.dukes@gmail.com> | 2004-10-28 05:14:55 +0000 |
| commit | 58dbe4bb5d974c34335d6906a9ce930f07cd1db4 (patch) | |
| tree | 9a6aee08b21100cb74e809f0620d81466f6067df /src/audioOutput.h | |
| parent | 8f40569aeeafe4a36e3d719c1df97de42606ea76 (diff) | |
| download | mpd-58dbe4bb5d974c34335d6906a9ce930f07cd1db4.tar.gz mpd-58dbe4bb5d974c34335d6906a9ce930f07cd1db4.tar.xz mpd-58dbe4bb5d974c34335d6906a9ce930f07cd1db4.zip | |
merge shank-rewrite-config changes
git-svn-id: https://svn.musicpd.org/mpd/trunk@2375 09075e82-0dd4-0310-85a5-a0d7c8717e4f
Diffstat (limited to 'src/audioOutput.h')
| -rw-r--r-- | src/audioOutput.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/audioOutput.h b/src/audioOutput.h index ec43e9e7c..49c7110f9 100644 --- a/src/audioOutput.h +++ b/src/audioOutput.h @@ -24,12 +24,14 @@ #include "mpd_types.h" #include "audio.h" #include "tag.h" +#include "conf.h" #define AUDIO_AO_DRIVER_DEFAULT "default" typedef struct _AudioOutput AudioOutput; -typedef int (* AudioOutputInitDriverFunc) (AudioOutput * audioOutput); +typedef int (* AudioOutputInitDriverFunc) (AudioOutput * audioOutput, + ConfigParam * param); typedef void (* AudioOutputFinishDriverFunc) (AudioOutput * audioOutput); @@ -46,6 +48,8 @@ typedef void (* AudioOutputSendMetadataFunc) (AudioOutput * audioOutput, struct _AudioOutput { int open; + char * name; + char * type; AudioOutputFinishDriverFunc finishDriverFunc; AudioOutputOpenDeviceFunc openDeviceFunc; @@ -73,7 +77,7 @@ void finishAudioOutputPlugins(); void loadAudioOutputPlugin(AudioOutputPlugin * audioOutputPlugin); void unloadAudioOutputPlugin(AudioOutputPlugin * audioOutputPlugin); -AudioOutput * newAudioOutput(char * name); +AudioOutput * newAudioOutput(ConfigParam * param); int openAudioOutput(AudioOutput * audioOutput, AudioFormat * audioFormat); int playAudioOutput(AudioOutput * audioOutput, char * playChunk, int size); void closeAudioOutput(AudioOutput * audioOutput); |