diff options
| author | Max Kellermann <max@duempel.org> | 2009-10-29 15:59:35 +0100 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2009-10-29 15:59:35 +0100 |
| commit | f74ee1a352a0fb39fd0a0b42ab740f2f6e6957a3 (patch) | |
| tree | 423c8c8eb0cf1c97d36fb7993a14173ff3872d17 | |
| parent | cf8d278b78d7deed1d23fc1c7cfc6bce4e189a41 (diff) | |
| download | mpd-f74ee1a352a0fb39fd0a0b42ab740f2f6e6957a3.tar.gz mpd-f74ee1a352a0fb39fd0a0b42ab740f2f6e6957a3.tar.xz mpd-f74ee1a352a0fb39fd0a0b42ab740f2f6e6957a3.zip | |
output/alsa: don't recover on CANCEL
The recovery is for nothing if we get CLOSE afterwards. Let's not
recover in the cancel() method, and let the next play() call sort it
out.
| -rw-r--r-- | NEWS | 1 | ||||
| -rw-r--r-- | src/output/alsa_plugin.c | 2 |
2 files changed, 2 insertions, 1 deletions
@@ -35,6 +35,7 @@ ver 0.16 (20??/??/??) - jack: don't disconnect during pause - jack: connect to server on MPD startup - wildcards allowed in audio_format configuration + - alsa: don't recover on CANCEL * mixers: - removed support for legacy mixer configuration - reimplemented software volume as mixer+filter plugin diff --git a/src/output/alsa_plugin.c b/src/output/alsa_plugin.c index 6ec1f77f2..89ed6058e 100644 --- a/src/output/alsa_plugin.c +++ b/src/output/alsa_plugin.c @@ -500,7 +500,7 @@ alsa_cancel(void *data) { struct alsa_data *ad = data; - alsa_recover(ad, snd_pcm_drop(ad->pcm)); + snd_pcm_drop(ad->pcm); } static void |