Don't allow to deactivate meter.

[ardour.git] / libs / ardour / meter.cc

diff --git a/libs/ardour/meter.cc b/libs/ardour/meter.cc
index cc014caf630f6626be9ca8c0d9fa282830e151bf..26e865bec33f5397e506b803f629fb7db2c4ead7 100644 (file)
--- a/libs/ardour/meter.cc
+++ b/libs/ardour/meter.cc
@@ -43,6 +43,8 @@ PeakMeter::PeakMeter (Session& s, const std::string& name)
        Iec1ppmdsp::init(s.nominal_frame_rate());
        Iec2ppmdsp::init(s.nominal_frame_rate());
        Vumeterdsp::init(s.nominal_frame_rate());
+       _pending_active = true;
+       _active = true;
 }
 
 PeakMeter::~PeakMeter ()
@@ -186,20 +188,20 @@ PeakMeter::configure_io (ChanCount in, ChanCount out)
 void
 PeakMeter::reflect_inputs (const ChanCount& in)
 {
-       current_meters = in;
-
-       const size_t limit = min (_peak_signal.size(), (size_t) current_meters.n_total ());
-       const size_t n_midi  = min (_peak_signal.size(), (size_t) current_meters.n_midi());
-
-       for (size_t n = 0; n < limit; ++n) {
-               if (n < n_midi) {
-                       _visible_peak_power[n] = 0;
-               } else {
-                       _visible_peak_power[n] = -INFINITY;
+       for (uint32_t i = in.n_total(); i < current_meters.n_total(); ++i) {
+               if (i < _peak_signal.size()) {
+                       _peak_signal[i] = 0.0f;
                }
        }
+       for (uint32_t i = in.n_audio(); i < current_meters.n_audio(); ++i) {
+               if (i >= _kmeter.size()) continue;
+               _kmeter[i]->reset();
+               _iec1meter[i]->reset();
+               _iec2meter[i]->reset();
+               _vumeter[i]->reset();
+       }
 
-       reset();
+       current_meters = in;
        reset_max();
 
        ConfigurationChanged (in, in); /* EMIT SIGNAL */
@@ -332,7 +334,7 @@ PeakMeter::meter_level(uint32_t n, MeterType type) {
                case MeterK20:
                case MeterK14:
                        {
-                               const uint32_t n_midi = current_meters.n_midi();
+                               const int n_midi = current_meters.n_midi();
                                if ((n - n_midi) < _kmeter.size() && (n - n_midi) >= 0) {
                                        return accurate_coefficient_to_dB (_kmeter[n - n_midi]->read());
                                }
@@ -341,7 +343,7 @@ PeakMeter::meter_level(uint32_t n, MeterType type) {
                case MeterIEC1DIN:
                case MeterIEC1NOR:
                        {
-                               const uint32_t n_midi = current_meters.n_midi();
+                               const int n_midi = current_meters.n_midi();
                                if ((n - n_midi) < _iec1meter.size() && (n - n_midi) >= 0) {
                                        return accurate_coefficient_to_dB (_iec1meter[n - n_midi]->read());
                                }
@@ -350,7 +352,7 @@ PeakMeter::meter_level(uint32_t n, MeterType type) {
                case MeterIEC2BBC:
                case MeterIEC2EBU:
                        {
-                               const uint32_t n_midi = current_meters.n_midi();
+                               const int n_midi = current_meters.n_midi();
                                if ((n - n_midi) < _iec2meter.size() && (n - n_midi) >= 0) {
                                        return accurate_coefficient_to_dB (_iec2meter[n - n_midi]->read());
                                }
@@ -358,7 +360,7 @@ PeakMeter::meter_level(uint32_t n, MeterType type) {
                        break;
                case MeterVU:
                        {
-                               const uint32_t n_midi = current_meters.n_midi();
+                               const int n_midi = current_meters.n_midi();
                                if ((n - n_midi) < _vumeter.size() && (n - n_midi) >= 0) {
                                        return accurate_coefficient_to_dB (_vumeter[n - n_midi]->read());
                                }