X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fardour.menus.in;h=210c29dbbe805291b27fb9b873370a077b260366;hb=0299229e417ad6b8332ae3c9eafbf67a1c369727;hp=d8ea6eb669502c61015c8c6a1187402dbe7b1f3a;hpb=54e8a21a09fec734400be1fa5a856f3a0a9580eb;p=ardour.git

diff --git a/gtk2_ardour/ardour.menus.in b/gtk2_ardour/ardour.menus.in
index d8ea6eb669..210c29dbbe 100644
--- a/gtk2_ardour/ardour.menus.in
+++ b/gtk2_ardour/ardour.menus.in
@@ -14,10 +14,7 @@
       <menuitem action='SnapshotSwitch'/>
 #endif
       <menuitem action='SaveTemplate'/>
-      <menu name='Metadata' action='Metadata'>
-        <menuitem action='EditMetadata'/>
-        <menuitem action='ImportMetadata'/>
-      </menu>
+      <menuitem action='Archive'/>
       <separator/>
       <menuitem action='AddTrackBus'/>
       <separator/>
@@ -27,11 +24,6 @@
 #endif
       <!--menuitem action='importFromSession'/-->
 
-      <menu name='Scripting' action='Scripting'>
-        <menuitem action='AddLuaScript'/>
-        <menuitem action='RemoveLuaScript'/>
-      </menu>
-
       <menuitem action='OpenVideo'/>
       <menuitem action='CloseVideo'/>
 
@@ -40,14 +32,18 @@
         <menuitem action='StemExport'/>
         <menuitem action='ExportVideo'/>
       </menu>
+      <separator/>
+      <menuitem action='toggle-session-options-editor'/>
+      <menu name='Metadata' action='Metadata'>
+        <menuitem action='EditMetadata'/>
+        <menuitem action='ImportMetadata'/>
+      </menu>
       <menu name='Cleanup' action='Cleanup'>
         <menuitem action='bring-into-session'/>
         <menuitem action='CleanupPeakFiles'/>
         <menuitem action='CleanupUnused'/>
         <menuitem action='FlushWastebasket'/>
       </menu>
-      <separator/>
-      <menuitem action='toggle-session-options-editor'/>
 #ifdef __APPLE__
       <menuitem action='toggle-about'/>
 #endif
@@ -65,6 +61,7 @@
       <menuitem action='ToggleRoll'/>
       <menu action="PlayMenu">
         <menuitem action='PlaySelection'/>
+        <menuitem action='solo-selection'/>
         <menuitem action='PlayPreroll'/>
         <menuitem action='ToggleRollMaybe'/>
         <menuitem action='play-from-edit-point-and-return'/>
@@ -73,6 +70,8 @@
       <menuitem action='record-roll'/>
       <menuitem action='ToggleRollForgetCapture'/>
       <menuitem action='Record'/>
+      <menuitem action='RecordPreroll'/>
+      <menuitem action='RecordCountIn'/>
 #if 0
       <menuitem action='toggle-skip-playback'/>
 #endif
@@ -130,6 +129,7 @@
       <menu action="MarkerMenu">
         <menuitem action='add-location-from-playhead'/>
         <menuitem action='remove-location-from-playhead'/>
+        <menuitem action='toggle-location-at-playhead'/>
         <separator/>
         <menuitem action='goto-mark-1'/>
         <menuitem action='goto-mark-2'/>
@@ -233,48 +233,29 @@
         <menuitem action='cycle-edit-point'/>
         <menuitem action='cycle-edit-point-with-marker'/>
       </menu>
-      <menu name='SnapMode' action='SnapMode'>
-        <menuitem action='snap-off'/>
-        <menuitem action='snap-normal'/>
-        <menuitem action='snap-magnetic'/>
+      <menuitem action='cycle-snap-mode'/>
+      <menu name='GridChoice' action='GridChoice'>
+        <menuitem action='prev-grid-choice'/>
+        <menuitem action='next-grid-choice'/>
         <separator/>
-        <menuitem action='cycle-snap-mode'/>
-        <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'/>
-        <menuitem action='snap-to-timecode-frame'/>
-        <menuitem action='snap-to-timecode-seconds'/>
-        <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'/>
-        <menuitem action='snap-to-twentieths'/>
-        <menuitem action='snap-to-asixteenthbeat'/>
-        <menuitem action='snap-to-fourteenths'/>
-        <menuitem action='snap-to-twelfths'/>
-        <menuitem action='snap-to-tenths'/>
-        <menuitem action='snap-to-eighths'/>
-        <menuitem action='snap-to-sevenths'/>
-        <menuitem action='snap-to-sixths'/>
-        <menuitem action='snap-to-fifths'/>
-        <menuitem action='snap-to-quarters'/>
-        <menuitem action='snap-to-thirds'/>
-        <menuitem action='snap-to-halves'/>
-        <menuitem action='snap-to-beat'/>
-        <menuitem action='snap-to-bar'/>
-        <menuitem action='snap-to-mark'/>
-        <menuitem action='snap-to-region-start'/>
-        <menuitem action='snap-to-region-end'/>
-        <menuitem action='snap-to-region-sync'/>
-        <menuitem action='snap-to-region-boundary'/>
+        <menuitem action='grid-type-none'/>
+        <menuitem action='grid-type-bar'/>
+        <menuitem action='grid-type-beat'/>
+        <menuitem action='grid-type-halves'/>
+        <menuitem action='grid-type-quarters'/>
+        <menuitem action='grid-type-eighths'/>
+        <menuitem action='grid-type-asixteenthbeat'/>
+        <menuitem action='grid-type-thirtyseconds'/>
+        <menuitem action='grid-type-thirds'/>
+        <menuitem action='grid-type-sixths'/>
+        <menuitem action='grid-type-twelfths'/>
+        <menuitem action='grid-type-twentyfourths'/>
+        <menuitem action='grid-type-fifths'/>
+        <menuitem action='grid-type-tenths'/>
+        <menuitem action='grid-type-twentieths'/>
+        <menuitem action='grid-type-sevenths'/>
+        <menuitem action='grid-type-fourteenths'/>
+        <menuitem action='grid-type-twentyeighths'/>
       </menu>
       <separator/>
       <menu action="TempoMenu">
@@ -283,7 +264,7 @@
       </menu>
       <menuitem action='set-mouse-mode-object-range'/>
       <separator/>
-      <menu action="ActionScripts">
+      <menu action="LuaScripts">
         <menuitem action='toggle-script-manager'/>
         <separator/>
         <menuitem action='script-action-1'/>
@@ -314,7 +295,6 @@
         <menuitem action='combine-regions'/>
         <menuitem action='uncombine-regions'/>
         <menuitem action='pitch-shift-region'/>
-        <menuitem action='split-region'/>
         <menuitem action='split-region-at-transients'/>
         <menuitem action='split-multichannel-region'/>
         <menuitem action='close-region-gaps'/>
@@ -345,6 +325,7 @@
         <menuitem action='normalize-region'/>
         <menuitem action='boost-region-gain'/>
         <menuitem action='cut-region-gain'/>
+        <menuitem action='reset-region-gain'/>
         <menuitem action='reset-region-gain-envelopes'/>
         <menuitem action='toggle-region-gain-envelope-active'/>
       </menu>
@@ -450,7 +431,9 @@
         <menuitem action='temporal-zoom-in'/>
         <menuitem action='temporal-zoom-out'/>
         <menuitem action='zoom-to-session'/>
+        <menuitem action='zoom-to-extents'/>
         <menuitem action='zoom-to-selection'/>
+        <menuitem action='zoom-to-selection-horiz'/>
         <menuitem action='fit-selection'/>
         <menuitem action='toggle-zoom'/>
         <menuitem action='expand-tracks'/>
@@ -531,7 +514,6 @@
       <menuitem action='show-editor-list'/>
       <menuitem action='ToggleMixerList'/>
       <menuitem action='ToggleMonitorSection'/>
-      <menuitem action='ToggleMeasureVisibility'/>
       <menuitem action='ToggleSummary'/>
       <menuitem action='ToggleGroupTabs'/>
       <menuitem action='show-marker-lines'/>
@@ -559,34 +541,39 @@
         <menuitem action='detach-preferences'/>
       </menu>
       <menuitem action='toggle-meterbridge'/>
-      <menuitem action='toggle-luawindow'/>
       <separator/>
 #ifndef MIXBUS
       <menuitem action='toggle-inspector'/>
 #endif
       <menuitem action='toggle-locations'/>
-      <menuitem action='toggle-key-editor'/>
 #ifndef MIXBUS
       <menuitem action='toggle-bundle-manager'/>
 #endif
       <menuitem action='toggle-big-clock'/>
+      <menuitem action='toggle-big-transport'/>
 #if 0
       <menuitem action='toggle-speaker-config'/>
 #endif
-
-      <separator/>
-#ifdef MIXBUS
-      <menuitem action='license-manager'/>
-
-      <separator/>
+#if 0
+      <menuitem action='toggle-idle-o-meter'/>
 #endif
 
+      <separator/>
       <menuitem action='ToggleJadeo'/>
       <separator/>
 
-      <menuitem action='NewMIDITracer'/>
       <menuitem action='toggle-audio-connection-manager'/>
       <menuitem action='toggle-midi-connection-manager'/>
+      <separator/>
+      <menuitem action='toggle-luawindow'/>
+      <menuitem action='ManageTemplates'/>
+      <menuitem action='toggle-key-editor'/>
+      <separator/>
+#ifdef MIXBUS
+      <menuitem action='license-manager'/>
+      <separator/>
+#endif
+      <menuitem action='NewMIDITracer'/>
       <menuitem action='toggle-log-window'/>
       <separator/>
     </menu>
@@ -657,9 +644,13 @@
     <menuitem action='newaux'/>
     <separator/>
     <menuitem action='controls'/>
-#ifndef MIXBUS
     <menuitem action='send_options'/>
-#endif
+    <separator/>
+    <menu action="disk-io-menu">
+        <menuitem action='disk-io-prefader'/>
+	<menuitem action='disk-io-postfader'/>
+	<menuitem action='disk-io-custom'/>
+    </menu>
     <separator/>
     <menuitem action='clear'/>
     <menuitem action='clear_pre'/>
@@ -789,6 +780,7 @@
       <menuitem action='normalize-region'/>
       <menuitem action='boost-region-gain'/>
       <menuitem action='cut-region-gain'/>
+      <menuitem action='reset-region-gain'/>
       <menuitem action='reset-region-gain-envelopes'/>
       <menuitem action='toggle-region-gain-envelope-active'/>
     </menu>