X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fmixer_strip.cc;h=a011d2e9b35666922ecb85309d726c8160291a93;hb=aefd089b888d088160a00f2769cdfa383e3e67a4;hp=3d0059fa6e2595c25643785fbfa3d053b4899072;hpb=885f1c71ec62dbfa2250d8821e698dfe01be93d7;p=ardour.git diff --git a/gtk2_ardour/mixer_strip.cc b/gtk2_ardour/mixer_strip.cc index 3d0059fa6e..a011d2e9b3 100644 --- a/gtk2_ardour/mixer_strip.cc +++ b/gtk2_ardour/mixer_strip.cc @@ -34,6 +34,7 @@ #include #include +#include "ardour/amp.h" #include "ardour/audio_track.h" #include "ardour/audioengine.h" #include "ardour/internal_send.h" @@ -80,8 +81,6 @@ MixerStrip* MixerStrip::_entered_mixer_strip; PBD::Signal1 MixerStrip::CatchDeletion; -static const int _button_vpad = 4; - MixerStrip::MixerStrip (Mixer_UI& mx, Session* sess, bool in_mixer) : AxisView(sess) , RouteUI (sess) @@ -98,6 +97,7 @@ MixerStrip::MixerStrip (Mixer_UI& mx, Session* sess, bool in_mixer) , meter_point_button (_("pre")) , midi_input_enable_button (0) , _comment_button (_("Comments")) + , trim_control (ArdourKnob::default_elements, ArdourKnob::Flags (ArdourKnob::Detent | ArdourKnob::ArcToZero)) , _visibility (X_("mixer-element-visibility")) { init (); @@ -127,6 +127,7 @@ MixerStrip::MixerStrip (Mixer_UI& mx, Session* sess, boost::shared_ptr rt , meter_point_button (_("pre")) , midi_input_enable_button (0) , _comment_button (_("Comments")) + , trim_control (ArdourKnob::default_elements, ArdourKnob::Flags (ArdourKnob::Detent | ArdourKnob::ArcToZero)) , _visibility (X_("mixer-element-visibility")) { init (); @@ -153,10 +154,10 @@ MixerStrip::init () t += string_compose (_("\n%1-%2-click to toggle the width of all strips."), Keyboard::primary_modifier_name(), Keyboard::tertiary_modifier_name ()); } - width_button.set_image (::get_icon("strip_width")); + width_button.set_icon (ArdourIcon::StripWidth); ARDOUR_UI::instance()->set_tip (width_button, t); - hide_button.set_image(::get_icon("hide")); + hide_button.set_icon (ArdourIcon::CloseCross); ARDOUR_UI::instance()->set_tip (&hide_button, _("Hide this mixer strip")); input_button_box.set_spacing(2); @@ -178,28 +179,23 @@ MixerStrip::init () hide_button.set_events (hide_button.get_events() & ~(Gdk::ENTER_NOTIFY_MASK|Gdk::LEAVE_NOTIFY_MASK)); - monitor_input_button->set_diameter (3); - monitor_disk_button->set_diameter (3); - - solo_isolated_led = manage (new ArdourButton (ArdourButton::led_default_elements)); - solo_isolated_led->show (); - solo_isolated_led->set_diameter (3); - solo_isolated_led->set_no_show_all (true); - solo_isolated_led->set_name (X_("solo isolate")); - solo_isolated_led->add_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK); - solo_isolated_led->signal_button_release_event().connect (sigc::mem_fun (*this, &RouteUI::solo_isolate_button_release), false); + solo_isolated_led = manage (new ArdourButton (ArdourButton::led_default_elements)); + solo_isolated_led->show (); + solo_isolated_led->set_no_show_all (true); + solo_isolated_led->set_name (X_("solo isolate")); + solo_isolated_led->add_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK); + solo_isolated_led->signal_button_release_event().connect (sigc::mem_fun (*this, &RouteUI::solo_isolate_button_release), false); UI::instance()->set_tip (solo_isolated_led, _("Isolate Solo"), ""); - solo_safe_led = manage (new ArdourButton (ArdourButton::led_default_elements)); - solo_safe_led->show (); - solo_safe_led->set_diameter (3); - solo_safe_led->set_no_show_all (true); - solo_safe_led->set_name (X_("solo safe")); - solo_safe_led->add_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK); - solo_safe_led->signal_button_release_event().connect (sigc::mem_fun (*this, &RouteUI::solo_safe_button_release), false); + solo_safe_led = manage (new ArdourButton (ArdourButton::led_default_elements)); + solo_safe_led->show (); + solo_safe_led->set_no_show_all (true); + solo_safe_led->set_name (X_("solo safe")); + solo_safe_led->add_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK); + solo_safe_led->signal_button_release_event().connect (sigc::mem_fun (*this, &RouteUI::solo_safe_button_release), false); UI::instance()->set_tip (solo_safe_led, _("Lock Solo Status"), ""); - solo_safe_led->set_text (_("Lock")); + solo_safe_led->set_text (S_("SoloLock|Lock")); solo_isolated_led->set_text (_("Iso")); solo_iso_table.set_homogeneous (true); @@ -251,9 +247,7 @@ MixerStrip::init () bottom_button_table.attach (gpm.gain_automation_state_button, 0, 1, 0, 1); name_button.set_name ("mixer strip button"); - name_button.set_text (" "); /* non empty text, forces creation of the layout */ - name_button.set_text (""); /* back to empty */ - name_button.layout()->set_ellipsize (Pango::ELLIPSIZE_END); + name_button.set_text_ellipsize (Pango::ELLIPSIZE_END); name_button.signal_size_allocate().connect (sigc::mem_fun (*this, &MixerStrip::name_button_resized)); ARDOUR_UI::instance()->set_tip (&group_button, _("Mix group"), ""); @@ -262,6 +256,15 @@ MixerStrip::init () _comment_button.set_name (X_("mixer strip button")); _comment_button.signal_clicked.connect (sigc::mem_fun (*this, &RouteUI::toggle_comment_editor)); + // TODO implement ArdourKnob::on_size_request properly +#define PX_SCALE(px) std::max((float)px, rintf((float)px * ARDOUR_UI::ui_scale)) + trim_control.set_size_request (PX_SCALE(19), PX_SCALE(19)); +#undef PX_SCALE + trim_control.set_tooltip_prefix (_("Trim: ")); + trim_control.set_name ("trim knob"); + trim_control.set_no_show_all (true); + input_button_box.pack_start (trim_control, false, false); + global_vpacker.set_border_width (1); global_vpacker.set_spacing (0); @@ -325,9 +328,14 @@ MixerStrip::init () input_button.signal_button_press_event().connect (sigc::mem_fun(*this, &MixerStrip::input_press), false); input_button.signal_button_release_event().connect (sigc::mem_fun(*this, &MixerStrip::input_release), false); + input_button.signal_size_allocate().connect (sigc::mem_fun (*this, &MixerStrip::input_button_resized)); + + input_button.set_text_ellipsize (Pango::ELLIPSIZE_MIDDLE); + output_button.set_text_ellipsize (Pango::ELLIPSIZE_MIDDLE); output_button.signal_button_press_event().connect (sigc::mem_fun(*this, &MixerStrip::output_press), false); output_button.signal_button_release_event().connect (sigc::mem_fun(*this, &MixerStrip::output_release), false); + output_button.signal_size_allocate().connect (sigc::mem_fun (*this, &MixerStrip::output_button_resized)); number_label.signal_button_press_event().connect (sigc::mem_fun(*this, &MixerStrip::number_button_button_press), false); @@ -376,7 +384,7 @@ MixerStrip::init () _visibility.add (&_comment_button, X_("Comments"), _("Comments"), false); parameter_changed (X_("mixer-element-visibility")); - + ARDOUR_UI::config()->ParameterChanged.connect (sigc::mem_fun (*this, &MixerStrip::parameter_changed)); Config->ParameterChanged.connect (_config_connection, MISSING_INVALIDATOR, boost::bind (&MixerStrip::parameter_changed, this, _1), gui_context()); _session->config.ParameterChanged.connect (_config_connection, MISSING_INVALIDATOR, boost::bind (&MixerStrip::parameter_changed, this, _1), gui_context()); @@ -396,7 +404,7 @@ MixerStrip::~MixerStrip () } bool -MixerStrip::mixer_strip_enter_event (GdkEventCrossing *ev) +MixerStrip::mixer_strip_enter_event (GdkEventCrossing* /*ev*/) { _entered_mixer_strip = this; @@ -455,11 +463,6 @@ MixerStrip::set_route (boost::shared_ptr rt) */ processor_box.set_route (rt); - /* map the current state */ - - mute_changed (0); - update_solo_display (); - revert_to_default_display (); /* unpack these from the parent and stuff them into our own @@ -491,6 +494,9 @@ MixerStrip::set_route (boost::shared_ptr rt) solo_button->hide (); mute_button->show (); rec_mon_table.hide (); + if (solo_iso_table.get_parent()) { + solo_iso_table.get_parent()->remove(solo_iso_table); + } } else { bottom_button_table.attach (group_button, 1, 2, 0, 1); mute_solo_table.attach (*mute_button, 0, 1, 0, 1); @@ -520,11 +526,21 @@ MixerStrip::set_route (boost::shared_ptr rt) monitor_disk_button->hide (); } + if (route()->trim() && route()->trim()->active()) { + trim_control.show (); + trim_control.set_controllable (route()->trim()->gain_control()); + } else { + trim_control.hide (); + boost::shared_ptr none; + trim_control.set_controllable (none); + } + if (is_midi_track()) { if (midi_input_enable_button == 0) { midi_input_enable_button = manage (new ArdourButton); midi_input_enable_button->set_name ("midi input button"); - midi_input_enable_button->set_image (::get_icon (X_("midi_socket_small"))); + midi_input_enable_button->set_elements ((ArdourButton::Element)(ArdourButton::Edge|ArdourButton::Body|ArdourButton::VectorIcon)); + midi_input_enable_button->set_icon (ArdourIcon::DinMidi); midi_input_enable_button->signal_button_press_event().connect (sigc::mem_fun (*this, &MixerStrip::input_active_button_press), false); midi_input_enable_button->signal_button_release_event().connect (sigc::mem_fun (*this, &MixerStrip::input_active_button_release), false); ARDOUR_UI::instance()->set_tip (midi_input_enable_button, _("Enable/Disable MIDI input")); @@ -603,7 +619,7 @@ MixerStrip::set_route (boost::shared_ptr rt) /* now force an update of all the various elements */ - mute_changed (0); + update_mute_display (); update_solo_display (); name_changed (); comment_changed (0); @@ -687,12 +703,13 @@ MixerStrip::set_width_enum (Width w, void* owner) set_button_names (); + const float scale = std::max(1.f, ARDOUR_UI::ui_scale); + switch (w) { case Wide: if (show_sends_button) { - show_sends_button->set_text (_("Aux\nSends")); - show_sends_button->layout()->set_alignment (Pango::ALIGN_CENTER); + show_sends_button->set_text (_("Aux")); } gpm.gain_automation_style_button.set_text ( @@ -707,8 +724,12 @@ MixerStrip::set_width_enum (Width w, void* owner) panners.astate_string(_route->panner()->automation_state())); } - - set_size_request (max (110, gpm.get_gm_width()+5), -1); + { + // panners expect an even number of horiz. pixels + int width = rintf (max (110.f * scale, gpm.get_gm_width() + 10.f * scale)) + 1; + width &= ~1; + set_size_request (width, -1); + } break; case Narrow: @@ -730,7 +751,12 @@ MixerStrip::set_width_enum (Width w, void* owner) panners.short_astate_string(_route->panner()->automation_state())); } - set_size_request (max (60, gpm.get_gm_width() + 10), -1); + { + // panners expect an even number of horiz. pixels + int width = rintf (max (60.f * scale, gpm.get_gm_width() + 10.f * scale)) + 1; + width &= ~1; + set_size_request (width, -1); + } break; } @@ -767,7 +793,7 @@ gint MixerStrip::output_release (GdkEventButton *ev) { switch (ev->button) { - case 1: + case 3: edit_output_configuration (); break; } @@ -788,10 +814,10 @@ MixerStrip::output_press (GdkEventButton *ev) MenuList& citems = output_menu.items(); switch (ev->button) { - case 1: + case 3: return false; //wait for the mouse-up to pop the dialog - case 3: + case 1: { output_menu.set_name ("ArdourContextMenu"); citems.clear (); @@ -799,15 +825,6 @@ MixerStrip::output_press (GdkEventButton *ev) citems.push_back (MenuElem (_("Disconnect"), sigc::mem_fun (*(static_cast(this)), &RouteUI::disconnect_output))); - for (DataType::iterator i = DataType::begin(); i != DataType::end(); ++i) { - citems.push_back ( - MenuElem ( - string_compose ("Add %1 port", (*i).to_i18n_string()), - sigc::bind (sigc::mem_fun (*this, &MixerStrip::add_output_port), *i) - ) - ); - } - citems.push_back (SeparatorElem()); uint32_t const n_with_separator = citems.size (); @@ -841,6 +858,20 @@ MixerStrip::output_press (GdkEventButton *ev) citems.pop_back (); } + citems.push_back (SeparatorElem()); + + for (DataType::iterator i = DataType::begin(); i != DataType::end(); ++i) { + citems.push_back ( + MenuElem ( + string_compose (_("Add %1 port"), (*i).to_i18n_string()), + sigc::bind (sigc::mem_fun (*this, &MixerStrip::add_output_port), *i) + ) + ); + } + + citems.push_back (SeparatorElem()); + citems.push_back (MenuElem (_("Routing Grid"), sigc::mem_fun (*(static_cast(this)), &RouteUI::edit_output_configuration))); + output_menu.popup (1, ev->time); break; } @@ -856,7 +887,7 @@ MixerStrip::input_release (GdkEventButton *ev) { switch (ev->button) { - case 1: + case 3: edit_input_configuration (); break; default: @@ -888,22 +919,13 @@ MixerStrip::input_press (GdkEventButton *ev) switch (ev->button) { - case 1: + case 3: return false; //don't handle the mouse-down here. wait for mouse-up to pop the menu - case 3: + case 1: { citems.push_back (MenuElem (_("Disconnect"), sigc::mem_fun (*(static_cast(this)), &RouteUI::disconnect_input))); - for (DataType::iterator i = DataType::begin(); i != DataType::end(); ++i) { - citems.push_back ( - MenuElem ( - string_compose ("Add %1 port", (*i).to_i18n_string()), - sigc::bind (sigc::mem_fun (*this, &MixerStrip::add_input_port), *i) - ) - ); - } - citems.push_back (SeparatorElem()); uint32_t const n_with_separator = citems.size (); @@ -939,7 +961,21 @@ MixerStrip::input_press (GdkEventButton *ev) citems.pop_back (); } + citems.push_back (SeparatorElem()); + for (DataType::iterator i = DataType::begin(); i != DataType::end(); ++i) { + citems.push_back ( + MenuElem ( + string_compose (_("Add %1 port"), (*i).to_i18n_string()), + sigc::bind (sigc::mem_fun (*this, &MixerStrip::add_input_port), *i) + ) + ); + } + + citems.push_back (SeparatorElem()); + citems.push_back (MenuElem (_("Routing Grid"), sigc::mem_fun (*(static_cast(this)), &RouteUI::edit_input_configuration))); + input_menu.popup (1, ev->time); + break; } default: @@ -1145,7 +1181,6 @@ MixerStrip::update_io_button (boost::shared_ptr route, Width widt uint32_t other_connection_count = 0; ostringstream label; - string label_string; bool have_label = false; bool each_io_has_one_connection = true; @@ -1158,6 +1193,11 @@ MixerStrip::update_io_button (boost::shared_ptr route, Width widt ostringstream tooltip; char * tooltip_cstr; + + //to avoid confusion, the button caption should only show connections that match the datatype of the track + DataType dt = DataType::AUDIO; + if ( boost::dynamic_pointer_cast(route) != 0 ) + dt = DataType::MIDI; if (for_input) { io_count = route->n_inputs().n_total(); @@ -1174,6 +1214,10 @@ MixerStrip::update_io_button (boost::shared_ptr route, Width widt } else { port = route->output()->nth (io_index); } + + //ignore any port connections that don't match our DataType + if (port->type() != dt) + continue; port_connections.clear (); port->get_connections(port_connections); @@ -1181,12 +1225,20 @@ MixerStrip::update_io_button (boost::shared_ptr route, Width widt if (!port_connections.empty()) { for (vector::iterator i = port_connections.begin(); i != port_connections.end(); ++i) { + string pn = ""; string& connection_name (*i); + if (connection_name.find("system:") == 0) { + pn = AudioEngine::instance()->get_pretty_name_by_name (connection_name); + } + if (io_connection_count == 0) { - tooltip << endl << Glib::Markup::escape_text(port->name().substr(port->name().find("/") + 1)) << " -> " << Glib::Markup::escape_text(connection_name); + tooltip << endl << Glib::Markup::escape_text(port->name().substr(port->name().find("/") + 1)) + << " -> " + << Glib::Markup::escape_text( pn.empty() ? connection_name : pn ); } else { - tooltip << ", " << Glib::Markup::escape_text(connection_name); + tooltip << ", " + << Glib::Markup::escape_text( pn.empty() ? connection_name : pn ); } if (connection_name.find("ardour:") == 0) { @@ -1201,6 +1253,32 @@ MixerStrip::update_io_button (boost::shared_ptr route, Width widt if (connection_name.find(ardour_track_name) == 0) { ++ardour_connection_count; } + } else if (!pn.empty()) { + if (system_ports.empty()) { + system_ports += pn; + } else { + system_ports += "/" + pn; + } + if (connection_name.find("system:") == 0) { + ++system_connection_count; + } + } else if (connection_name.find("system:midi_") == 0) { + if (for_input) { + // "system:midi_capture_123" -> "123" + system_port = "M " + connection_name.substr(20); + } else { + // "system:midi_playback_123" -> "123" + system_port = "M " + connection_name.substr(21); + } + + if (system_ports.empty()) { + system_ports += system_port; + } else { + system_ports += "/" + system_port; + } + + ++system_connection_count; + } else if (connection_name.find("system:") == 0) { if (for_input) { // "system:capture_123" -> "123" @@ -1284,19 +1362,10 @@ MixerStrip::update_io_button (boost::shared_ptr route, Width widt } } - switch (width) { - case Wide: - label_string = label.str().substr(0, 7); - break; - case Narrow: - label_string = label.str().substr(0, 3); - break; - } - if (for_input) { - input_button.set_text (label_string); + input_button.set_text (label.str()); } else { - output_button.set_text (label_string); + output_button.set_text (label.str()); } } @@ -1504,7 +1573,23 @@ MixerStrip::build_route_ops_menu () } items.push_back (SeparatorElem()); - items.push_back (MenuElem (_("Remove"), sigc::bind (sigc::mem_fun(*this, &RouteUI::remove_this_route), false))); + + if (_route) { + /* note that this relies on selection being shared across editor and + mixer (or global to the backend, in the future), which is the only + sane thing for users anyway. + */ + + RouteTimeAxisView* rtav = PublicEditor::instance().get_route_view_by_route_id (_route->id()); + if (rtav) { + Selection& selection (PublicEditor::instance().get_selection()); + if (!selection.selected (rtav)) { + selection.set (rtav); + } + + items.push_front (MenuElem (_("Remove"), sigc::mem_fun(PublicEditor::instance(), &PublicEditor::remove_tracks))); + } + } } gboolean @@ -1591,36 +1676,44 @@ void MixerStrip::name_changed () { switch (_width) { - case Wide: - if (_session->config.get_track_name_number()) { - const int64_t track_number = _route->track_number (); - if (track_number == 0) { - number_label.set_text ("-"); - } else { - number_label.set_text (PBD::to_string (abs(_route->track_number ()), std::dec)); - } - } else { - number_label.set_text (""); - } - name_button.set_text (_route->name()); - break; - case Narrow: - if (_session->config.get_track_name_number()) { - name_button.set_markup(track_number_to_string (_route->track_number (), " ", - PBD::short_version (_route->name (), 5))); - } else { + case Wide: + name_button.set_text (_route->name()); + break; + case Narrow: name_button.set_text (PBD::short_version (_route->name(), 5)); - } - break; + break; } ARDOUR_UI::instance()->set_tip (name_button, _route->name()); + + if (_session->config.get_track_name_number()) { + const int64_t track_number = _route->track_number (); + if (track_number == 0) { + number_label.set_text ("-"); + } else { + number_label.set_text (PBD::to_string (abs(_route->track_number ()), std::dec)); + } + } else { + number_label.set_text (""); + } +} + +void +MixerStrip::input_button_resized (Gtk::Allocation& alloc) +{ + input_button.set_layout_ellipsize_width (alloc.get_width() * PANGO_SCALE); +} + +void +MixerStrip::output_button_resized (Gtk::Allocation& alloc) +{ + output_button.set_layout_ellipsize_width (alloc.get_width() * PANGO_SCALE); } void MixerStrip::name_button_resized (Gtk::Allocation& alloc) { - name_button.layout()->set_width (alloc.get_width() * PANGO_SCALE); + name_button.set_layout_ellipsize_width (alloc.get_width() * PANGO_SCALE); } bool @@ -1796,24 +1889,24 @@ MixerStrip::meter_point_string (MeterPoint mp) case Narrow: switch (mp) { case MeterInput: - return _("In"); + return S_("Meter|In"); break; case MeterPreFader: - return _("Pr"); + return S_("Meter|Pr"); break; case MeterPostFader: - return _("Po"); + return S_("Meter|Po"); break; case MeterOutput: - return _("O"); + return S_("Meter|O"); break; case MeterCustom: default: - return _("C"); + return S_("Meter|C"); break; } break; @@ -1959,7 +2052,6 @@ MixerStrip::set_button_names () { switch (_width) { case Wide: -// rec_enable_button->set_text (_("Rec")); mute_button->set_text (_("Mute")); monitor_input_button->set_text (_("In")); monitor_disk_button->set_text (_("Disk")); @@ -1982,14 +2074,13 @@ MixerStrip::set_button_names () } } solo_isolated_led->set_text (_("Iso")); - solo_safe_led->set_text (_("Lock")); + solo_safe_led->set_text (S_("SoloLock|Lock")); break; default: -// rec_enable_button->set_text (_("R")); - mute_button->set_text (_("M")); - monitor_input_button->set_text (_("I")); - monitor_disk_button->set_text (_("D")); + mute_button->set_text (S_("Mute|M")); + monitor_input_button->set_text (S_("MonitorInput|I")); + monitor_disk_button->set_text (S_("MonitorDisk|D")); if (_route && _route->solo_safe()) { solo_button->set_visual_state (Gtkmm2ext::VisualState (solo_button->visual_state() | Gtkmm2ext::Insensitive)); @@ -1997,20 +2088,20 @@ MixerStrip::set_button_names () solo_button->set_visual_state (Gtkmm2ext::VisualState (solo_button->visual_state() & ~Gtkmm2ext::Insensitive)); } if (!Config->get_solo_control_is_listen_control()) { - solo_button->set_text (_("S")); + solo_button->set_text (S_("Solo|S")); } else { switch (Config->get_listen_position()) { case AfterFaderListen: - solo_button->set_text (_("A")); + solo_button->set_text (S_("AfterFader|A")); break; case PreFaderListen: - solo_button->set_text (_("P")); + solo_button->set_text (S_("Prefader|P")); break; } } - solo_isolated_led->set_text (_("I")); - solo_safe_led->set_text (_("L")); + solo_isolated_led->set_text (S_("SoloIso|I")); + solo_safe_led->set_text (S_("SoloLock|L")); break; } @@ -2082,7 +2173,7 @@ MixerStrip::parameter_changed (string p) /* The user has made changes to the mixer strip visibility, so get our VisibilityGroup to reflect these changes in our widgets. */ - _visibility.set_state (Config->get_mixer_strip_visibility ()); + _visibility.set_state (ARDOUR_UI::config()->get_mixer_strip_visibility ()); } else if (p == "track-name-number") { name_changed (); @@ -2201,10 +2292,17 @@ MixerStrip::popup_level_meter_menu (GdkEventButton* ev) add_level_meter_item_point (items, group, _("Output"), MeterOutput); add_level_meter_item_point (items, group, _("Custom"), MeterCustom); + if (gpm.meter_channels().n_audio() == 0) { + m->popup (ev->button, ev->time); + _suspend_menu_callbacks = false; + return; + } + RadioMenuItem::Group tgroup; 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(MeterPeak0dB), MeterPeak0dB); 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);