diff options
| author | Warren Dukes <warren.dukes@gmail.com> | 2004-10-29 16:12:36 +0000 |
|---|---|---|
| committer | Warren Dukes <warren.dukes@gmail.com> | 2004-10-29 16:12:36 +0000 |
| commit | 6aa27a3dd4c271a66e1f9d8a6ec1d95f092c224d (patch) | |
| tree | 0c35bea4dce1546329cf9d3062f53e8dfec04f2f /src/audio.c | |
| parent | 65a956db17d1bb31412234a4a96c0b1c50b3c09c (diff) | |
| download | mpd-6aa27a3dd4c271a66e1f9d8a6ec1d95f092c224d.tar.gz mpd-6aa27a3dd4c271a66e1f9d8a6ec1d95f092c224d.tar.xz mpd-6aa27a3dd4c271a66e1f9d8a6ec1d95f092c224d.zip | |
sync w/ trunk
git-svn-id: https://svn.musicpd.org/mpd/branches/shank-rewrite-config@2398 09075e82-0dd4-0310-85a5-a0d7c8717e4f
Diffstat (limited to 'src/audio.c')
| -rw-r--r-- | src/audio.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/audio.c b/src/audio.c index e3a311abb..9df190dd5 100644 --- a/src/audio.c +++ b/src/audio.c @@ -175,7 +175,7 @@ void finishAudioDriver() { } int isCurrentAudioFormat(AudioFormat * audioFormat) { - if(!audioFormat) return 0; + if(!audioFormat) return 1; if(memcmp(audioFormat,&audio_format,sizeof(AudioFormat)) != 0) return 0; @@ -195,12 +195,9 @@ int openAudioDevice(AudioFormat * audioFormat) { for(i = 0; i < audioOutputArraySize; i++) { if(!audioOutputArray[i]->open || !isCurrentFormat) { - if(0 == openAudioOutput(audioOutputArray[i], - &audio_format)) - { - ret = 0; - } + openAudioOutput(audioOutputArray[i], &audio_format); } + if(audioOutputArray[i]->open) ret = 0; } return ret; |