aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2008-10-13 14:31:18 +0200
committerMax Kellermann <max@duempel.org>2008-10-13 14:31:18 +0200
commit07c9b62764c2704380338dd26db7dc4d9b67dc2e (patch)
treeda5077981c4ccfc16255f9f96a24092013cbbf63
parent5ea2e198f95d82df3f30dd1b702d0c1a97b26462 (diff)
downloadmpd-07c9b62764c2704380338dd26db7dc4d9b67dc2e.tar.gz
mpd-07c9b62764c2704380338dd26db7dc4d9b67dc2e.tar.xz
mpd-07c9b62764c2704380338dd26db7dc4d9b67dc2e.zip
audio: don't clear input_audio_format on openAudioDevice(NULL)
Commit 80a2c937 broke resume after pause: it cleared the input_audio_format when it attempted to simplify a complicated expression. Don't clear it, just assign input_audio_format if a new format was specified.
-rw-r--r--src/audio.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/audio.c b/src/audio.c
index f97943400..ce62df46d 100644
--- a/src/audio.c
+++ b/src/audio.c
@@ -301,9 +301,7 @@ int openAudioDevice(const struct audio_format *audioFormat)
if (!audioOutputArray)
return -1;
- if (audioFormat == NULL)
- audio_format_clear(&input_audio_format);
- else
+ if (audioFormat != NULL)
input_audio_format = *audioFormat;
syncAudioDeviceStates();