fix meter(s) when mixer-strip is switched to AuxSend

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

diff --git a/gtk2_ardour/ardour.menus.in b/gtk2_ardour/ardour.menus.in
index 632136c73424d8e1e43947e20c74009fb4496783..b6328963bb1437dce2594d897a03b1172303fb7e 100644 (file)
--- a/gtk2_ardour/ardour.menus.in
+++ b/gtk2_ardour/ardour.menus.in
@@ -35,10 +35,9 @@
       <menuitem action='addExistingAudioFiles'/>
       <!--menuitem action='importFromSession'/-->
 
-#ifndef GTKOSX
       <menuitem action='OpenVideo'/>
       <menuitem action='CloseVideo'/>
-#endif
+
       <menu name='Export' action='Export'>
         <menuitem action='ExportAudio'/>
         <menuitem action='StemExport'/>
@@ -282,9 +281,7 @@
         <menuitem action='snap-regions-to-grid'/>
         <menuitem action='toggle-region-lock'/>
         <menuitem action='toggle-region-lock-style'/>
-#ifndef GTKOSX
         <menuitem action='toggle-region-video-lock'/>
-#endif
         <menuitem action='set-region-sync-position'/>
         <menuitem action='remove-region-sync'/>
         <menuitem action='nudge-forward'/>
@@ -437,9 +434,7 @@
         <menuitem action="toggle-cd-marker-ruler"/>
         <menuitem action="toggle-marker-ruler"/>
         <separator/>
-#ifndef GTKOSX
         <menuitem action="toggle-video-ruler"/>
-#endif
       </menu>
       <menu action="VideoMonitorMenu">
         <menuitem action="zoom-vmon-100"/>
@@ -494,34 +489,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/>
 
@@ -557,10 +540,8 @@
     <menuitem action="toggle-marker-ruler"/>
     <menuitem action="toggle-cd-marker-ruler"/>
     <menuitem action="toggle-loop-punch-ruler"/>
-#ifndef GTKOSX
     <separator/>
     <menuitem action="toggle-video-ruler"/>
-#endif
   </popup>
 
   <popup name='ProcessorMenu'>
@@ -570,6 +551,7 @@
     <menuitem action='newaux'/>
     <separator/>
     <menuitem action='controls'/>
+    <menuitem action='send_options'/>
     <separator/>
     <menuitem action='clear'/>
     <menuitem action='clear_pre'/>
@@ -656,9 +638,7 @@
       <menuitem action='naturalize-region'/>
       <menuitem action='toggle-region-lock'/>
       <menuitem action='toggle-region-lock-style'/>
-#ifndef GTKOSX
       <menuitem action='toggle-region-video-lock'/>
-#endif
       <menuitem action='snap-regions-to-grid'/>
       <menuitem action='set-region-sync-position'/>
       <menuitem action='remove-region-sync'/>