remove unique track number from meterbridge

diff --git a/gtk2_ardour/meter_strip.cc b/gtk2_ardour/meter_strip.cc
index de8697037ec550d62733c620b1f28d9bca535453..5fdb6263b0088fc5db06cfbeecdd08ce7f65af89 100644 (file)
--- a/gtk2_ardour/meter_strip.cc
+++ b/gtk2_ardour/meter_strip.cc
@@ -65,7 +65,6 @@ MeterStrip::MeterStrip (int metricmode)
        set_spacing(2);
        peakbx.set_size_request(-1, 14);
        namebx.set_size_request(18, 52);
-       numbx.set_size_request(18, 18);
 
        set_metric_mode(metricmode);
 
@@ -80,7 +79,6 @@ MeterStrip::MeterStrip (int metricmode)
        pack_start (meterbox, true, true);
        pack_start (btnbox, false, false);
        pack_start (namebx, false, false);
-       pack_start (numbx, false, false);
 
        peakbx.show();
        btnbox.show();
@@ -149,27 +147,9 @@ MeterStrip::MeterStrip (Session* sess, boost::shared_ptr<ARDOUR::Route> rt)
        name_label.set_alignment(-1.0, .5);
        ARDOUR_UI::instance()->set_tip (name_label, _route->name());
 
-       number_label.set_alignment(.5, .5);
-       number_label.set_name("meterbridge label");
-       number_label.set_corner_radius(2);
-       number_label.set_size_request(18, 18);
-
-       if (_route->unique_id() > 0) {
-               char buf[12];
-               snprintf(buf, 12, "%d", _route->unique_id());
-               number_label.set_text(buf);
-               number_label.show();
-       } else {
-               number_label.set_text("");
-               number_label.hide();
-       }
-
        namebx.set_size_request(18, 52);
        namebx.pack_start(name_label, true, false, 3);
 
-       numbx.set_size_request(18, 18);
-       numbx.pack_start(number_label, true, false, 3);
-
        recbox.pack_start(*rec_enable_button, true, false);
        btnbox.pack_start(recbox, false, false, 1);
        mutebox.pack_start(*mute_button, true, false);
@@ -195,7 +175,6 @@ MeterStrip::MeterStrip (Session* sess, boost::shared_ptr<ARDOUR::Route> rt)
 
        pack_start (peakbx, false, false);
        pack_start (meterbox, true, true);
-       pack_start (numbx, false, false);
        pack_start (btnbox, false, false);
        pack_start (namebx, false, false);
        name_label.show();
@@ -525,11 +504,6 @@ void
 MeterStrip::update_name_box ()
 {
        if (!_session) return;
-       if (_session->config.get_show_id_on_meterbridge()) {
-               numbx.show();
-       } else {
-               numbx.hide();
-       }
        if (_session->config.get_show_name_on_meterbridge()) {
                namebx.show();
        } else {
@@ -555,9 +529,6 @@ MeterStrip::parameter_changed (std::string const & p)
        else if (p == "show-name-on-meterbridge") {
                update_name_box();
        }
-       else if (p == "show-id-on-meterbridge") {
-               update_name_box();
-       }
 }
 
 

diff --git a/gtk2_ardour/meter_strip.h b/gtk2_ardour/meter_strip.h
index c81b0e54099b1afc99852a4db9d82fec1fce7b0c..60e77eb2ef6b9b3dea8f9e407928125096860866 100644 (file)
--- a/gtk2_ardour/meter_strip.h
+++ b/gtk2_ardour/meter_strip.h
@@ -90,9 +90,7 @@ class MeterStrip : public Gtk::VBox, public RouteUI
   private:
        Gtk::HBox meterbox;
        Gtk::HBox namebx;
-       Gtk::HBox numbx;
        ArdourButton name_label;
-       ArdourButton number_label;
        Gtk::DrawingArea meter_metric_area;
        Gtk::DrawingArea meter_ticks1_area;
        Gtk::DrawingArea meter_ticks2_area;

diff --git a/gtk2_ardour/meterbridge.cc b/gtk2_ardour/meterbridge.cc
index 15e98a5d4dfbc955b53088c7059c194a3346ed21..9dee2beeaa2ffb5edba23092faf2b944d062bc49 100644 (file)
--- a/gtk2_ardour/meterbridge.cc
+++ b/gtk2_ardour/meterbridge.cc
@@ -679,9 +679,6 @@ Meterbridge::parameter_changed (std::string const & p)
        else if (p == "show-name-on-meterbridge") {
                scroller.queue_resize();
        }
-       else if (p == "show-id-on-meterbridge") {
-               scroller.queue_resize();
-       }
 }
 
 void

diff --git a/gtk2_ardour/session_option_editor.cc b/gtk2_ardour/session_option_editor.cc
index f097547eede23346b300ae2dd9d7ef8bb25752f7..1815db10567e21f60c288ae81011e5fe0f59c1e1 100644 (file)
--- a/gtk2_ardour/session_option_editor.cc
+++ b/gtk2_ardour/session_option_editor.cc
@@ -327,13 +327,6 @@ SessionOptionEditor::SessionOptionEditor (Session* s)
                            sigc::mem_fun (*_session_config, &SessionConfiguration::set_show_name_on_meterbridge)
                            ));
 
-       add_option (_("Meterbridge"), new BoolOption (
-                           "show-id-on-meterbridge",
-                           _("Track ID"),
-                           sigc::mem_fun (*_session_config, &SessionConfiguration::get_show_id_on_meterbridge),
-                           sigc::mem_fun (*_session_config, &SessionConfiguration::set_show_id_on_meterbridge)
-                           ));
-
 }
 
 void

diff --git a/libs/ardour/ardour/session_configuration_vars.h b/libs/ardour/ardour/session_configuration_vars.h
index 2605eb94420633fd3504d82e18880e0c228c1f18..ebeebbe1fd76a0be86c7e59111012050f91d9213 100644 (file)
--- a/libs/ardour/ardour/session_configuration_vars.h
+++ b/libs/ardour/ardour/session_configuration_vars.h
@@ -64,4 +64,3 @@ CONFIG_VARIABLE (bool, show_rec_on_meterbridge, "show-rec-on-meterbridge", true)
 CONFIG_VARIABLE (bool, show_mute_on_meterbridge, "show-mute-on-meterbridge", false)
 CONFIG_VARIABLE (bool, show_solo_on_meterbridge, "show-solo-on-meterbridge", false)
 CONFIG_VARIABLE (bool, show_name_on_meterbridge, "show-name-on-meterbridge", true)
-CONFIG_VARIABLE (bool, show_id_on_meterbridge, "show-id-on-meterbridge", false)