Merge branch 'nsm' of https://github.com/royvegard/ardour

[ardour.git] / gtk2_ardour / route_time_axis.cc

diff --git a/gtk2_ardour/route_time_axis.cc b/gtk2_ardour/route_time_axis.cc
index 4f2164f3aa3949c74558d185624b483979e949b0..d37b981647548ba89df8b00042de7a2972d5808c 100644 (file)
--- a/gtk2_ardour/route_time_axis.cc
+++ b/gtk2_ardour/route_time_axis.cc
@@ -112,8 +112,6 @@ RouteTimeAxisView::set_route (boost::shared_ptr<Route> rt)
 {
        RouteUI::set_route (rt);
 
-       show_name_label ();
-       
        gm.set_controls (_route, _route->shared_peak_meter(), _route->amp());
        gm.get_level_meter().set_no_show_all();
        gm.get_level_meter().setup_meters(50);
@@ -247,7 +245,7 @@ RouteTimeAxisView::set_route (boost::shared_ptr<Route> rt)
 
        route_group_menu = new RouteGroupMenu (_session, plist);
 
-       // gm.get_gain_slider().signal_scroll_event().connect(sigc::mem_fun(*this, &RouteTimeAxisView::controls_ebox_scroll), false);
+       gm.get_gain_slider().signal_scroll_event().connect(sigc::mem_fun(*this, &RouteTimeAxisView::controls_ebox_scroll), false);
 
        gm.get_level_meter().signal_scroll_event().connect (sigc::mem_fun (*this, &RouteTimeAxisView::controls_ebox_scroll), false);
 }
@@ -323,11 +321,6 @@ RouteTimeAxisView::label_view ()
 {
        string x = _route->name();
 
-       if (name_entry && x != name_entry->get_text()) {
-               name_entry->set_text (x);
-               ARDOUR_UI::instance()->set_tip (*name_entry, Glib::Markup::escape_text(x));
-       }
-
        if (x != name_label.get_text()) {
                name_label.set_text (x);
        }
@@ -394,14 +387,13 @@ RouteTimeAxisView::build_automation_action_menu (bool for_selection)
        items.push_back (MenuElem (_("Hide All Automation"),
                                   sigc::bind (sigc::mem_fun (*this, &RouteTimeAxisView::hide_all_automation), for_selection)));
 
-       items.push_back (SeparatorElem ());
-
        /* Attach the plugin submenu. It may have previously been used elsewhere,
           so it was detached above 
        */
        
        if (!subplugin_menu.items().empty()) {
-               items.push_back (MenuElem (_("Plugins"), subplugin_menu));
+               items.push_back (SeparatorElem ());
+               items.push_back (MenuElem (_("Processor automation"), subplugin_menu));
                items.back().set_sensitive (!for_selection || _editor.get_selection().tracks.size() == 1);;
        }
 }
@@ -646,10 +638,6 @@ RouteTimeAxisView::build_display_menu ()
                        items.push_back (MenuElem (_("Mode"), *mode_menu));
                }
 
-               color_mode_menu = build_color_mode_menu();
-               if (color_mode_menu) {
-                       items.push_back (MenuElem (_("Color Mode"), *color_mode_menu));
-               }
 
                items.push_back (SeparatorElem());