Remove references to a "master faders" window. We went the other way.

diff --git a/gtk2_ardour/ardour.menus.in b/gtk2_ardour/ardour.menus.in
index d5cb227cb3159a160b87f7466f81f503a15c752c..d8ea6eb669502c61015c8c6a1187402dbe7b1f3a 100644 (file)
--- a/gtk2_ardour/ardour.menus.in
+++ b/gtk2_ardour/ardour.menus.in
@@ -558,12 +558,6 @@
         <menuitem action='attach-preferences'/>
         <menuitem action='detach-preferences'/>
       </menu>
-      <menu action='MastersMenu'>
-          <menuitem action='show-preferences'/>
-          <menuitem action='hide-preferences'/>
-          <menuitem action='attach-preferences'/>
-          <menuitem action='detach-preferences'/>
-      </menu>
       <menuitem action='toggle-meterbridge'/>
       <menuitem action='toggle-luawindow'/>
       <separator/>

diff --git a/gtk2_ardour/ardour_ui_ed.cc b/gtk2_ardour/ardour_ui_ed.cc
index de014b0d34c9b9745510de5c5738de524b6d615a..5c9fbd04aa232aaea40a746024140a421cbffc0e 100644 (file)
--- a/gtk2_ardour/ardour_ui_ed.cc
+++ b/gtk2_ardour/ardour_ui_ed.cc
@@ -134,7 +134,6 @@ ARDOUR_UI::install_actions ()
        global_actions.register_action (main_menu_actions, X_("MixerMenu"), _("Mixer"));
        global_actions.register_action (main_menu_actions, X_("EditorMenu"), _("Editor"));
        global_actions.register_action (main_menu_actions, X_("PrefsMenu"), _("Preferences"));
-       global_actions.register_action (main_menu_actions, X_("MastersMenu"), _("Master Faders"));
        global_actions.register_action (main_menu_actions, X_("DetachMenu"), _("Detach"));
        global_actions.register_action (main_menu_actions, X_("Help"), _("Help"));
        global_actions.register_action (main_menu_actions, X_("KeyMouseActions"), _("Misc. Shortcuts"));