diff options
| author | Max Kellermann <max@duempel.org> | 2015-10-27 11:05:47 +0100 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2015-10-27 11:05:47 +0100 |
| commit | 94f850a5885c89e5255948f9274aaaa4197bc52b (patch) | |
| tree | 5348c92cb0ed9a3dc409be922abac07eee4438de /src/output | |
| parent | 3882c114505ea39e3707f27d91eb8ef363a8895b (diff) | |
| parent | db9997a1068e00c5f78d4bb9834ce5a13e7b7a3b (diff) | |
| download | mpd-94f850a5885c89e5255948f9274aaaa4197bc52b.tar.gz mpd-94f850a5885c89e5255948f9274aaaa4197bc52b.tar.xz mpd-94f850a5885c89e5255948f9274aaaa4197bc52b.zip | |
Merge tag 'v0.19.11'
Diffstat (limited to 'src/output')
| -rw-r--r-- | src/output/OutputCommand.cxx | 8 | ||||
| -rw-r--r-- | src/output/plugins/PipeOutputPlugin.cxx | 1 |
2 files changed, 8 insertions, 1 deletions
diff --git a/src/output/OutputCommand.cxx b/src/output/OutputCommand.cxx index 83abcf2ca..dc7a540a2 100644 --- a/src/output/OutputCommand.cxx +++ b/src/output/OutputCommand.cxx @@ -30,6 +30,7 @@ #include "Internal.hxx" #include "player/Control.hxx" #include "mixer/MixerControl.hxx" +#include "mixer/Volume.hxx" #include "Idle.hxx" extern unsigned audio_output_state_version; @@ -47,6 +48,11 @@ audio_output_enable_index(MultipleOutputs &outputs, unsigned idx) ao.enabled = true; idle_add(IDLE_OUTPUT); + if (ao.mixer != nullptr) { + InvalidateHardwareVolume(); + idle_add(IDLE_MIXER); + } + ao.player_control->UpdateAudio(); ++audio_output_state_version; @@ -70,6 +76,7 @@ audio_output_disable_index(MultipleOutputs &outputs, unsigned idx) Mixer *mixer = ao.mixer; if (mixer != nullptr) { mixer_close(mixer); + InvalidateHardwareVolume(); idle_add(IDLE_MIXER); } @@ -94,6 +101,7 @@ audio_output_toggle_index(MultipleOutputs &outputs, unsigned idx) Mixer *mixer = ao.mixer; if (mixer != nullptr) { mixer_close(mixer); + InvalidateHardwareVolume(); idle_add(IDLE_MIXER); } } diff --git a/src/output/plugins/PipeOutputPlugin.cxx b/src/output/plugins/PipeOutputPlugin.cxx index a18890804..c70e2d498 100644 --- a/src/output/plugins/PipeOutputPlugin.cxx +++ b/src/output/plugins/PipeOutputPlugin.cxx @@ -51,7 +51,6 @@ public: } size_t Play(const void *chunk, size_t size, Error &error); - }; inline bool |