oysteikt
/
mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

output/PipeWire: don't force initial volume=100% 

Closes https://github.com/MusicPlayerDaemon/MPD/issues/1484
This commit is contained in:
Max Kellermann 2022-07-08 18:17:33 +02:00
parent e807ed5870
commit 02b00f9146
2 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
NEWS
View File

@ -10,6 +10,7 @@ ver 0.23.8 (not yet released)
- alsa: fix setting volume before playback starts - alsa: fix setting volume before playback starts
- pipewire: fix crash bug - pipewire: fix crash bug
- pipewire: fix volume change events with PipeWire 0.3.53 - pipewire: fix volume change events with PipeWire 0.3.53
- pipewire: don't force initial volume=100%
* support libfmt 9 * support libfmt 9
ver 0.23.7 (2022/05/09) ver 0.23.7 (2022/05/09)

20
src/output/plugins/PipeWireOutputPlugin.cxx
View File

@ -89,8 +89,12 @@ class PipeWireOutput final : AudioOutput {
/** /**
* The current volume level (0.0 .. 1.0). * The current volume level (0.0 .. 1.0).
*
* This get initialized to -1 which means "unknown", so
* restore_volume will not attempt to override PipeWire's
* initial volume level.
*/ */
float volume = 1.0f; float volume = -1;
PipeWireMixer *mixer = nullptr; PipeWireMixer *mixer = nullptr;
unsigned channels; unsigned channels;
@ -669,12 +673,14 @@ PipeWireOutput::ParamChanged([[maybe_unused]] uint32_t id,
if (restore_volume) { if (restore_volume) {
restore_volume = false; restore_volume = false;
try { if (volume >= 0) {
::SetVolume(*stream, channels, volume); try {
} catch (...) { ::SetVolume(*stream, channels, volume);
FmtError(pipewire_output_domain, } catch (...) {
FMT_STRING("Failed to restore volume: {}"), FmtError(pipewire_output_domain,
std::current_exception()); FMT_STRING("Failed to restore volume: {}"),
std::current_exception());
}
} }
} }