X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fediting_syms.h;h=715202bfc9c41b2535054d6b96bcd9279cd674e5;hb=946a99f554a158d569b2cea5310a1197664dcda5;hp=7ae45c4c061d10e1f08fc82751583898c2a2ccd5;hpb=332a3d98138e94903ad9c6d35048b0201ff178c8;p=ardour.git

diff --git a/gtk2_ardour/editing_syms.h b/gtk2_ardour/editing_syms.h
index 7ae45c4c06..715202bfc9 100644
--- a/gtk2_ardour/editing_syms.h
+++ b/gtk2_ardour/editing_syms.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2000-2007 Paul Davis 
+    Copyright (C) 2000-2007 Paul Davis
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -18,28 +18,39 @@
 */
 
 /* Changing this order will break the menu */
-SNAPTYPE(SnapToFrame)
 SNAPTYPE(SnapToCDFrame)
-SNAPTYPE(SnapToSMPTEFrame)
-SNAPTYPE(SnapToSMPTESeconds)
-SNAPTYPE(SnapToSMPTEMinutes)
+SNAPTYPE(SnapToTimecodeFrame)
+SNAPTYPE(SnapToTimecodeSeconds)
+SNAPTYPE(SnapToTimecodeMinutes)
 SNAPTYPE(SnapToSeconds)
 SNAPTYPE(SnapToMinutes)
-SNAPTYPE(SnapToAThirtysecondBeat)
-SNAPTYPE(SnapToASixteenthBeat)
-SNAPTYPE(SnapToAEighthBeat)
-SNAPTYPE(SnapToAQuarterBeat)
-SNAPTYPE(SnapToAThirdBeat)
+SNAPTYPE(SnapToBeatDiv128)
+SNAPTYPE(SnapToBeatDiv64)
+SNAPTYPE(SnapToBeatDiv32)
+SNAPTYPE(SnapToBeatDiv28)
+SNAPTYPE(SnapToBeatDiv24)
+SNAPTYPE(SnapToBeatDiv20)
+SNAPTYPE(SnapToBeatDiv16)
+SNAPTYPE(SnapToBeatDiv14)
+SNAPTYPE(SnapToBeatDiv12)
+SNAPTYPE(SnapToBeatDiv10)
+SNAPTYPE(SnapToBeatDiv8)
+SNAPTYPE(SnapToBeatDiv7)
+SNAPTYPE(SnapToBeatDiv6)
+SNAPTYPE(SnapToBeatDiv5)
+SNAPTYPE(SnapToBeatDiv4)
+SNAPTYPE(SnapToBeatDiv3)
+SNAPTYPE(SnapToBeatDiv2)
 SNAPTYPE(SnapToBeat)
 SNAPTYPE(SnapToBar)
 SNAPTYPE(SnapToMark)
-SNAPTYPE(SnapToEditCursor)
 SNAPTYPE(SnapToRegionStart)
 SNAPTYPE(SnapToRegionEnd)
 SNAPTYPE(SnapToRegionSync)
 SNAPTYPE(SnapToRegionBoundary)
 
 /* Changing this order will break the menu */
+SNAPMODE(SnapOff)
 SNAPMODE(SnapNormal)
 SNAPMODE(SnapMagnetic)
 
@@ -54,19 +65,21 @@ REGIONLISTSORTTYPE(BySourceFileName)
 REGIONLISTSORTTYPE(ByStartInFile)
 REGIONLISTSORTTYPE(ByTimestamp)
 
-MOUSEMODE(MouseGain)
+/* Changing this order will break step_mouse_mode */
 MOUSEMODE(MouseObject)
 MOUSEMODE(MouseRange)
+MOUSEMODE(MouseCut)
 MOUSEMODE(MouseTimeFX)
-MOUSEMODE(MouseZoom)
 MOUSEMODE(MouseAudition)
-MOUSEMODE(MouseNote)
+MOUSEMODE(MouseDraw)
+MOUSEMODE(MouseContent)
 
 /* Changing this order will break the menu */
 ZOOMFOCUS(ZoomFocusLeft)
 ZOOMFOCUS(ZoomFocusRight)
 ZOOMFOCUS(ZoomFocusCenter)
 ZOOMFOCUS(ZoomFocusPlayhead)
+ZOOMFOCUS(ZoomFocusMouse)
 ZOOMFOCUS(ZoomFocusEdit)
 
 DISPLAYCONTROL(FollowPlayhead)
@@ -75,7 +88,27 @@ DISPLAYCONTROL(ShowWaveforms)
 DISPLAYCONTROL(ShowWaveformsRecording)
 
 // if this is changed, remember to update the string table in sfdb_ui.cc
-IMPORTMODE(ImportAsRegion=0)
-IMPORTMODE(ImportToTrack=1)
-IMPORTMODE(ImportAsTrack=2)
-IMPORTMODE(ImportAsTapeTrack=3)
+IMPORTMODE(ImportAsRegion)
+IMPORTMODE(ImportToTrack)
+IMPORTMODE(ImportAsTrack)
+IMPORTMODE(ImportAsTapeTrack)
+
+// if this is changed, remember to update the string table in sfdb_ui.cc
+IMPORTPOSITION(ImportAtTimestamp)
+IMPORTPOSITION(ImportAtEditPoint)
+IMPORTPOSITION(ImportAtPlayhead)
+IMPORTPOSITION(ImportAtStart)
+
+// if this is changed, remember to update the string table in sfdb_ui.cc
+IMPORTDISPOSITION(ImportDistinctFiles)
+IMPORTDISPOSITION(ImportMergeFiles)
+IMPORTDISPOSITION(ImportSerializeFiles)
+IMPORTDISPOSITION(ImportDistinctChannels)
+
+EDITPOINT(EditAtPlayhead)
+EDITPOINT(EditAtSelectedMarker)
+EDITPOINT(EditAtMouse)
+
+INSERTTIMEOPT(LeaveIntersected)
+INSERTTIMEOPT(MoveIntersected)
+INSERTTIMEOPT(SplitIntersected)