diff options
| author | Robin Gareus <robin@gareus.org> | 2013-07-22 18:42:01 +0200 |
|---|---|---|
| committer | Robin Gareus <robin@gareus.org> | 2013-07-22 18:42:01 +0200 |
| commit | 72aa1cd86cf04964f08e7ca0557f73afd1c96e83 (patch) | |
| tree | c9f59e03d54bd2ca4f15fe6bc94a06e918df4e6e /gtk2_ardour | |
| parent | e294e78fefe77897a9a014d7b84d436a9aff6f9b (diff) | |
Revert "Revert new meter types (postponed until after 3.3 release)"
This reverts commit d80f672e8487f459d76ab291958bffcded08f0fd.
Diffstat (limited to 'gtk2_ardour')
| -rw-r--r-- | gtk2_ardour/meter_patterns.cc | 9 | ||||
| -rw-r--r-- | gtk2_ardour/meter_strip.cc | 3 | ||||
| -rw-r--r-- | gtk2_ardour/mixer_strip.cc | 3 |
3 files changed, 15 insertions, 0 deletions
diff --git a/gtk2_ardour/meter_patterns.cc b/gtk2_ardour/meter_patterns.cc index 35ba8491be..d658a0b3ef 100644 --- a/gtk2_ardour/meter_patterns.cc +++ b/gtk2_ardour/meter_patterns.cc @@ -64,6 +64,15 @@ ArdourMeter::meter_type_string (ARDOUR::MeterType mt) case MeterKrms: return _("RMS + Peak"); break; + case MeterIEC1: + return _("DIN"); + break; + case MeterIEC2: + return _("EBU/BBC"); + break; + case MeterVU: + return _("VU"); + break; default: return _("???"); break; diff --git a/gtk2_ardour/meter_strip.cc b/gtk2_ardour/meter_strip.cc index 44144114a4..3a8410867a 100644 --- a/gtk2_ardour/meter_strip.cc +++ b/gtk2_ardour/meter_strip.cc @@ -573,6 +573,9 @@ 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(MeterKrms), MeterKrms); + add_level_meter_item (items, group, ArdourMeter::meter_type_string(MeterIEC1), MeterIEC1); + add_level_meter_item (items, group, ArdourMeter::meter_type_string(MeterIEC2), MeterIEC2); + add_level_meter_item (items, group, ArdourMeter::meter_type_string(MeterVU), MeterVU); MeterType cmt = _route->meter_type(); const std::string cmn = ArdourMeter::meter_type_string(cmt); diff --git a/gtk2_ardour/mixer_strip.cc b/gtk2_ardour/mixer_strip.cc index 6128780cf0..dec072b067 100644 --- a/gtk2_ardour/mixer_strip.cc +++ b/gtk2_ardour/mixer_strip.cc @@ -2135,6 +2135,9 @@ MixerStrip::popup_level_meter_menu (GdkEventButton* ev) add_level_meter_item_type (items, tgroup, ArdourMeter::meter_type_string(MeterPeak), MeterPeak); add_level_meter_item_type (items, tgroup, ArdourMeter::meter_type_string(MeterKrms), MeterKrms); + add_level_meter_item_type (items, tgroup, ArdourMeter::meter_type_string(MeterIEC1), MeterIEC1); + add_level_meter_item_type (items, tgroup, ArdourMeter::meter_type_string(MeterIEC2), MeterIEC2); + add_level_meter_item_type (items, tgroup, ArdourMeter::meter_type_string(MeterVU), MeterVU); int _strip_type; if (_route->is_master()) { |