merge with master.
[ardour.git] / gtk2_ardour / meter_strip.cc
index 1f22222293c7e2c59151e1db9e1dd8f92d6406b0..fd38da65e6b606a32d769658b5eb9903f7f662ee 100644 (file)
@@ -48,6 +48,7 @@
 #include "i18n.h"
 
 using namespace ARDOUR;
+using namespace ARDOUR_UI_UTILS;
 using namespace PBD;
 using namespace Gtk;
 using namespace Gtkmm2ext;
@@ -65,6 +66,8 @@ MeterStrip::MeterStrip (int metricmode, MeterType mt)
        level_meter = 0;
        _strip_type = 0;
        _tick_bar = 0;
+       _metricmode = -1;
+       metric_type = MeterPeak;
        mtr_vbox.set_spacing(2);
        nfo_vbox.set_spacing(2);
        peakbx.set_size_request(-1, 14);
@@ -112,17 +115,20 @@ MeterStrip::MeterStrip (int metricmode, MeterType mt)
 
 MeterStrip::MeterStrip (Session* sess, boost::shared_ptr<ARDOUR::Route> rt)
        : AxisView(sess)
-       , RouteUI(sess)
+       , RouteUI(0)
        , _route(rt)
        , peak_display()
 {
        mtr_vbox.set_spacing(2);
        nfo_vbox.set_spacing(2);
-       RouteUI::set_route (rt);
        SessionHandlePtr::set_session (sess);
+       RouteUI::init ();
+       RouteUI::set_route (rt);
 
        _has_midi = false;
        _tick_bar = 0;
+       _metricmode = -1;
+       metric_type = MeterPeak;
 
        int meter_width = 6;
        if (_route->shared_peak_meter()->input_streams().n_total() == 1) {
@@ -135,7 +141,7 @@ MeterStrip::MeterStrip (Session* sess, boost::shared_ptr<ARDOUR::Route> rt)
        level_meter->clear_meters();
        level_meter->set_type (_route->meter_type());
        level_meter->setup_meters (220, meter_width, 6);
-       level_meter->ButtonPress.connect_same_thread (level_meter_connection, boost::bind (&MeterStrip::level_meter_button_press, this, _1));
+       level_meter->ButtonRelease.connect_same_thread (level_meter_connection, boost::bind (&MeterStrip::level_meter_button_release, this, _1));
        level_meter->MeterTypeChanged.connect_same_thread (level_meter_connection, boost::bind (&MeterStrip::meter_type_changed, this, _1));
 
        meter_align.set(0.5, 0.5, 0.0, 1.0);
@@ -158,8 +164,12 @@ MeterStrip::MeterStrip (Session* sess, boost::shared_ptr<ARDOUR::Route> rt)
        peakbx.pack_start(peak_align, true, true, 3);
        peakbx.set_size_request(-1, 14);
 
-       // add track-name label
-       name_label.set_text(_route->name());
+       // add track-name & -number label
+       number_label.set_text("-");
+       number_label.set_size_request(18, 18);
+
+       name_changed();
+
        name_label.set_corner_radius(2);
        name_label.set_name("meterbridge label");
        name_label.set_angle(-90.0);
@@ -168,9 +178,23 @@ MeterStrip::MeterStrip (Session* sess, boost::shared_ptr<ARDOUR::Route> rt)
        name_label.set_size_request(18, 50);
        name_label.set_alignment(-1.0, .5);
        ARDOUR_UI::instance()->set_tip (name_label, _route->name());
+       ARDOUR_UI::instance()->set_tip (*level_meter, _route->name());
+
+       number_label.set_corner_radius(2);
+       number_label.set_name("tracknumber label");
+       number_label.set_angle(-90.0);
+       number_label.layout()->set_width(18 * PANGO_SCALE);
+       number_label.set_alignment(.5, .5);
 
        namebx.set_size_request(18, 52);
-       namebx.pack_start(name_label, true, false, 3);
+       namebx.pack_start(namenumberbx, true, false, 0);
+       namenumberbx.pack_start(name_label, true, false, 0);
+       namenumberbx.pack_start(number_label, false, false, 0);
+
+       mon_in_box.pack_start(*monitor_input_button, true, false);
+       btnbox.pack_start(mon_in_box, false, false, 1);
+       mon_disk_box.pack_start(*monitor_disk_button, true, false);
+       btnbox.pack_start(mon_disk_box, false, false, 1);
 
        recbox.pack_start(*rec_enable_button, true, false);
        btnbox.pack_start(recbox, false, false, 1);
@@ -181,6 +205,7 @@ MeterStrip::MeterStrip (Session* sess, boost::shared_ptr<ARDOUR::Route> rt)
 
        rec_enable_button->set_corner_radius(2);
        rec_enable_button->set_size_request(16, 16);
+       rec_enable_button->set_image (::get_icon (X_("record_normal_red")));
 
        mute_button->set_corner_radius(2);
        mute_button->set_size_request(16, 16);
@@ -188,9 +213,17 @@ MeterStrip::MeterStrip (Session* sess, boost::shared_ptr<ARDOUR::Route> rt)
        solo_button->set_corner_radius(2);
        solo_button->set_size_request(16, 16);
 
+       monitor_input_button->set_corner_radius(2);
+       monitor_input_button->set_size_request(16, 16);
+
+       monitor_disk_button->set_corner_radius(2);
+       monitor_disk_button->set_size_request(16, 16);
+
        mutebox.set_size_request(16, 16);
        solobox.set_size_request(16, 16);
        recbox.set_size_request(16, 16);
+       mon_in_box.set_size_request(16, 16);
+       mon_disk_box.set_size_request(16, 16);
        spacer.set_size_request(-1,0);
 
        update_button_box();
@@ -227,9 +260,18 @@ MeterStrip::MeterStrip (Session* sess, boost::shared_ptr<ARDOUR::Route> rt)
        mtr_container.show();
        mtr_hsep.show();
        nfo_vbox.show();
+       namenumberbx.show();
+
+       if (boost::dynamic_pointer_cast<Track>(_route)) {
+               monitor_input_button->show();
+               monitor_disk_button->show();
+       } else {
+               monitor_input_button->hide();
+               monitor_disk_button->hide();
+       }
 
        _route->shared_peak_meter()->ConfigurationChanged.connect (
-                       route_connections, invalidator (*this), boost::bind (&MeterStrip::meter_configuration_changed, this, _1), gui_context()
+                       meter_route_connections, invalidator (*this), boost::bind (&MeterStrip::meter_configuration_changed, this, _1), gui_context()
                        );
 
        ResetAllPeakDisplays.connect (sigc::mem_fun(*this, &MeterStrip::reset_peak_display));
@@ -245,10 +287,11 @@ MeterStrip::MeterStrip (Session* sess, boost::shared_ptr<ARDOUR::Route> rt)
        meter_ticks1_area.signal_expose_event().connect (sigc::mem_fun(*this, &MeterStrip::meter_ticks1_expose));
        meter_ticks2_area.signal_expose_event().connect (sigc::mem_fun(*this, &MeterStrip::meter_ticks2_expose));
 
-       _route->DropReferences.connect (route_connections, invalidator (*this), boost::bind (&MeterStrip::self_delete, this), gui_context());
-       _route->PropertyChanged.connect (route_connections, invalidator (*this), boost::bind (&MeterStrip::strip_property_changed, this, _1), gui_context());
+       _route->DropReferences.connect (meter_route_connections, invalidator (*this), boost::bind (&MeterStrip::self_delete, this), gui_context());
+       _route->PropertyChanged.connect (meter_route_connections, invalidator (*this), boost::bind (&MeterStrip::strip_property_changed, this, _1), gui_context());
 
        peak_display.signal_button_release_event().connect (sigc::mem_fun(*this, &MeterStrip::peak_button_release), false);
+       name_label.signal_button_release_event().connect (sigc::mem_fun(*this, &MeterStrip::name_label_button_release), false);
 
        UI::instance()->theme_changed.connect (sigc::mem_fun(*this, &MeterStrip::on_theme_changed));
        ColorsChanged.connect (sigc::mem_fun (*this, &MeterStrip::on_theme_changed));
@@ -274,8 +317,10 @@ MeterStrip::MeterStrip (Session* sess, boost::shared_ptr<ARDOUR::Route> rt)
 
 MeterStrip::~MeterStrip ()
 {
-       delete level_meter;
-       CatchDeletion (this);
+       if (level_meter) {
+               delete level_meter;
+               CatchDeletion (this);
+       }
 }
 
 void
@@ -311,7 +356,6 @@ MeterStrip::set_button_names()
 {
        mute_button->set_text (_("M"));
        rec_enable_button->set_text ("");
-       rec_enable_button->set_image (::get_icon (X_("record_normal_red")));
 
        if (_route && _route->solo_safe()) {
                solo_button->set_visual_state (Gtkmm2ext::VisualState (solo_button->visual_state() | Gtkmm2ext::Insensitive));
@@ -331,6 +375,8 @@ MeterStrip::set_button_names()
                }
        }
 
+       monitor_input_button->set_text (_("I"));
+       monitor_disk_button->set_text (_("D"));
 }
 
 void
@@ -339,9 +385,12 @@ MeterStrip::strip_property_changed (const PropertyChange& what_changed)
        if (!what_changed.contains (ARDOUR::Properties::name)) {
                return;
        }
-       ENSURE_GUI_THREAD (*this, &MeterStrip::strip_name_changed, what_changed)
-       name_label.set_text(_route->name());
+       ENSURE_GUI_THREAD (*this, &MeterStrip::strip_name_changed, what_changed);
+       name_changed();
        ARDOUR_UI::instance()->set_tip (name_label, _route->name());
+       if (level_meter) {
+               ARDOUR_UI::instance()->set_tip (*level_meter, _route->name());
+       }
 }
 
 void
@@ -450,13 +499,40 @@ void
 MeterStrip::on_size_allocate (Gtk::Allocation& a)
 {
        const int wh = a.get_height();
-       int nh = ceilf(wh * .11f);
-       if (nh < 52) nh = 52;
-       if (nh > 148) nh = 148;
-       namebx.set_size_request(18, nh);
+       int nh;
+       int mh = 0;
+       if (_session) {
+               mh = _session->config.get_meterbridge_label_height();
+       }
+       switch (mh) {
+               default:
+               case 0:
+                       nh = ceilf(wh * .12f);
+                       if (nh < 52) nh = 52;
+                       if (nh > 148) nh = 148;
+                       break;
+               case 1:
+                       nh = 52;
+                       break;
+               case 2:
+                       nh = 88;
+                       break;
+               case 3:
+                       nh = 106;
+                       break;
+               case 4:
+                       nh = 148;
+                       break;
+       }
+       int tnh = 0;
+       if (_session && _session->config.get_track_name_number()) {
+               tnh = 4 + _session->track_number_decimals() * 8;
+       }
+       namebx.set_size_request(18, nh + tnh);
+       namenumberbx.set_size_request(18, nh + tnh);
        if (_route) {
-               name_label.set_size_request(18, nh-2);
-               name_label.layout()->set_width((nh-4) * PANGO_SCALE);
+               name_label.set_size_request(18, nh + (_route->is_master() ? tnh : -1));
+               name_label.layout()->set_width((nh - 4 + (_route->is_master() ? tnh : 0)) * PANGO_SCALE);
        }
        VBox::on_size_allocate(a);
 }
@@ -474,7 +550,12 @@ MeterStrip::meter_metrics_expose (GdkEventExpose *ev)
 void
 MeterStrip::set_metric_mode (int metricmode, ARDOUR::MeterType mt)
 {
+       if (metric_type == mt && _metricmode == metricmode) {
+               return;
+       }
        metric_type = mt;
+       _metricmode = metricmode;
+
        _types.clear ();
        switch(metricmode) {
                case 0:
@@ -507,6 +588,7 @@ MeterStrip::update_background(MeterType type)
                case MeterIEC1NOR:
                case MeterIEC2BBC:
                case MeterIEC2EBU:
+               case MeterK12:
                case MeterK14:
                case MeterK20:
                        mtr_container.set_name ("meterstripPPM");
@@ -613,6 +695,14 @@ MeterStrip::update_button_box ()
        } else {
                recbox.hide();
        }
+       if (_session->config.get_show_monitor_on_meterbridge()) {
+               height += 18 + 18;
+               mon_in_box.show();
+               mon_disk_box.show();
+       } else {
+               mon_in_box.hide();
+               mon_disk_box.hide();
+       }
        btnbox.set_size_request(16, height);
        check_resize();
 }
@@ -646,11 +736,41 @@ MeterStrip::parameter_changed (std::string const & p)
        else if (p == "show-name-on-meterbridge") {
                update_name_box();
        }
+       else if (p == "show-monitor-on-meterbridge") {
+               update_button_box();
+       }
+       else if (p == "meterbridge-label-height") {
+               queue_resize();
+       }
+       else if (p == "track-name-number") {
+               name_changed();
+               queue_resize();
+       }
 }
 
+void
+MeterStrip::name_changed () {
+       if (!_route) {
+               return;
+       }
+       name_label.set_text(_route->name ());
+       if (_session && _session->config.get_track_name_number()) {
+               const int64_t track_number = _route->track_number ();
+               if (track_number == 0) {
+                       number_label.set_text("-");
+                       number_label.hide();
+               } else {
+                       number_label.set_text (PBD::to_string (abs(_route->track_number ()), std::dec));
+                       number_label.show();
+               }
+               number_label.set_size_request(18, 4 + _session->track_number_decimals() * 8);
+       } else {
+               number_label.hide();
+       }
+}
 
 bool
-MeterStrip::level_meter_button_press (GdkEventButton* ev)
+MeterStrip::level_meter_button_release (GdkEventButton* ev)
 {
        if (ev->button == 3) {
                popup_level_meter_menu (ev);
@@ -671,15 +791,16 @@ MeterStrip::popup_level_meter_menu (GdkEventButton* ev)
        RadioMenuItem::Group group;
 
        _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(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);
-       add_level_meter_item (items, group, ArdourMeter::meter_type_string(MeterIEC2EBU), MeterIEC2EBU);
-       add_level_meter_item (items, group, ArdourMeter::meter_type_string(MeterK20), MeterK20);
-       add_level_meter_item (items, group, ArdourMeter::meter_type_string(MeterK14), MeterK14);
-       add_level_meter_item (items, group, ArdourMeter::meter_type_string(MeterVU),  MeterVU);
+       add_level_meter_type_item (items, group, ArdourMeter::meter_type_string(MeterPeak), MeterPeak);
+       add_level_meter_type_item (items, group, ArdourMeter::meter_type_string(MeterKrms),  MeterKrms);
+       add_level_meter_type_item (items, group, ArdourMeter::meter_type_string(MeterIEC1DIN), MeterIEC1DIN);
+       add_level_meter_type_item (items, group, ArdourMeter::meter_type_string(MeterIEC1NOR), MeterIEC1NOR);
+       add_level_meter_type_item (items, group, ArdourMeter::meter_type_string(MeterIEC2BBC), MeterIEC2BBC);
+       add_level_meter_type_item (items, group, ArdourMeter::meter_type_string(MeterIEC2EBU), MeterIEC2EBU);
+       add_level_meter_type_item (items, group, ArdourMeter::meter_type_string(MeterK20), MeterK20);
+       add_level_meter_type_item (items, group, ArdourMeter::meter_type_string(MeterK14), MeterK14);
+       add_level_meter_type_item (items, group, ArdourMeter::meter_type_string(MeterK12), MeterK12);
+       add_level_meter_type_item (items, group, ArdourMeter::meter_type_string(MeterVU),  MeterVU);
 
        MeterType cmt = _route->meter_type();
        const std::string cmn = ArdourMeter::meter_type_string(cmt);
@@ -696,8 +817,53 @@ MeterStrip::popup_level_meter_menu (GdkEventButton* ev)
        _suspend_menu_callbacks = false;
 }
 
+bool
+MeterStrip::name_label_button_release (GdkEventButton* ev)
+{
+       if (!_session) return true;
+       if (!_session->config.get_show_name_on_meterbridge()) return true;
+
+       if (ev->button == 3) {
+               popup_name_label_menu (ev);
+               return true;
+       }
+
+       return false;
+}
+
 void
-MeterStrip::add_level_meter_item (Menu_Helpers::MenuList& items, RadioMenuItem::Group& group, string const & name, MeterType type)
+MeterStrip::popup_name_label_menu (GdkEventButton* ev)
+{
+       using namespace Gtk::Menu_Helpers;
+
+       Gtk::Menu* m = manage (new Menu);
+       MenuList& items = m->items ();
+
+       RadioMenuItem::Group group;
+
+       _suspend_menu_callbacks = true;
+       add_label_height_item (items, group, _("Variable height"), 0);
+       add_label_height_item (items, group, _("Short"), 1);
+       add_label_height_item (items, group, _("Tall"), 2);
+       add_label_height_item (items, group, _("Grande"), 3);
+       add_label_height_item (items, group, _("Venti"), 4);
+
+       m->popup (ev->button, ev->time);
+       _suspend_menu_callbacks = false;
+}
+
+void
+MeterStrip::add_label_height_item (Menu_Helpers::MenuList& items, RadioMenuItem::Group& group, string const & name, uint32_t h)
+{
+       using namespace Menu_Helpers;
+
+       items.push_back (RadioMenuElem (group, name, sigc::bind (sigc::mem_fun (*this, &MeterStrip::set_label_height), h)));
+       RadioMenuItem* i = dynamic_cast<RadioMenuItem *> (&items.back ());
+       i->set_active (_session && _session->config.get_meterbridge_label_height() == h);
+}
+
+void
+MeterStrip::add_level_meter_type_item (Menu_Helpers::MenuList& items, RadioMenuItem::Group& group, string const & name, MeterType type)
 {
        using namespace Menu_Helpers;
 
@@ -710,9 +876,18 @@ void
 MeterStrip::set_meter_type (MeterType type)
 {
        if (_suspend_menu_callbacks) return;
+       if (_route->meter_type() == type) return;
+
        level_meter->set_type (type);
 }
 
+void
+MeterStrip::set_label_height (uint32_t h)
+{
+       if (_suspend_menu_callbacks) return;
+       _session->config.set_meterbridge_label_height(h);
+}
+
 void
 MeterStrip::meter_type_changed (MeterType type)
 {