diff options
| -rw-r--r-- | gtk2_ardour/meter_patterns.cc | 8 | ||||
| -rw-r--r-- | gtk2_ardour/meter_strip.cc | 2 | ||||
| -rw-r--r-- | gtk2_ardour/mixer_strip.cc | 2 | ||||
| -rw-r--r-- | libs/ardour/ardour/types.h | 2 | ||||
| -rw-r--r-- | libs/ardour/enums.cc | 2 | ||||
| -rw-r--r-- | libs/ardour/meter.cc | 6 |
6 files changed, 11 insertions, 11 deletions
diff --git a/gtk2_ardour/meter_patterns.cc b/gtk2_ardour/meter_patterns.cc index 5f4476e15d..ff977c84c3 100644 --- a/gtk2_ardour/meter_patterns.cc +++ b/gtk2_ardour/meter_patterns.cc @@ -78,7 +78,7 @@ ArdourMeter::meter_type_string (ARDOUR::MeterType mt) case MeterPeak: return _("Peak"); break; - case MeterRMS: + case MeterKrms: return _("RMS + Peak"); break; case MeterIEC1DIN: @@ -116,7 +116,7 @@ static inline float mtr_col_and_fract( switch (mt) { default: - case MeterRMS: + case MeterKrms: case MeterPeak: fraction = log_meter (val); if (val >= 0 || val == -9) { @@ -568,7 +568,7 @@ meter_render_metrics (Gtk::Widget& w, MeterType type, vector<DataType> types) break; default: case MeterPeak: - case MeterRMS: + case MeterKrms: points.insert (std::pair<int,string>(-50.0f, "-50")); points.insert (std::pair<int,string>(-40.0f, "-40")); points.insert (std::pair<int,string>(-30.0f, "-30")); @@ -745,7 +745,7 @@ meter_render_metrics (Gtk::Widget& w, MeterType type, vector<DataType> types) break; default: case MeterPeak: - case MeterRMS: + case MeterKrms: layout->set_text("dBFS"); break; case MeterIEC2EBU: diff --git a/gtk2_ardour/meter_strip.cc b/gtk2_ardour/meter_strip.cc index 263241bbd1..20419de7c7 100644 --- a/gtk2_ardour/meter_strip.cc +++ b/gtk2_ardour/meter_strip.cc @@ -575,7 +575,7 @@ MeterStrip::popup_level_meter_menu (GdkEventButton* ev) _suspend_menu_callbacks = true; add_level_meter_item (items, group, ArdourMeter::meter_type_string(MeterPeak), MeterPeak); - add_level_meter_item (items, group, ArdourMeter::meter_type_string(MeterRMS), MeterRMS); + add_level_meter_item (items, group, ArdourMeter::meter_type_string(MeterKrms), MeterKrms); add_level_meter_item (items, group, ArdourMeter::meter_type_string(MeterIEC1DIN), MeterIEC1DIN); add_level_meter_item (items, group, ArdourMeter::meter_type_string(MeterIEC1NOR), MeterIEC1NOR); add_level_meter_item (items, group, ArdourMeter::meter_type_string(MeterIEC2BBC), MeterIEC2BBC); diff --git a/gtk2_ardour/mixer_strip.cc b/gtk2_ardour/mixer_strip.cc index e4afad2fea..d77023d201 100644 --- a/gtk2_ardour/mixer_strip.cc +++ b/gtk2_ardour/mixer_strip.cc @@ -2134,7 +2134,7 @@ MixerStrip::popup_level_meter_menu (GdkEventButton* ev) items.push_back (SeparatorElem()); add_level_meter_item_type (items, tgroup, ArdourMeter::meter_type_string(MeterPeak), MeterPeak); - add_level_meter_item_type (items, tgroup, ArdourMeter::meter_type_string(MeterRMS), MeterRMS); + add_level_meter_item_type (items, tgroup, ArdourMeter::meter_type_string(MeterKrms), MeterKrms); add_level_meter_item_type (items, tgroup, ArdourMeter::meter_type_string(MeterIEC1DIN), MeterIEC1DIN); add_level_meter_item_type (items, tgroup, ArdourMeter::meter_type_string(MeterIEC1NOR), MeterIEC1NOR); add_level_meter_item_type (items, tgroup, ArdourMeter::meter_type_string(MeterIEC2BBC), MeterIEC2BBC); diff --git a/libs/ardour/ardour/types.h b/libs/ardour/ardour/types.h index 7b396796ad..553ee1ea28 100644 --- a/libs/ardour/ardour/types.h +++ b/libs/ardour/ardour/types.h @@ -181,7 +181,7 @@ namespace ARDOUR { MeterMaxSignal = 0x001, MeterMaxPeak = 0x002, MeterPeak = 0x004, - MeterRMS = 0x008, + MeterKrms = 0x008, MeterK20 = 0x010, MeterK14 = 0x020, MeterIEC1DIN = 0x040, diff --git a/libs/ardour/enums.cc b/libs/ardour/enums.cc index eab3176f57..0d225fada3 100644 --- a/libs/ardour/enums.cc +++ b/libs/ardour/enums.cc @@ -176,7 +176,7 @@ setup_enum_writer () REGISTER_ENUM (MeterMaxSignal); REGISTER_ENUM (MeterMaxPeak); REGISTER_ENUM (MeterPeak); - REGISTER_ENUM (MeterRMS); + REGISTER_ENUM (MeterKrms); REGISTER_ENUM (MeterK20); REGISTER_ENUM (MeterK14); REGISTER_ENUM (MeterIEC1DIN); diff --git a/libs/ardour/meter.cc b/libs/ardour/meter.cc index 8b9ed436a4..32c7439fd5 100644 --- a/libs/ardour/meter.cc +++ b/libs/ardour/meter.cc @@ -106,7 +106,7 @@ PeakMeter::run (BufferSet& bufs, framepos_t /*start_frame*/, framepos_t /*end_fr // Meter audio in to the rest of the peaks for (uint32_t i = 0; i < n_audio; ++i, ++n) { _peak_signal[n] = compute_peak (bufs.get_audio(i).data(), nframes, _peak_signal[n]); - if (_meter_type & (MeterRMS | MeterK20 | MeterK14)) { + if (_meter_type & (MeterKrms | MeterK20 | MeterK14)) { _kmeter[i]->process(bufs.get_audio(i).data(), nframes); } if (_meter_type & (MeterIEC1DIN | MeterIEC1NOR)) { @@ -323,7 +323,7 @@ PeakMeter::meter () float PeakMeter::meter_level(uint32_t n, MeterType type) { switch (type) { - case MeterRMS: + case MeterKrms: case MeterK20: case MeterK14: { @@ -385,7 +385,7 @@ PeakMeter::set_type(MeterType t) _meter_type = t; - if (t & (MeterRMS | MeterK20 | MeterK14)) { + if (t & (MeterKrms | MeterK20 | MeterK14)) { const size_t n_audio = current_meters.n_audio(); for (size_t n = 0; n < n_audio; ++n) { _kmeter[n]->reset(); |