first pass on track mode switch; fixes to dangling region refs after capture; destroy...

[ardour.git] / gtk2_ardour / ardour.menus

diff --git a/gtk2_ardour/ardour.menus b/gtk2_ardour/ardour.menus
index aa6424b8b99e2809fbd1c6958afb475c0449379e..f6c55edc62f3da24996970ef53bab484960ec81d 100644 (file)
--- a/gtk2_ardour/ardour.menus
+++ b/gtk2_ardour/ardour.menus
@@ -131,9 +131,31 @@
                    <menuitem action='zoom-focus-playhead'/>
                    <menuitem action='zoom-focus-edit'/>
                </menu>
+              <menu name='SnapMode' action='SnapMode'>
+                  <menuitem action='snap-normal'/>
+                  <menuitem action='snap-magnetic'/>
+              </menu>
                <menu name='SnapTo' action='SnapTo'>
-                   <menuitem action='snap-to-beat'/>
-                   <menuitem action='snap-to-bar'/>
+                  <menuitem action='snap-to-frame'/>
+                  <menuitem action='snap-to-cd-frame'/>
+                  <menuitem action='snap-to-smpte-frame'/>
+                  <menuitem action='snap-to-smpte-seconds'/>
+                  <menuitem action='snap-to-smpte-minutes'/>
+                  <menuitem action='snap-to-seconds'/>
+                  <menuitem action='snap-to-minutes'/>
+                  <menuitem action='snap-to-thirtyseconds'/>
+                  <menuitem action='snap-to-asixteenthbeat'/>
+                  <menuitem action='snap-to-eighths'/>
+                  <menuitem action='snap-to-quarters'/>
+                  <menuitem action='snap-to-thirds'/>
+                  <menuitem action='snap-to-beat'/>
+                  <menuitem action='snap-to-bar'/>
+                  <menuitem action='snap-to-mark'/>
+                  <menuitem action='snap-to-edit-cursor'/>
+                  <menuitem action='snap-to-region-start'/>
+                  <menuitem action='snap-to-region-end'/>
+                  <menuitem action='snap-to-region-sync'/>
+                  <menuitem action='snap-to-region-boundary'/>
                </menu>
                <menu name='MeterFalloff' action='MeterFalloff'>
                     <menuitem action='MeterFalloffOff'/>
@@ -194,7 +216,6 @@
                <menuitem action='ToggleOptionsEditor'/>
                <menuitem action='ToggleSoundFileBrowser'/>
                <menuitem action='ToggleInspector'/>
-               <menuitem action='ToggleConnections'/>
                <menuitem action='ToggleLocations'/>
                <menuitem action='ToggleColorManager'/>
                <menuitem action='ToggleBigClock'/>
@@ -239,11 +260,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 +299,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 +312,6 @@
                <menuitem action='SendMTC'/>
                <menuitem action='SendMMC'/>
                <menuitem action='UseMMC'/>
-               <menuitem action='SendMIDIfeedback'/>
-               <menuitem action='UseMIDIcontrol'/>
                <separator/>
                <menuitem action='StopPluginsWithTransport'/>
                <menuitem action='DoNotRunPluginsWhileRecording'/>