merge with master.

[ardour.git] / gtk2_ardour / meter_strip.cc

diff --git a/gtk2_ardour/meter_strip.cc b/gtk2_ardour/meter_strip.cc
index 92f1a0e1c0b911ca73ced749d66046905efd2cd8..fd38da65e6b606a32d769658b5eb9903f7f662ee 100644 (file)
--- a/gtk2_ardour/meter_strip.cc
+++ b/gtk2_ardour/meter_strip.cc
@@ -48,6 +48,7 @@
 #include "i18n.h"
 
 using namespace ARDOUR;
+using namespace ARDOUR_UI_UTILS;
 using namespace PBD;
 using namespace Gtk;
 using namespace Gtkmm2ext;
@@ -114,14 +115,15 @@ 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;
@@ -162,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);
@@ -174,8 +180,16 @@ MeterStrip::MeterStrip (Session* sess, boost::shared_ptr<ARDOUR::Route> rt)
        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);
@@ -191,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);
@@ -245,6 +260,7 @@ 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();
@@ -255,7 +271,7 @@ MeterStrip::MeterStrip (Session* sess, boost::shared_ptr<ARDOUR::Route> rt)
        }
 
        _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));
@@ -271,8 +287,8 @@ 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);
@@ -340,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));
@@ -370,8 +385,8 @@ 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());
@@ -509,10 +524,15 @@ MeterStrip::on_size_allocate (Gtk::Allocation& a)
                        nh = 148;
                        break;
        }
-       namebx.set_size_request(18, nh);
+       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);
 }
@@ -722,6 +742,31 @@ MeterStrip::parameter_changed (std::string const & p)
        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