Consolidate code

diff --git a/gtk2_ardour/mixer_strip.cc b/gtk2_ardour/mixer_strip.cc
index 2b1d01d913cb6bf972ab72e2e517ab6f2be73964..91f93f9546628cb83f94a71dc082cb6f903a6259 100644 (file)
--- a/gtk2_ardour/mixer_strip.cc
+++ b/gtk2_ardour/mixer_strip.cc
@@ -1704,7 +1704,8 @@ MixerStrip::build_route_ops_menu ()
 
        if (!Profile->get_mixbus()) {
                items.push_back (MenuElem (_("Rename..."), sigc::mem_fun(*this, &RouteUI::route_rename)));
-               rename_menu_item = &items.back();
+               /* do not allow rename if the track is record-enabled */
+               items.back().set_sensitive (!is_track() || !track()->rec_enable_control()->get_value());
        }
 
        items.push_back (SeparatorElem());
@@ -1773,8 +1774,6 @@ MixerStrip::name_button_button_press (GdkEventButton* ev)
        if (ev->button == 1 || ev->button == 3) {
                list_route_operations ();
 
-               /* do not allow rename if the track is record-enabled */
-               rename_menu_item->set_sensitive (!is_track() || !track()->rec_enable_control()->get_value());
                if (ev->button == 1) {
                        Gtkmm2ext::anchored_menu_popup(route_ops_menu, &name_button, "",
                                                       1, ev->time);
@@ -1794,8 +1793,6 @@ MixerStrip::number_button_button_press (GdkEventButton* ev)
        if (  ev->button == 3 ) {
                list_route_operations ();
 
-               /* do not allow rename if the track is record-enabled */
-               rename_menu_item->set_sensitive (!is_track() || !track()->rec_enable_control()->get_value());
                route_ops_menu->popup (1, ev->time);
 
                return true;

diff --git a/gtk2_ardour/mixer_strip.h b/gtk2_ardour/mixer_strip.h
index e40c38ff40778dc7eee3fc431c87587afd7df91d..a8e80d8afad157c6dcff8dab4c89855cd7f4f2e5 100644 (file)
--- a/gtk2_ardour/mixer_strip.h
+++ b/gtk2_ardour/mixer_strip.h
@@ -247,7 +247,6 @@ class MixerStrip : public AxisView, public RouteUI, public Gtk::EventBox
        void io_changed_proxy ();
 
        Gtk::Menu *send_action_menu;
-       Gtk::MenuItem* rename_menu_item;
        void build_send_action_menu ();
 
        PBD::ScopedConnection panstate_connection;