diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2013-07-31 20:11:15 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2013-07-31 20:11:15 -0400 |
| commit | 6a436fd826d1c9d88b60287696cc0836ccce35aa (patch) | |
| tree | 460a08b4d46359b6b168ece26f592c75fc2fe41f /gtk2_ardour/mixer_strip.cc | |
| parent | bb59def1ca8a21f915cf636dd1e54957df981656 (diff) | |
| parent | 4dc74ae2ea13d2e5a8b481961d507df1ff98df97 (diff) | |
fix merge conflict from master
Diffstat (limited to 'gtk2_ardour/mixer_strip.cc')
| -rw-r--r-- | gtk2_ardour/mixer_strip.cc | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/gtk2_ardour/mixer_strip.cc b/gtk2_ardour/mixer_strip.cc index b6d4001e2d..9e2140fd10 100644 --- a/gtk2_ardour/mixer_strip.cc +++ b/gtk2_ardour/mixer_strip.cc @@ -2134,7 +2134,14 @@ 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(MeterKrms), MeterKrms); + 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); + add_level_meter_item_type (items, tgroup, ArdourMeter::meter_type_string(MeterIEC2EBU), MeterIEC2EBU); + add_level_meter_item_type (items, tgroup, ArdourMeter::meter_type_string(MeterK20), MeterK20); + add_level_meter_item_type (items, tgroup, ArdourMeter::meter_type_string(MeterK14), MeterK14); + add_level_meter_item_type (items, tgroup, ArdourMeter::meter_type_string(MeterVU), MeterVU); int _strip_type; if (_route->is_master()) { |