Rename Route Group -> Group in the GUI, and give busses
authorCarl Hetherington <carl@carlh.net>
Wed, 23 May 2012 19:01:28 +0000 (19:01 +0000)
committerCarl Hetherington <carl@carlh.net>
Wed, 23 May 2012 19:01:28 +0000 (19:01 +0000)
route group and automation menu items in their right-click
menus, not just tracks.

git-svn-id: svn://localhost/ardour2/branches/3.0@12399 d708f5d6-7413-0410-9779-e7cbd77b26cf

gtk2_ardour/route_time_axis.cc

index 4d50a412722d114ca444a5e100c174474060e500..8fc9b901406625a4d6cb0a64f909f7b6ed99d565 100644 (file)
@@ -665,30 +665,30 @@ RouteTimeAxisView::build_display_menu ()
                build_playlist_menu ();
                items.push_back (MenuElem (_("Playlist"), *playlist_action_menu));
                items.back().set_sensitive (_editor.get_selection().tracks.size() <= 1);
+       }
 
-               route_group_menu->detach ();
-
-               WeakRouteList r;
-               for (TrackSelection::iterator i = _editor.get_selection().tracks.begin(); i != _editor.get_selection().tracks.end(); ++i) {
-                       RouteTimeAxisView* rtv = dynamic_cast<RouteTimeAxisView*> (*i);
-                       if (rtv) {
-                               r.push_back (rtv->route ());
-                       }
-               }
-
-               if (r.empty ()) {
-                       r.push_back (route ());
+       route_group_menu->detach ();
+       
+       WeakRouteList r;
+       for (TrackSelection::iterator i = _editor.get_selection().tracks.begin(); i != _editor.get_selection().tracks.end(); ++i) {
+               RouteTimeAxisView* rtv = dynamic_cast<RouteTimeAxisView*> (*i);
+               if (rtv) {
+                       r.push_back (rtv->route ());
                }
-
-               route_group_menu->build (r);
-               items.push_back (MenuElem (_("Route Group"), *route_group_menu->menu ()));
-
-               build_automation_action_menu (true);
-               items.push_back (MenuElem (_("Automation"), *automation_action_menu));
-
-               items.push_back (SeparatorElem());
+       }
+       
+       if (r.empty ()) {
+               r.push_back (route ());
        }
 
+       route_group_menu->build (r);
+       items.push_back (MenuElem (_("Group"), *route_group_menu->menu ()));
+       
+       build_automation_action_menu (true);
+       items.push_back (MenuElem (_("Automation"), *automation_action_menu));
+       
+       items.push_back (SeparatorElem());
+       
        int active = 0;
        int inactive = 0;
        TrackSelection const & s = _editor.get_selection().tracks;