diff options
Diffstat (limited to 'gtk2_ardour/level_meter.cc')
| -rw-r--r-- | gtk2_ardour/level_meter.cc | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/gtk2_ardour/level_meter.cc b/gtk2_ardour/level_meter.cc index 70e922bdb3..2658352790 100644 --- a/gtk2_ardour/level_meter.cc +++ b/gtk2_ardour/level_meter.cc @@ -49,7 +49,7 @@ LevelMeterBase::LevelMeterBase (Session* s, PBD::EventLoop::InvalidationRecord* , meter_length (0) , thin_meter_width(2) , max_peak (minus_infinity()) - , meter_type (MeterPeak) + , _meter_type (MeterPeak) , visible_meter_type (MeterType(0)) , midi_count (0) , meter_count (0) @@ -150,24 +150,24 @@ LevelMeterBase::update_meters () if (n < nmidi) { (*i).meter->set (_meter->meter_level (n, MeterPeak)); } else { - const float peak = _meter->meter_level (n, meter_type); - if (meter_type == MeterPeak) { + const float peak = _meter->meter_level (n, _meter_type); + if (_meter_type == MeterPeak) { (*i).meter->set (log_meter (peak)); - } else if (meter_type == MeterPeak0dB) { + } else if (_meter_type == MeterPeak0dB) { (*i).meter->set (log_meter0dB (peak)); - } else if (meter_type == MeterIEC1NOR) { + } else if (_meter_type == MeterIEC1NOR) { (*i).meter->set (meter_deflect_nordic (peak + meter_lineup(0))); - } else if (meter_type == MeterIEC1DIN) { + } else if (_meter_type == MeterIEC1DIN) { (*i).meter->set (meter_deflect_din (peak + meter_lineup_cfg(UIConfiguration::instance().get_meter_line_up_din(), 3.0))); - } else if (meter_type == MeterIEC2BBC || meter_type == MeterIEC2EBU) { + } else if (_meter_type == MeterIEC2BBC || _meter_type == MeterIEC2EBU) { (*i).meter->set (meter_deflect_ppm (peak + meter_lineup(0))); - } else if (meter_type == MeterVU) { + } else if (_meter_type == MeterVU) { (*i).meter->set (meter_deflect_vu (peak + vu_standard() + meter_lineup(0))); - } else if (meter_type == MeterK12) { + } else if (_meter_type == MeterK12) { (*i).meter->set (meter_deflect_k (peak, 12), meter_deflect_k(_meter->meter_level(n, MeterPeak), 12)); - } else if (meter_type == MeterK14) { + } else if (_meter_type == MeterK14) { (*i).meter->set (meter_deflect_k (peak, 14), meter_deflect_k(_meter->meter_level(n, MeterPeak), 14)); - } else if (meter_type == MeterK20) { + } else if (_meter_type == MeterK20) { (*i).meter->set (meter_deflect_k (peak, 20), meter_deflect_k(_meter->meter_level(n, MeterPeak), 20)); } else { // RMS (*i).meter->set (log_meter (peak), log_meter(_meter->meter_level(n, MeterPeak))); @@ -218,7 +218,7 @@ LevelMeterBase::configuration_changed (ChanCount /*in*/, ChanCount /*out*/) void LevelMeterBase::meter_type_changed (MeterType t) { - meter_type = t; + _meter_type = t; setup_meters (meter_length, regular_meter_width, thin_meter_width); MeterTypeChanged(t); } @@ -282,7 +282,7 @@ LevelMeterBase::setup_meters (int len, int initial_width, int thin_width) && meters[0].width == width && meters[0].length == len && !color_changed - && meter_type == visible_meter_type) { + && _meter_type == visible_meter_type) { return; } @@ -292,7 +292,7 @@ LevelMeterBase::setup_meters (int len, int initial_width, int thin_width) (meters.size() > 0 && meters[0].width == width) ? "yes" : "no", (meters.size() > 0 && meters[0].length == len) ? "yes" : "no", (nmeters == meter_count) ? "yes" : "no", - (meter_type == visible_meter_type) ? "yes" : "no", + (_meter_type == visible_meter_type) ? "yes" : "no", !color_changed ? "yes" : "no" ); #endif @@ -340,7 +340,7 @@ LevelMeterBase::setup_meters (int len, int initial_width, int thin_width) c[8] = UIConfiguration::instance().color ("meter color8"); c[9] = UIConfiguration::instance().color ("meter color9"); - switch (meter_type) { + switch (_meter_type) { case MeterK20: stp[0] = 115.0 * meter_deflect_k(-40, 20); //-20 stp[1] = 115.0 * meter_deflect_k(-20, 20); // 0 @@ -452,7 +452,7 @@ LevelMeterBase::setup_meters (int len, int initial_width, int thin_width) } } } - if (meters[n].width != width || meters[n].length != len || color_changed || meter_type != visible_meter_type || nmidi != midi_count) { + if (meters[n].width != width || meters[n].length != len || color_changed || _meter_type != visible_meter_type || nmidi != midi_count) { bool hl = meters[n].meter ? meters[n].meter->get_highlight() : false; meters[n].packed = false; delete meters[n].meter; @@ -482,15 +482,15 @@ LevelMeterBase::setup_meters (int len, int initial_width, int thin_width) } //show(); color_changed = false; - visible_meter_type = meter_type; + visible_meter_type = _meter_type; midi_count = nmidi; meter_count = nmeters; } void -LevelMeterBase::set_type(MeterType t) +LevelMeterBase::set_meter_type(MeterType t) { - meter_type = t; + _meter_type = t; _meter->set_type(t); } |