show track-number in GUI

diff --git a/gtk2_ardour/meter_strip.cc b/gtk2_ardour/meter_strip.cc
index ee3ed52c7fa107d3cd6024f2a6032d1c44c82304..198ca28f05779d5108a0d2a5dd89cb8fe000be17 100644 (file)
--- a/gtk2_ardour/meter_strip.cc
+++ b/gtk2_ardour/meter_strip.cc
@@ -163,8 +163,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);
@@ -175,8 +179,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);
@@ -246,6 +258,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();
@@ -371,8 +384,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());
@@ -510,10 +523,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 = 3 + _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);
 }
@@ -723,6 +741,30 @@ MeterStrip::parameter_changed (std::string const & p)
        else if (p == "meterbridge-label-height") {
                queue_resize();
        }
+       else if (p == "track-name-number") {
+               name_changed();
+       }
+}
+
+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, 3 + _session->track_number_decimals() * 8);
+       } else {
+               number_label.hide();
+       }
 }
 
 bool

diff --git a/gtk2_ardour/meter_strip.h b/gtk2_ardour/meter_strip.h
index e1bae713265059c78bdb16df7a75c9dab76b52e7..5436df1ebb311dbe585a72e279652971e5031681 100644 (file)
--- a/gtk2_ardour/meter_strip.h
+++ b/gtk2_ardour/meter_strip.h
@@ -100,7 +100,9 @@ class MeterStrip : public Gtk::VBox, public RouteUI
        Gtk::HBox meterbox;
        Gtk::HBox spacer;
        Gtk::HBox namebx;
+       Gtk::VBox namenumberbx;
        ArdourButton name_label;
+       ArdourButton number_label;
        Gtk::DrawingArea meter_metric_area;
        Gtk::DrawingArea meter_ticks1_area;
        Gtk::DrawingArea meter_ticks2_area;
@@ -128,7 +130,6 @@ class MeterStrip : public Gtk::VBox, public RouteUI
 
        LevelMeterHBox *level_meter;
 
-       PBD::ScopedConnection _config_connection;
        void strip_property_changed (const PBD::PropertyChange&);
        void meter_configuration_changed (ARDOUR::ChanCount);
        void meter_type_changed (ARDOUR::MeterType);
@@ -140,6 +141,7 @@ class MeterStrip : public Gtk::VBox, public RouteUI
        void redraw_metrics ();
        void update_button_box ();
        void update_name_box ();
+       void name_changed ();
 
        bool _suspend_menu_callbacks;
        bool level_meter_button_release (GdkEventButton* ev);

diff --git a/gtk2_ardour/mixer_strip.cc b/gtk2_ardour/mixer_strip.cc
index 981b6913c360ce43e7ae57b9b7481bd04fab528e..005993e23d31cd787c4cdbfbe31c5e3b4dc24ca1 100644 (file)
--- a/gtk2_ardour/mixer_strip.cc
+++ b/gtk2_ardour/mixer_strip.cc
@@ -380,6 +380,7 @@ MixerStrip::init ()
        parameter_changed (X_("mixer-strip-visibility"));
 
        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());
 
        gpm.LevelMeterButtonPress.connect_same_thread (_level_meter_connection, boost::bind (&MixerStrip::level_meter_button_press, this, _1));
 }
@@ -1602,10 +1603,19 @@ MixerStrip::name_changed ()
 {
        switch (_width) {
        case Wide:
-               name_button.set_text (_route->name());
+               if (_session->config.get_track_name_number()) {
+                       name_button.set_markup(track_number_to_string (_route->track_number (), " ", _route->name ()));
+               } else {
+                       name_button.set_text (_route->name());
+               }
                break;
        case Narrow:
-               name_button.set_text (PBD::short_version (_route->name(), 5));
+               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 {
+                       name_button.set_text (PBD::short_version (_route->name(), 5));
+               }
                break;
        }
 
@@ -2079,6 +2089,9 @@ MixerStrip::parameter_changed (string p)
                */
                _visibility.set_state (Config->get_mixer_strip_visibility ());
        }
+       else if (p == "track-name-number") {
+               name_changed ();
+       }
 }
 
 /** Called to decide whether the solo isolate / solo lock button visibility should

diff --git a/gtk2_ardour/mixer_strip.h b/gtk2_ardour/mixer_strip.h
index 883bfffdba14a131fa8347373c20e74e7165f689..afb165f36a620d05f0a777d3b3af1bc63994f6cc 100644 (file)
--- a/gtk2_ardour/mixer_strip.h
+++ b/gtk2_ardour/mixer_strip.h
@@ -305,7 +305,7 @@ class MixerStrip : public RouteUI, public Gtk::EventBox
        VisibilityGroup _visibility;
        boost::optional<bool> override_solo_visibility () const;
 
-       PBD::ScopedConnection _config_connection;
+       PBD::ScopedConnectionList _config_connection;
 
        void add_input_port (ARDOUR::DataType);
        void add_output_port (ARDOUR::DataType);

diff --git a/gtk2_ardour/route_time_axis.cc b/gtk2_ardour/route_time_axis.cc
index 463d40b7843b89e0f7daf71eb761dba35a483c35..e6a8f59be093fbf4299e5ae0783475d249a3a700 100644 (file)
--- a/gtk2_ardour/route_time_axis.cc
+++ b/gtk2_ardour/route_time_axis.cc
@@ -108,6 +108,11 @@ RouteTimeAxisView::RouteTimeAxisView (PublicEditor& ed, Session* sess, ArdourCan
        , gm (sess, true, 125, 18)
        , _ignore_set_layer_display (false)
 {
+       number_label.set_corner_radius(2);
+       number_label.set_name("tracknumber label");
+       number_label.set_alignment(.5, .5);
+
+       sess->config.ParameterChanged.connect (*this, invalidator (*this), boost::bind (&RouteTimeAxisView::parameter_changed, this, _1), gui_context());
 }
 
 void
@@ -201,6 +206,7 @@ RouteTimeAxisView::set_route (boost::shared_ptr<Route> rt)
        _route->meter_change.connect (*this, invalidator (*this), bind (&RouteTimeAxisView::meter_changed, this), gui_context());
        _route->input()->changed.connect (*this, invalidator (*this), boost::bind (&RouteTimeAxisView::io_changed, this, _1, _2), gui_context());
        _route->output()->changed.connect (*this, invalidator (*this), boost::bind (&RouteTimeAxisView::io_changed, this, _1, _2), gui_context());
+       _route->track_number_changed.connect (*this, invalidator (*this), boost::bind (&RouteTimeAxisView::label_view, this), gui_context());
 
        controls_table.attach (*mute_button, 6, 7, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND, 0, 0);
 
@@ -223,6 +229,7 @@ RouteTimeAxisView::set_route (boost::shared_ptr<Route> rt)
                ARDOUR_UI::instance()->set_tip(automation_button, _("Automation"));
        }
 
+       update_track_number_visibility();
        label_view ();
 
        if (!ARDOUR::Profile->get_trx()) {
@@ -337,12 +344,53 @@ RouteTimeAxisView::playlist_changed ()
 void
 RouteTimeAxisView::label_view ()
 {
-       string x = _route->name();
-
-       if (x != name_label.get_text()) {
+       string x = _route->name ();
+       if (x != name_label.get_text ()) {
                name_label.set_text (x);
        }
+       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));
+       }
+}
+
+void
+RouteTimeAxisView::update_track_number_visibility ()
+{
+       bool show_label = _session->config.get_track_name_number();
+
+       if (_route && _route->is_master()) {
+               show_label = false;
+       }
 
+       //if (show_label == number_label.is_visible()) { return; }
+       if (number_label.get_parent()) {
+               controls_table.remove (number_label);
+       }
+       if (name_hbox.get_parent()) {
+               controls_table.remove (name_hbox);
+       }
+       if (show_label) {
+               controls_table.attach (number_label, 0, 1, 0, 1,  Gtk::SHRINK, Gtk::FILL|Gtk::EXPAND, 3, 0);
+               controls_table.attach (name_hbox, 1, 5, 0, 1,  Gtk::FILL|Gtk::EXPAND,  Gtk::FILL|Gtk::EXPAND, 3, 0);
+               number_label.set_size_request(3 + _session->track_number_decimals() * 8, -1);
+               name_hbox.show ();
+               number_label.show ();
+       } else {
+               controls_table.attach (name_hbox, 0, 5, 0, 1,  Gtk::FILL|Gtk::EXPAND,  Gtk::FILL|Gtk::EXPAND, 3, 0);
+               name_hbox.show ();
+               number_label.hide ();
+       }
+}
+
+void
+RouteTimeAxisView::parameter_changed (string const & p)
+{
+       if (p == "track-name-number") {
+               update_track_number_visibility();
+       }
 }
 
 void

diff --git a/gtk2_ardour/route_time_axis.h b/gtk2_ardour/route_time_axis.h
index 2d854c451adb714ac6c4083e64bfdbb40a2227f5..3a717f0953dd784f059115987a52d22ed6f92b63 100644 (file)
--- a/gtk2_ardour/route_time_axis.h
+++ b/gtk2_ardour/route_time_axis.h
@@ -252,6 +252,7 @@ protected:
        ArdourButton route_group_button;
        ArdourButton playlist_button;
        ArdourButton automation_button;
+       ArdourButton number_label;
 
        Gtk::Menu           subplugin_menu;
        Gtk::Menu*          automation_action_menu;
@@ -303,6 +304,8 @@ private:
 
        void remove_child (boost::shared_ptr<TimeAxisView>);
        void update_playlist_tip ();
+       void parameter_changed (std::string const & p);
+       void update_track_number_visibility();
 };
 
 #endif /* __ardour_route_time_axis_h__ */