Skip to content

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

mixer/alsa: move code to NormalizedToPercent()

parent ad6e3030
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 2 deletions
src/mixer/plugins/AlsaMixerPlugin.cxx
View file @ 5f5b5f63
...@@ -97,6 +97,11 @@ public: ...@@ -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() ...@@ -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) ...@@ -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",
......
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