Merged with trunk R992.

[ardour.git] / gtk2_ardour / ardour.menus

diff --git a/gtk2_ardour/ardour.menus b/gtk2_ardour/ardour.menus
index d213b4a53c0eb6613c4fdeeaf41b27e815afb904..845acac40080fd2a509c5efbba03708a84b57c59 100644 (file)
--- a/gtk2_ardour/ardour.menus
+++ b/gtk2_ardour/ardour.menus
@@ -239,11 +239,12 @@
                </menu>
                <separator/>
                <menu action='Autoconnect'>
-                   <menuitem action='AutoConnectNewTrackInputsToHardware'/>
+                   <menuitem action='InputAutoConnectPhysical'/>
+                   <menuitem action='InputAutoConnectManual'/>
                   <separator/>
-                   <menuitem action='AutoConnectNewTrackOutputsToHardware'/>
-                   <menuitem action='AutoConnectNewTrackOutputsToMaster'/>
-                   <menuitem action='ManuallyConnectNewTrackOutputs'/>
+                   <menuitem action='OutputAutoConnectPhysical'/>
+                   <menuitem action='OutputAutoConnectMaster'/>
+                   <menuitem action='OutputAutoConnectManual'/>
                </menu>
               <menu action='ControlSurfaces'/>
                <menu action='Monitoring'>
@@ -277,7 +278,6 @@
                   <menuitem action='toggle-xfades-active'/>
                   <menuitem action='toggle-xfades-visible'/>
                   <menuitem action='toggle-auto-xfades'/>
-                   <menuitem action='UnmuteNewFullCrossfades'/>
                   <separator/>
                   <menuitem action='CrossfadesFull'/>
                   <menuitem action='CrossfadesShort'/>
@@ -291,8 +291,6 @@
                <menuitem action='SendMTC'/>
                <menuitem action='SendMMC'/>
                <menuitem action='UseMMC'/>
-               <menuitem action='SendMIDIfeedback'/>
-               <menuitem action='UseMIDIcontrol'/>
                <separator/>
                <menuitem action='StopPluginsWithTransport'/>
                <menuitem action='DoNotRunPluginsWhileRecording'/>