replace lrint with lround

lrint is a configurable version of lround that behaves either as round, floor, ceil, or trunc based on setting the proper FE_ macro using fset/getround. Given that it's not set at all and that it defaults to round behavior, simply replace with round. Also removed the util/Math defines. Signed-off-by: Rosen Penev <rosenp@gmail.com>

replace lrint with lround
4fd0c84f · Rosen Penev · Max Kellermann · e41a52d9 · 4fd0c84f · 4fd0c84f
Commit 4fd0c84f authored Mar 24, 2020 by Rosen Penev Committed by Max Kellermann Mar 25, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 5 deletions

AlsaMixerPlugin.cxx src/mixer/plugins/AlsaMixerPlugin.cxx +2 -2

Math.hxx src/util/Math.hxx +0 -3

No files found.
--- a/src/mixer/plugins/AlsaMixerPlugin.cxx
+++ b/src/mixer/plugins/AlsaMixerPlugin.cxx
@@ -273,7 +273,7 @@ AlsaMixer::GetVolume()
 		throw FormatRuntimeError("snd_mixer_handle_events() failed: %s",
 					 snd_strerror(err));

-	return lrint(100 * get_normalized_playback_volume(elem, SND_MIXER_SCHN_FRONT_LEFT));
+	return lround(100 * get_normalized_playback_volume(elem, SND_MIXER_SCHN_FRONT_LEFT));
 }

 void
@@ -282,7 +282,7 @@ AlsaMixer::SetVolume(unsigned volume)
 	assert(handle != nullptr);

 	double cur = get_normalized_playback_volume(elem, SND_MIXER_SCHN_FRONT_LEFT);
-	int delta = volume - lrint(100.*cur);
+	int delta = volume - lround(100.*cur);
 	int err = set_normalized_playback_volume(elem, cur + 0.01*delta, delta);
 	if (err < 0)
 		throw FormatRuntimeError("failed to set ALSA volume: %s",

--- a/src/util/Math.hxx
+++ b/src/util/Math.hxx
@@ -32,12 +32,9 @@

 #ifdef __UCLIBC__
 #include <boost/math/special_functions/round.hpp>
-using boost::math::iround;
 using boost::math::lround;
-#define lrint iround
 #else
 #include <cmath>
-using std::lrint;
 using std::lround;
 #endif