make editor_drag.h fully self-contained as a header file (it was missing more than...

[ardour.git] / gtk2_ardour / mixer_strip.cc

diff --git a/gtk2_ardour/mixer_strip.cc b/gtk2_ardour/mixer_strip.cc
index 8a93f8f806cd4dea216f0d45d00bace1758f806d..a011d2e9b35666922ecb85309d726c8160291a93 100644 (file)
--- a/gtk2_ardour/mixer_strip.cc
+++ b/gtk2_ardour/mixer_strip.cc
@@ -97,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 ();
@@ -126,6 +127,7 @@ MixerStrip::MixerStrip (Mixer_UI& mx, Session* sess, boost::shared_ptr<Route> 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 ();
@@ -152,12 +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_elements ((ArdourButton::Element)(ArdourButton::Edge|ArdourButton::Body|ArdourButton::VectorIcon));
-       width_button.set_icon (ArdourButton::StripWidth);
+       width_button.set_icon (ArdourIcon::StripWidth);
        ARDOUR_UI::instance()->set_tip (width_button, t);
 
-       hide_button.set_elements ((ArdourButton::Element)(ArdourButton::Edge|ArdourButton::Body|ArdourButton::VectorIcon));
-       hide_button.set_icon (ArdourButton::CloseCross);
+       hide_button.set_icon (ArdourIcon::CloseCross);
        ARDOUR_UI::instance()->set_tip (&hide_button, _("Hide this mixer strip"));
 
        input_button_box.set_spacing(2);
@@ -260,7 +260,7 @@ MixerStrip::init ()
 #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_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);
@@ -540,7 +540,7 @@ MixerStrip::set_route (boost::shared_ptr<Route> rt)
                        midi_input_enable_button = manage (new ArdourButton);
                        midi_input_enable_button->set_name ("midi input button");
                        midi_input_enable_button->set_elements ((ArdourButton::Element)(ArdourButton::Edge|ArdourButton::Body|ArdourButton::VectorIcon));
-                       midi_input_enable_button->set_icon (ArdourButton::DinMidi);
+                       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"));
@@ -2302,6 +2302,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(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);