diff options
| author | Robin Gareus <robin@gareus.org> | 2013-07-22 19:59:24 +0200 |
|---|---|---|
| committer | Robin Gareus <robin@gareus.org> | 2013-07-22 19:59:24 +0200 |
| commit | 06e7ad67ae9fb84828011d7522d7c1b4cbeb7c37 (patch) | |
| tree | 854880ca801bfa49be8d52a8f2c987cba12cf846 /gtk2_ardour | |
| parent | df17094b478100f41ebaf4cd30432cef933b7523 (diff) | |
restore session backwards compatibility to 3.3
Diffstat (limited to 'gtk2_ardour')
| -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 |
3 files changed, 6 insertions, 6 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); |