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

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

Browse Source 
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)

8
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,6 +673,7 @@ PipeWireOutput::ParamChanged([[maybe_unused]] uint32_t id,
if (restore_volume) { if (restore_volume) {
restore_volume = false; restore_volume = false;
if (volume >= 0) {
try { try {
::SetVolume(*stream, channels, volume); ::SetVolume(*stream, channels, volume);
} catch (...) { } catch (...) {
@ -677,6 +682,7 @@ PipeWireOutput::ParamChanged([[maybe_unused]] uint32_t id,
std::current_exception()); std::current_exception());
} }
} }
}
#if defined(ENABLE_DSD) && defined(SPA_AUDIO_DSD_FLAG_NONE) #if defined(ENABLE_DSD) && defined(SPA_AUDIO_DSD_FLAG_NONE)
if (use_dsd && id == SPA_PARAM_Format && param != nullptr) if (use_dsd && id == SPA_PARAM_Format && param != nullptr)