Skip to content

M
mpd
Commit ac61d437 authored by Max Kellermann's avatar Max Kellermann
Browse files
Options

output/Command: flush the mixer cache when enabling/disabling output

Fixes mixer lag (http://bugs.musicpd.org/view.php?id=4425).
parent 1958f78c
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 0 deletions
NEWS
View file @ ac61d437
...@@ -5,6 +5,8 @@ ver 0.19.11 (not yet released) ...@@ -5,6 +5,8 @@ ver 0.19.11 (not yet released)
- ffmpeg: fix crash due to wrong avio_alloc_context() call - ffmpeg: fix crash due to wrong avio_alloc_context() call
* encoder * encoder
- flac: fix crash with 32 bit playback - flac: fix crash with 32 bit playback
* mixer
- fix mixer lag after enabling/disabling output
ver 0.19.10 (2015/06/21) ver 0.19.10 (2015/06/21)
* input * input
......
src/output/OutputCommand.cxx
View file @ ac61d437
...@@ -30,6 +30,7 @@ ...@@ -30,6 +30,7 @@
#include "Internal.hxx" #include "Internal.hxx"
#include "PlayerControl.hxx" #include "PlayerControl.hxx"
#include "mixer/MixerControl.hxx" #include "mixer/MixerControl.hxx"
#include "mixer/Volume.hxx"
#include "Idle.hxx" #include "Idle.hxx"
extern unsigned audio_output_state_version; extern unsigned audio_output_state_version;
...@@ -47,6 +48,11 @@ audio_output_enable_index(MultipleOutputs &outputs, unsigned idx) ...@@ -47,6 +48,11 @@ audio_output_enable_index(MultipleOutputs &outputs, unsigned idx)
ao.enabled = true; ao.enabled = true;
idle_add(IDLE_OUTPUT); idle_add(IDLE_OUTPUT);
if (ao.mixer != nullptr) {
InvalidateHardwareVolume();
idle_add(IDLE_MIXER);
}
ao.player_control->UpdateAudio(); ao.player_control->UpdateAudio();
++audio_output_state_version; ++audio_output_state_version;
...@@ -70,6 +76,7 @@ audio_output_disable_index(MultipleOutputs &outputs, unsigned idx) ...@@ -70,6 +76,7 @@ audio_output_disable_index(MultipleOutputs &outputs, unsigned idx)
Mixer *mixer = ao.mixer; Mixer *mixer = ao.mixer;
if (mixer != nullptr) { if (mixer != nullptr) {
mixer_close(mixer); mixer_close(mixer);
InvalidateHardwareVolume();
idle_add(IDLE_MIXER); idle_add(IDLE_MIXER);
} }
...@@ -94,6 +101,7 @@ audio_output_toggle_index(MultipleOutputs &outputs, unsigned idx) ...@@ -94,6 +101,7 @@ audio_output_toggle_index(MultipleOutputs &outputs, unsigned idx)
Mixer *mixer = ao.mixer; Mixer *mixer = ao.mixer;
if (mixer != nullptr) { if (mixer != nullptr) {
mixer_close(mixer); mixer_close(mixer);
InvalidateHardwareVolume();
idle_add(IDLE_MIXER); idle_add(IDLE_MIXER);
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment