diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2013-08-07 08:40:21 -0400 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2013-08-07 08:40:21 -0400 |
commit | 5e19f0a1ae294ffe8370904f7a27e1203e4ba792 (patch) | |
tree | 1c2f7aadf3a35451f8f182e11b66dbd99d67c951 /libs/ardour/meter.cc | |
parent | 7169c77cfc5a45ec29dcb58a251feccba5ac6b62 (diff) |
use std::numeric_limits<float>::infinity() rather than INFINITY to try to get compilers to agree on the type
Diffstat (limited to 'libs/ardour/meter.cc')
-rw-r--r-- | libs/ardour/meter.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/libs/ardour/meter.cc b/libs/ardour/meter.cc index 54cad1a956..6c5470bbb9 100644 --- a/libs/ardour/meter.cc +++ b/libs/ardour/meter.cc @@ -18,6 +18,7 @@ #include <algorithm> #include <cmath> +#include <limits> #include "pbd/compose.h" @@ -149,7 +150,7 @@ void PeakMeter::reset_max () { for (size_t i = 0; i < _max_peak_power.size(); ++i) { - _max_peak_power[i] = -INFINITY; + _max_peak_power[i] = -std::numeric_limits<float>::infinity(); _max_peak_signal[i] = 0; } @@ -159,7 +160,7 @@ PeakMeter::reset_max () if (n < n_midi) { _visible_peak_power[n] = 0; } else { - _visible_peak_power[n] = -INFINITY; + _visible_peak_power[n] = -std::numeric_limits<float>::infinity(); } } } @@ -298,7 +299,7 @@ PeakMeter::meter () _peak_signal[n] = 0; /* ... to here */ if (n < n_midi) { - _max_peak_power[n] = -INFINITY; // std::max (new_peak, _max_peak_power[n]); // XXX + _max_peak_power[n] = -std::numeric_limits<float>::infinity(); // std::max (new_peak, _max_peak_power[n]); // XXX _max_peak_signal[n] = 0; if (midi_meter_falloff == 0.0f || new_peak > _visible_peak_power[n]) { ; @@ -332,7 +333,7 @@ PeakMeter::meter () } else { // do falloff new_peak = _visible_peak_power[n] - (audio_meter_falloff); - _visible_peak_power[n] = std::max ((double)new_peak, -INFINITY); + _visible_peak_power[n] = std::max (new_peak, -std::numeric_limits<float>::infinity()); } } } |