Merge libs/ardour and gtk2_ardour with 2.0-ongoing R2837.

git-svn-id: svn://localhost/ardour2/trunk@2883 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 82 insertions, 120 deletions

diff --git a/gtk2_ardour/ardour-sae.menus b/gtk2_ardour/ardour-sae.menus
index e132329dbc..a1818a9965 100644
--- a/gtk2_ardour/ardour-sae.menus
+++ b/gtk2_ardour/ardour-sae.menus
@@ -6,30 +6,36 @@
            <menuitem action='Open'/>
            <menuitem action='Recent'/>
            <menuitem action='Close'/>
+           <menuitem action='Quit'/>
            <separator/>
            <menuitem action='Save'/>
            <menuitem action='Snapshot'/>
            <menuitem action='SaveTemplate'/>
            <separator/>
            <menuitem action='AddTrackBus'/>	
+
+	   <menu name='Files' action='Files'>
+              <menuitem action='addExistingAudioFiles'/>
+              <separator/>
+	      <menuitem action='ExportSession'/>
+	   </menu>
+
            <separator/>
            <menu name='Cleanup' action='Cleanup'>
                <menuitem action='CleanupUnused'/>
                <menuitem action='FlushWastebasket'/>
            </menu>
+           <menuitem action='ToggleOptionsEditor'/>
+           <menuitem action='About'/>
         </menu>
-	<menu name='Files' action='Files'>
-           <menuitem action='addExistingAudioFiles'/>
-           <separator/>
-           <menuitem action='ExportSession'/>
-           <menuitem action='ExportSelection'/>
-           <menuitem action='ExportRangeMarkers'/>
-	</menu>
         <menu name='Transport' action='Transport'>
                <menuitem action='ToggleRoll'/>
+               <menuitem action='play-from-edit-point-and-return'/>
+               <menuitem action='play-edit-range'/>
+               <menuitem action='record-roll'/>
                <menuitem action='ToggleRollForgetCapture'/>
                <menuitem action='Loop'/>
-               <menuitem action='PlaySelection'/>
+               <menuitem action='loop-region'/>
                <menuitem action='set-playhead'/>
                <menuitem action='Forward'/>
                <menuitem action='Rewind'/>
@@ -46,28 +52,38 @@
                <menuitem action='jump-backward-to-mark'/>
                <menuitem action='add-location-from-playhead'/>
                <separator/> 
-               <menuitem action='playhead-to-next-region-start'/>
-               <menuitem action='playhead-to-next-region-end'/>
-               <menuitem action='playhead-to-previous-region-start'/>
-               <menuitem action='playhead-to-previous-region-end'/>
+               <menuitem action='playhead-to-next-region-boundary'/>
+               <menuitem action='playhead-to-previous-region-boundary'/>
                <menuitem action='playhead-to-next-region-sync'/>
                <menuitem action='playhead-to-previous-region-sync'/>
                <menuitem action='center-playhead'/>
+	       <separator/>
                <menuitem action='playhead-to-edit'/>
-               <separator/>       
-               <menuitem action='playhead-to-range-start'/>
-               <menuitem action='playhead-to-range-end'/>
-               <menu action='TransportOptions'>
-                    <menuitem action='ToggleTimeMaster'/>
-                    <menuitem action='TogglePunchIn'/>
-                    <menuitem action='TogglePunchOut'/>
-                    <menuitem action='ToggleAutoInput'/>
-                    <menuitem action='ToggleAutoPlay'/>
-                    <menuitem action='ToggleAutoReturn'/>
-                    <menuitem action='ToggleClick'/>
-                    <menuitem action='toggle-follow-playhead'/>
-                    <menuitem action='ToggleVideoSync'/>
-               </menu>
+               <menuitem action='focus-on-clock'/>
+	       <separator/>
+	       <menuitem action='ToggleTimeMaster'/>
+               <menuitem action='TogglePunchIn'/>
+               <menuitem action='TogglePunchOut'/>
+               <menuitem action='ToggleAutoInput'/>
+               <menuitem action='ToggleAutoPlay'/>
+               <menuitem action='ToggleAutoReturn'/>
+               <menuitem action='ToggleClick'/>
+               <menuitem action='toggle-follow-playhead'/>
+	       <separator/>
+	       <menuitem action='set-loop-from-edit-range'/>
+	       <menuitem action='set-loop-from-region'/>
+	       <menuitem action='set-punch-from-edit-range'/>
+	       <menu action='LocateToMarker'>
+		     <menuitem action='goto-mark-1'/>
+		     <menuitem action='goto-mark-2'/>
+		     <menuitem action='goto-mark-3'/>
+		     <menuitem action='goto-mark-4'/>
+		     <menuitem action='goto-mark-5'/>
+		     <menuitem action='goto-mark-6'/>
+		     <menuitem action='goto-mark-7'/>
+		     <menuitem action='goto-mark-8'/>
+		     <menuitem action='goto-mark-9'/>
+		</menu>
        </menu>
        <menu name='Edit' action='Edit'>
                <menuitem action='undo'/>
@@ -77,22 +93,33 @@
                <menuitem action='editor-copy'/>
                <menuitem action='editor-paste'/>
                <menuitem action='set-edit-point'/>
+               <menuitem action='editor-separate'/>
+               <separator/>       
 	       <menuitem action='remove-last-capture'/>
                <separator/>       
+               <menuitem action='select-all'/>
+               <menuitem action='deselect-all'/>
+               <menuitem action='invert-selection'/>
+               <menuitem action='select-all-after-edit-cursor'/>
+               <menuitem action='select-all-before-edit-cursor'/>
+               <menuitem action='select-all-between-cursors'/>
+               <menuitem action='select-all-within-cursors'/>
+               <menuitem action='select-all-in-punch-range'/>
+               <menuitem action='select-all-in-loop-range'/>
+	       <separator/>
+               <menuitem action='select-next-route'/>
+               <menuitem action='select-prev-route'/>
+	       <separator/>
 	       <menu action='EditCursorMovementOptions'>
-                   <menuitem action='edit-cursor-to-next-region-start'/>
-    	           <menuitem action='edit-cursor-to-next-region-end'/>
-       	           <menuitem action='edit-cursor-to-previous-region-start'/>
-            	   <menuitem action='edit-cursor-to-previous-region-end'/>
+                   <menuitem action='selected-marker-to-next-region-boundary'/>
+    	           <menuitem action='selected-marker-to-previous-region-boundary'/>
 	           <menuitem action='edit-cursor-to-next-region-sync'/>
     	           <menuitem action='edit-cursor-to-previous-region-sync'/>
         	   <menuitem action='center-edit-cursor'/>
             	   <menuitem action='edit-to-playhead'/>
-    	           <menuitem action='edit-cursor-to-range-start'/>
-	           <menuitem action='edit-cursor-to-range-end'/>
 	       </menu>
 	       <menu name='KeyMouse Actions' action='KeyMouse Actions'>
-	       		<menuitem action='audition-at-mouse'/>
+	       		<menuitem action='play-selected-regions'/>
                		<menuitem action='brush-at-mouse'/>
                		<menuitem action='mute-unmute-region'/>
 			<separator/>
@@ -101,28 +128,12 @@
 			<menuitem action='set-mouse-mode-gain'/>
 			<menuitem action='set-mouse-mode-zoom'/>
 			<menuitem action='set-mouse-mode-timefx'/>
+			<separator/>
+			<menuitem action='cycle-edit-point'/>
+			<menuitem action='cycle-edit-point-with-marker'/>
+			<menuitem action='toggle-edit-mode'/>
 	 	</menu>
-                <separator/>       
-                <menuitem action='ToggleOptionsEditor'/>
         </menu>         
-	<menu name='Select' action='Select'>
-                   <menuitem action='select-range-between-cursors'/>
-                   <menuitem action='extend-range-to-start-of-region'/>
-                   <menuitem action='extend-range-to-end-of-region'/>
-                   <menuitem action='start-range'/>
-                   <menuitem action='finish-range'/>
-                   <menuitem action='finish-add-range'/>
-		   <separator/>
-                   <menuitem action='select-all'/>
-                   <menuitem action='select-all-after-edit-cursor'/>
-                   <menuitem action='select-all-before-edit-cursor'/>
-                   <menuitem action='select-all-after-playhead'/>
-                   <menuitem action='select-all-before-playhead'/>
-                   <menuitem action='select-all-between-cursors'/>
-                   <menuitem action='select-all-within-cursors'/>
-                   <menuitem action='select-all-in-punch-range'/>
-                   <menuitem action='select-all-in-loop-range'/>
-	</menu>
 	<menu name='Regions' action='Regions'>
                    <menuitem action='crop'/>
                    <menuitem action='duplicate-region'/>
@@ -130,9 +141,7 @@
                	   <menuitem action='normalize-region'/>
                    <separator/>       
 	           <menuitem action="nudge-forward"/>
-         	   <menuitem action="nudge-next-forward"/>
 	           <menuitem action="nudge-backward"/>
-        	   <menuitem action="nudge-next-backward"/>
         	   <menuitem action='split-region'/>
 	       	   <menuitem action='set-region-sync-position'/>
                    <separator/>       
@@ -144,28 +153,33 @@
 		   <menuitem action='align-regions-sync-relative'/>
                    <separator/>       
 		   <menuitem action='set-fade-in-length'/>
+		   <menuitem action='toggle-fade-in-active'/>
 		   <menuitem action='set-fade-out-length'/>
+		   <menuitem action='toggle-fade-out-active'/>
                    <separator/>       
-		   <menuitem action='trim-from-start'/>
-		   <menuitem action='trim-to-end'/>
+		   <menuitem action='trim-front'/>
+		   <menuitem action='trim-back'/>
 		   <menuitem action='trim-region-to-loop'/>
 		   <menuitem action='trim-region-to-punch'/>
+                   <separator/>       
+		   <menuitem action='pitch-shift-region'/>
 	</menu>
         <menu name='View' action = 'View'>
+	       <menuitem action='ToggleMaximalEditor'/>
+	       <separator/>
                <menu name='ZoomFocus' action='ZoomFocus'>
-                   <menuitem action='zoom-focus-left'/>
-                   <menuitem action='zoom-focus-right'/>
-                   <menuitem action='zoom-focus-center'/>
                    <menuitem action='zoom-focus-playhead'/>
                    <menuitem action='zoom-focus-edit'/>
                    <menuitem action='zoom-focus-mouse'/>
                </menu>
 	       <menu name='SnapMode' action='SnapMode'>
+		   <menuitem action='snap-off'/>
 		   <menuitem action='snap-normal'/>
 		   <menuitem action='snap-magnetic'/>
+		   <separator/>
+		   <menuitem action='cycle-snap-mode'/>
 	       </menu>
                <menu name='SnapTo' action='SnapTo'>
-		   <menuitem action='snap-to-frame'/>
 		   <menuitem action='snap-to-cd-frame'/>
 		   <menuitem action='snap-to-smpte-frame'/>
 		   <menuitem action='snap-to-smpte-seconds'/>
@@ -180,17 +194,18 @@
 		   <menuitem action='snap-to-beat'/>
 		   <menuitem action='snap-to-bar'/>
 		   <menuitem action='snap-to-mark'/>
-		   <menuitem action='snap-to-edit-cursor'/>
 		   <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='cycle-snap-choice'/>
                </menu>
                <separator/>
-
                <menuitem action='temporal-zoom-in'/>
                <menuitem action='temporal-zoom-out'/>
                <menuitem action='zoom-to-session'/>
+               <menuitem action='zoom-to-region'/>
+               <menuitem action='toggle-zoom'/>
                <menuitem action='scroll-tracks-down'/>
                <menuitem action='scroll-tracks-up'/>
                <menuitem action='scroll-tracks-down'/>
@@ -205,77 +220,24 @@
    	       <separator/>
 	       <menuitem action='show-editor-mixer'/>
 	       <menuitem action='SyncEditorAndMixerTrackOrder'/>
+               <menuitem action='ToggleMeasureVisibility'/>
 	       <menuitem action='ToggleLogoVisibility'/>
-         </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 name='Windows' action = 'Windows'>
-	       <menuitem action='ToggleMaximalEditor'/>
 	       <separator/>
                <menuitem action='goto-editor'/>
                <menuitem action='goto-mixer'/>
-               <menuitem action='ToggleInspector'/>
                <menuitem action='ToggleLocations'/>
+               <menuitem action='ToggleKeyEditor'/>
                <menuitem action='ToggleThemeManager'/>
                <menuitem action='ToggleBigClock'/>
-   	       <separator/>
         </menu>
         <menu name='Options' action='Options'>
-	       <menu action='AudioFileFormat'>
-                   <menu action='AudioFileFormatData'>
-		        <menuitem action='FileDataFormatFloat'/>
-		        <menuitem action='FileDataFormat24bit'/>
-		        <menuitem action='FileDataFormat16bit'/>
-		   </menu>
-                   <menu action='AudioFileFormatHeader'>
-		        <menuitem action='FileHeaderFormatBWF'/>
-		        <menuitem action='FileHeaderFormatWAVE'/>
-		        <menuitem action='FileHeaderFormatWAVE64'/>
-		        <menuitem action='FileHeaderFormatCAF'/>
-		   </menu>
-               </menu>
                <menu action='Monitoring'>
-                   <menuitem action='UseHardwareMonitoring'/>
                    <menuitem action='UseSoftwareMonitoring'/>
                    <menuitem action='UseExternalMonitoring'/>
                </menu>
-	       <menu action='Metering'>
-                   <menu action='MeteringFallOffRate'>
-		        <menuitem action='MeterFalloffOff'/>
-   		        <menuitem action='MeterFalloffSlowest'/>
-			<menuitem action='MeterFalloffSlow'/>
-	                <menuitem action='MeterFalloffMedium'/>
-	                <menuitem action='MeterFalloffFast'/>
-	                <menuitem action='MeterFalloffFaster'/>
-	                <menuitem action='MeterFalloffFastest'/>
-                   </menu>
-                   <menu action='MeteringHoldTime'>
-	                <menuitem action='MeterHoldOff'/>
-	                <menuitem action='MeterHoldShort'/>
-	                <menuitem action='MeterHoldMedium'/>
-	                <menuitem action='MeterHoldLong'/>
-                   </menu>
-               </menu>
-               <menu action='Solo'>
-                   <menuitem action='LatchedSolo'/>
-               </menu>
+               <menuitem action='LatchedSolo'/>
+               <menuitem action='link-region-and-track-selection'/>
          </menu>
-	 <menu name='Help' action='Help'>
-	     <menuitem action='About'/>
-	</menu>
      </menubar>
 
      <popup name='redirectmenu'>