Use uint32_t type instead of uint

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

diff --git a/gtk2_ardour/ardour.menus.in b/gtk2_ardour/ardour.menus.in
index cd169afe86d83565cb0029a6aa365649486e74c8..15f1bde1b624c62a3125fff5c5a1911fc8904f78 100644 (file)
--- a/gtk2_ardour/ardour.menus.in
+++ b/gtk2_ardour/ardour.menus.in
@@ -2,6 +2,7 @@
   <accelerator action='set-mouse-mode-object'/>
   <accelerator action='set-mouse-mode-range'/>
   <accelerator action='set-mouse-mode-gain'/>
+  <accelerator action='set-mouse-mode-draw'/>
   <accelerator action='set-mouse-mode-zoom'/>
   <accelerator action='set-mouse-mode-timefx'/>
   <accelerator action='set-mouse-mode-object-range'/>
@@ -9,6 +10,8 @@
   <accelerator action='focus-on-clock'/>
   <accelerator action='track-solo-toggle'/>
   <accelerator action='track-mute-toggle'/>
+  <accelerator action='toggle-edit-mode'/>
+  <accelerator action='toggle-midi-input-active'/>
   
   <menubar name='Main' action='MainMenu'>
     <menu name='Session' action='Session'>
@@ -31,24 +34,30 @@
       <separator/>
       <menuitem action='addExistingAudioFiles'/>
       <!--menuitem action='importFromSession'/-->
+
+#ifndef NOVIDEOTIMELINE
+      <menuitem action='OpenVideo'/>
+      <menuitem action='CloseVideo'/>
+#endif
       <menu name='Export' action='Export'>
         <menuitem action='ExportAudio'/>
         <menuitem action='StemExport'/>
+        <menuitem action='ExportVideo'/>
       </menu>
       <menu name='Cleanup' action='Cleanup'>
         <menuitem action='CleanupUnused'/>
         <menuitem action='FlushWastebasket'/>
       </menu>
-#ifndef GTKOSX
       <separator/>
+      <menuitem action='toggle-session-options-editor'/>
+#ifdef GTKOSX      
+      <menuitem action='toggle-about'/>
+      <menuitem action='toggle-rc-options-editor'/>
 #endif
-      <menuitem action='ToggleSessionOptionsEditor'/>
-#ifdef GTKOSX
-      <menuitem action='ToggleRCOptionsEditor'/>
-      <menuitem action='About'/>
-#endif
+#ifndef GTKOSX
       <separator/>
       <menuitem action='Quit'/>
+#endif
     </menu>
 
     <menu name='Transport' action='Transport'>
@@ -57,6 +66,7 @@
         <menuitem action='main-menu-play-selected-regions'/>
         <menuitem action='play-edit-range'/>
         <menuitem action='PlaySelection'/>
+        <menuitem action='PlayPreroll'/>
         <menuitem action='play-from-edit-point-and-return'/>
         <menuitem action='Loop'/>
       </menu>
@@ -141,12 +151,14 @@
       <menuitem action='TogglePunchIn'/>
       <menuitem action='TogglePunchOut'/>
       <menuitem action='ToggleAutoInput'/>
+      <menuitem action='ToggleFollowEdits'/>
       <menuitem action='ToggleAutoPlay'/>
       <menuitem action='ToggleAutoReturn'/>
       <menuitem action='ToggleClick'/>
       <menuitem action='toggle-follow-playhead'/>
+      <menuitem action='ToggleFollowEdits'/>
       <menuitem action='panic'/>
-      <separator/>
+     <separator/>
     </menu>
 
     <menu name='Edit' action='Edit'>
@@ -212,15 +224,15 @@
         <menuitem action='cycle-edit-point'/>
         <menuitem action='cycle-edit-point-with-marker'/>
       </menu>
-      <menuitem action='toggle-edit-mode'/>
       <separator/>
       <menu action="TempoMenu">
         <menuitem action='set-tempo-from-region'/>
         <menuitem action='set-tempo-from-edit-range'/>
       </menu>
+      <menuitem action='set-mouse-mode-object-range'/>
 #ifndef GTKOSX
       <separator/>
-      <menuitem action='ToggleRCOptionsEditor'/>
+      <menuitem action='toggle-rc-options-editor'/>
 #endif
     </menu>         
 
@@ -263,7 +275,6 @@
         <menuitem action='boost-region-gain'/>
         <menuitem action='cut-region-gain'/>                      
         <menuitem action='reset-region-gain-envelopes'/>
-        <menuitem action='toggle-region-gain-envelope-visible'/>
         <menuitem action='toggle-region-gain-envelope-active'/>
       </menu>
       <menu action='RegionMenuPosition'>
@@ -271,6 +282,9 @@
         <menuitem action='snap-regions-to-grid'/>
         <menuitem action='toggle-region-lock'/>
         <menuitem action='toggle-region-lock-style'/>
+#ifndef NOVIDEOTIMELINE
+        <menuitem action='toggle-region-video-lock'/>
+#endif
         <menuitem action='set-region-sync-position'/>
         <menuitem action='remove-region-sync'/>
         <menuitem action='nudge-forward'/>
@@ -366,6 +380,7 @@
         <menuitem action='zoom-focus-playhead'/>
         <menuitem action='zoom-focus-mouse'/>
         <menuitem action='zoom-focus-edit'/>
+        <menuitem action='cycle-zoom-focus'/>
       </menu>
       <menu name='SnapMode' action='SnapMode'>
         <menuitem action='snap-off'/>
@@ -373,7 +388,10 @@
         <menuitem action='snap-magnetic'/>
         <separator/>
         <menuitem action='cycle-snap-mode'/>
-        <menuitem action='cycle-snap-choice'/>
+        <menuitem action='next-snap-choice'/>
+        <menuitem action='prev-snap-choice'/>
+        <menuitem action='next-snap-choice-music-only'/>
+        <menuitem action='prev-snap-choice-music-only'/>
       </menu>
       <menu name='SnapTo' action='SnapTo'>
         <menuitem action='snap-to-cd-frame'/>
@@ -382,6 +400,8 @@
         <menuitem action='snap-to-timecode-minutes'/>
         <menuitem action='snap-to-seconds'/>
         <menuitem action='snap-to-minutes'/>
+        <menuitem action='snap-to-onetwentyeighths'/>
+        <menuitem action='snap-to-sixtyfourths'/>
         <menuitem action='snap-to-thirtyseconds'/>
         <menuitem action='snap-to-twentyeighths'/>
         <menuitem action='snap-to-twentyfourths'/>
@@ -416,6 +436,21 @@
         <menuitem action="toggle-loop-punch-ruler"/>
         <menuitem action="toggle-cd-marker-ruler"/>
         <menuitem action="toggle-marker-ruler"/>
+        <separator/>
+#ifndef NOVIDEOTIMELINE
+        <menuitem action="toggle-video-ruler"/>
+#endif
+      </menu>
+      <menu action="VideoMonitorMenu">
+        <menuitem action="zoom-vmon-100"/>
+        <menuitem action="toggle-vmon-letterbox"/>
+        <separator/>
+        <menuitem action="toggle-vmon-ontop"/>
+        <menuitem action="toggle-vmon-fullscreen"/>
+        <separator/>
+        <menuitem action="toggle-vmon-timecode"/>
+        <menuitem action="toggle-vmon-frame"/>
+        <menuitem action="toggle-vmon-osdbg"/>
       </menu>
       <menu action="ScrollMenu">
         <menuitem action='scroll-tracks-down'/>
@@ -476,20 +511,24 @@
     </menu>
     <menu action = 'WindowMenu'>
       <menuitem action='toggle-mixer'/>
-      <menuitem action='toggle-mixer-on-top'/>
+      <menuitem action='toggle-meterbridge'/>
+      <menuitem action='toggle-editor-mixer'/>
 
       <separator/>
 
-      <menuitem action='ToggleInspector'/>
-      <menuitem action='ToggleLocations'/>
-      <menuitem action='ToggleKeyEditor'/>
-      <menuitem action='ToggleBundleManager'/>
-      <menuitem action='ToggleThemeManager'/>
-      <menuitem action='ToggleBigClock'/>
+      <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'/>
       <menuitem action='toggle-speaker-config'/>
 
       <separator/>
 
+      <menuitem action='ToggleJadeo'/>
+      <separator/>
+
       <menuitem action='NewMIDITracer'/>
       <menuitem action='toggle-audio-connection-manager'/>
       <menuitem action='toggle-midi-connection-manager'/>
@@ -498,7 +537,7 @@
     </menu>
     <menu name='Help' action='Help'>
 #ifndef GTKOSX
-      <menuitem action='About'/>
+      <menuitem action='toggle-about'/>
 #endif
       <menuitem action='Chat'/>
       <menuitem action='Manual'/>
@@ -519,6 +558,10 @@
     <menuitem action="toggle-marker-ruler"/>
     <menuitem action="toggle-cd-marker-ruler"/>
     <menuitem action="toggle-loop-punch-ruler"/>
+#ifndef NOVIDEOTIMELINE
+    <separator/>
+    <menuitem action="toggle-video-ruler"/>
+#endif
   </popup>
 
   <popup name='ProcessorMenu'>
@@ -548,6 +591,7 @@
     <menuitem action='ab_plugins'/>
     <separator/>
     <menuitem action='edit'/>
+    <menuitem action='edit-generic'/>
   </popup>
 
   <popup name='ShuttleUnitPopup'>
@@ -613,6 +657,9 @@
       <menuitem action='naturalize-region'/>
       <menuitem action='toggle-region-lock'/>
       <menuitem action='toggle-region-lock-style'/>
+#ifndef NOVIDEOTIMELINE
+      <menuitem action='toggle-region-video-lock'/>
+#endif
       <menuitem action='snap-regions-to-grid'/>
       <menuitem action='set-region-sync-position'/>
       <menuitem action='remove-region-sync'/>
@@ -647,7 +694,6 @@
       <menuitem action='boost-region-gain'/>
       <menuitem action='cut-region-gain'/>                        
       <menuitem action='reset-region-gain-envelopes'/>
-      <menuitem action='toggle-region-gain-envelope-visible'/>
       <menuitem action='toggle-region-gain-envelope-active'/>
     </menu>
     <menu action='RegionMenuFades'>