aboutsummaryrefslogtreecommitdiffstats
path: root/src/audio.c
diff options
context:
space:
mode:
authorWarren Dukes <warren.dukes@gmail.com>2005-03-12 03:10:09 +0000
committerWarren Dukes <warren.dukes@gmail.com>2005-03-12 03:10:09 +0000
commit8583a3bc4e9af2a1be06c82422a7cac1470341ce (patch)
tree4befe14e73239f6bcabc6046499bd0e4a99ebe88 /src/audio.c
parent18651935754dbf8972cd8188c2ec5b05ded60299 (diff)
downloadmpd-8583a3bc4e9af2a1be06c82422a7cac1470341ce.tar.gz
mpd-8583a3bc4e9af2a1be06c82422a7cac1470341ce.tar.xz
mpd-8583a3bc4e9af2a1be06c82422a7cac1470341ce.zip
if no audioOutput specified, we no attempt to detect if there exists a usable oss or alsa device
git-svn-id: https://svn.musicpd.org/mpd/trunk@3057 09075e82-0dd4-0310-85a5-a0d7c8717e4f
Diffstat (limited to '')
-rw-r--r--src/audio.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/audio.c b/src/audio.c
index 728f93718..c3b87fa5b 100644
--- a/src/audio.c
+++ b/src/audio.c
@@ -79,7 +79,9 @@ void initAudioDriver() {
myAudioDevicesEnabled[i] = 1;
}
- while((param = getNextConfigParam(CONF_AUDIO_OUTPUT, param))) {
+ param = getNextConfigParam(CONF_AUDIO_OUTPUT, param);
+
+ do {
if(audioOutputArraySize == AUDIO_MAX_DEVICES) {
ERROR("only up to 255 audio output devices are "
"supported");
@@ -93,12 +95,12 @@ void initAudioDriver() {
audioOutputArray[i] = newAudioOutput(param);
- if(!audioOutputArray[i]) {
+ if(!audioOutputArray[i] && param) {
ERROR("problems configuring output device defined at "
"line %i\n", param->line);
exit(EXIT_FAILURE);
}
- }
+ } while((param = getNextConfigParam(CONF_AUDIO_OUTPUT, param)));
}
void getOutputAudioFormat(AudioFormat * inAudioFormat,