fix pathscanner / stl_vector related memory leaks

[ardour.git] / gtk2_ardour / ardour.menus.in

diff --git a/gtk2_ardour/ardour.menus.in b/gtk2_ardour/ardour.menus.in
index 5b10a4f2c2207335a11a6f10210f31fed8a09049..6d08937cf05547e162e8360fd2425ddb9d693012 100644 (file)
--- a/gtk2_ardour/ardour.menus.in
+++ b/gtk2_ardour/ardour.menus.in
@@ -47,16 +47,16 @@
         <menuitem action='CleanupUnused'/>
         <menuitem action='FlushWastebasket'/>
       </menu>
-#ifndef GTKOSX
       <separator/>
-#endif
       <menuitem action='toggle-session-options-editor'/>
-#ifdef GTKOSX
-      <menuitem action='toggle-rc-options-editor'/>
+#ifdef GTKOSX      
       <menuitem action='toggle-about'/>
+      <menuitem action='toggle-rc-options-editor'/>
 #endif
+#ifndef GTKOSX
       <separator/>
       <menuitem action='Quit'/>
+#endif
     </menu>
 
     <menu name='Transport' action='Transport'>
@@ -288,6 +288,7 @@
         <menuitem action='nudge-backward'/>
         <menuitem action='nudge-forward-by-capture-offset'/>
         <menuitem action='nudge-backward-by-capture-offset'/>
+       <menuitem action='sequence-regions'/>
       </menu>
       <menu action='RegionMenuTrim'>
         <menuitem action='trim-front'/>
@@ -341,6 +342,7 @@
 
     <menu name='View' action = 'View'>
       <menuitem action='ToggleMaximalEditor'/>
+      <menuitem action='ToggleMaximalMixer'/>
       <menuitem action='KeepTearoffs'/>
 
       <separator/>
@@ -489,34 +491,22 @@
       <menuitem action='ToggleGroupTabs'/>
       <menuitem action='show-marker-lines'/>
     </menu>
-    <menu name='JACK' action='JACK'>
-      <menuitem action='JACKDisconnect'/>
-      <menuitem action='JACKReconnect'/>
-      <menu name='Latency' action='Latency'>
-        <menuitem action='JACKLatency32'/>
-        <menuitem action='JACKLatency64'/>
-        <menuitem action='JACKLatency128'/>
-        <menuitem action='JACKLatency256'/>
-        <menuitem action='JACKLatency512'/>
-        <menuitem action='JACKLatency1024'/>
-        <menuitem action='JACKLatency2048'/>
-        <menuitem action='JACKLatency4096'/>
-        <menuitem action='JACKLatency8192'/>
-      </menu>
-    </menu>
     <menu action = 'WindowMenu'>
+      <menuitem action='toggle-audio-midi-setup'/>
+      <separator/>
       <menuitem action='toggle-mixer'/>
+      <menuitem action='toggle-meterbridge'/>
       <menuitem action='toggle-editor-mixer'/>
-
       <separator/>
-
       <menuitem action='toggle-inspector'/>
       <menuitem action='toggle-locations'/>
       <menuitem action='toggle-key-editor'/>
       <menuitem action='toggle-bundle-manager'/>
       <menuitem action='toggle-theme-manager'/>
       <menuitem action='toggle-big-clock'/>
+#if 0
       <menuitem action='toggle-speaker-config'/>
+#endif
 
       <separator/>
 
@@ -552,8 +542,8 @@
     <menuitem action="toggle-marker-ruler"/>
     <menuitem action="toggle-cd-marker-ruler"/>
     <menuitem action="toggle-loop-punch-ruler"/>
-         <separator/>
-         <menuitem action="toggle-video-ruler"/>
+    <separator/>
+    <menuitem action="toggle-video-ruler"/>
   </popup>
 
   <popup name='ProcessorMenu'>
@@ -563,6 +553,7 @@
     <menuitem action='newaux'/>
     <separator/>
     <menuitem action='controls'/>
+    <menuitem action='send_options'/>
     <separator/>
     <menuitem action='clear'/>
     <menuitem action='clear_pre'/>
@@ -657,6 +648,7 @@
       <menuitem action='nudge-backward'/>
       <menuitem action='nudge-forward-by-capture-offset'/>
       <menuitem action='nudge-backward-by-capture-offset'/>
+      <menuitem action='sequence-regions'/>
     </menu>
     <menu action='RegionMenuTrim'>
       <menuitem action='trim-front'/>