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

mixer/alsa: move code to NormalizedToPercent()

Browse Source
This commit is contained in:
Max Kellermann
2021-08-06 17:55:23 +02:00
parent ad6e303047
commit 5f5b5f63af
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/mixer/plugins/AlsaMixerPlugin.cxx
View File

@@ -97,6 +97,11 @@ public:
void SetVolume(unsigned volume) override; void SetVolume(unsigned volume) override;
private: private:
[[gnu::const]]
static unsigned NormalizedToPercent(double normalized) noexcept {
return lround(100 * normalized);
}
[[gnu::pure]] [[gnu::pure]]
double GetNormalizedVolume() const noexcept { double GetNormalizedVolume() const noexcept {
return get_normalized_playback_volume(elem, return get_normalized_playback_volume(elem,
@@ -280,7 +285,7 @@ AlsaMixer::GetVolume()
throw FormatRuntimeError("snd_mixer_handle_events() failed: %s", throw FormatRuntimeError("snd_mixer_handle_events() failed: %s",
snd_strerror(err)); snd_strerror(err));
return lround(100 * GetNormalizedVolume()); return NormalizedToPercent(GetNormalizedVolume());
} }
void void
@@ -289,7 +294,7 @@ AlsaMixer::SetVolume(unsigned volume)
assert(handle != nullptr); assert(handle != nullptr);
double cur = GetNormalizedVolume(); double cur = GetNormalizedVolume();
int delta = volume - lround(100.*cur); int delta = volume - NormalizedToPercent(cur);
int err = set_normalized_playback_volume(elem, cur + 0.01*delta, delta); int err = set_normalized_playback_volume(elem, cur + 0.01*delta, delta);
if (err < 0) if (err < 0)
throw FormatRuntimeError("failed to set ALSA volume: %s", throw FormatRuntimeError("failed to set ALSA volume: %s",