kill glib-induced abort caused by asymmetric lock/unlock of diskstream state lock

[ardour.git] / gtk2_ardour / ardour.menus

diff --git a/gtk2_ardour/ardour.menus b/gtk2_ardour/ardour.menus
index 7726add6ead62ec91bc60abbe2126226c73a09c1..e7463553d2fadb399c6768ed8c8f19ddd36e274f 100644 (file)
--- a/gtk2_ardour/ardour.menus
+++ b/gtk2_ardour/ardour.menus
@@ -47,6 +47,9 @@
               <separator/>
                <menuitem action='Record'/>
                <separator/> 
+               <menuitem action='TransitionToRoll'/>
+               <menuitem action='TransitionToReverse'/>
+               <separator/> 
                <menuitem action='jump-forward-to-mark'/>
                <menuitem action='jump-backward-to-mark'/>
                <menuitem action='add-location-from-playhead'/>
@@ -203,6 +206,9 @@
                <menuitem action='scroll-forward'/>
                <menuitem action='scroll-backward'/>
               <separator/>
+               <menuitem action='scroll-playhead-forward'/>
+               <menuitem action='scroll-playhead-backward'/>
+              <separator/>
                <menuitem action='ToggleWaveformVisibility'/>
                <menuitem action='ToggleWaveformsWhileRecording'/>
                <menuitem action='ToggleMeasureVisibility'/>
@@ -285,8 +291,12 @@
                    <menuitem action='OutputAutoConnectMaster'/>
                    <menuitem action='OutputAutoConnectManual'/>
                </menu>
-              <menu action='ControlSurfaces'/>
-               <menu action='Monitoring'>
+              <menu action='ControlSurfaces'>
+                   <menuitem action='RemoteUserDefined'/>
+                   <menuitem action='RemoteMixerDefined'/>
+                   <menuitem action='RemoteEditorDefined'/>
+               </menu>
+                   <menu action='Monitoring'>
                    <menuitem action='UseHardwareMonitoring'/>
                    <menuitem action='UseSoftwareMonitoring'/>
                    <menuitem action='UseExternalMonitoring'/>
@@ -312,6 +322,7 @@
                    <menuitem action='LatchedSolo'/>
                    <menuitem action='SoloInPlace'/>
                    <menuitem action='SoloViaBus'/>
+                   <menuitem action='ShowSoloMutes'/>
                </menu>
               <menu action='Crossfades'>
                   <menuitem action='toggle-xfades-active'/>
@@ -331,9 +342,11 @@
                <menuitem action='SendMMC'/>
                <menuitem action='UseMMC'/>
                <separator/>
+               <menuitem action='UseOSC'/>
                <menuitem action='StopPluginsWithTransport'/>
                <menuitem action='DoNotRunPluginsWhileRecording'/>
                <menuitem action='LatchedRecordEnable'/>
+               <menuitem action='RegionEquivalentsOverlap'/>
                <separator/>
                <menuitem action='VerifyRemoveLastCapture'/>
                <menuitem action='StopRecordingOnXrun'/>