new_grid: Rewrite of Snap and Grid. (squashed commit)

[ardour.git] / gtk2_ardour / editing_syms.h

diff --git a/gtk2_ardour/editing_syms.h b/gtk2_ardour/editing_syms.h
index 318591293dde4c7941912255a967c6f79560329c..2483f86da079375190802bf3c89fee29d7b683e4 100644 (file)
--- a/gtk2_ardour/editing_syms.h
+++ b/gtk2_ardour/editing_syms.h
@@ -18,36 +18,28 @@
 */
 
 /* Changing this order will break the menu */
-SNAPTYPE(SnapToCDFrame)
-SNAPTYPE(SnapToTimecodeFrame)
-SNAPTYPE(SnapToTimecodeSeconds)
-SNAPTYPE(SnapToTimecodeMinutes)
-SNAPTYPE(SnapToSeconds)
-SNAPTYPE(SnapToMinutes)
-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(SnapToRegionStart)
-SNAPTYPE(SnapToRegionEnd)
-SNAPTYPE(SnapToRegionSync)
-SNAPTYPE(SnapToRegionBoundary)
+GRIDTYPE(GridTypeNone)
+GRIDTYPE(GridTypeBar)
+GRIDTYPE(GridTypeBeat)
+GRIDTYPE(GridTypeBeatDiv2)
+GRIDTYPE(GridTypeBeatDiv4)
+GRIDTYPE(GridTypeBeatDiv8)
+GRIDTYPE(GridTypeBeatDiv16)
+GRIDTYPE(GridTypeBeatDiv32)
+GRIDTYPE(GridTypeBeatDiv3)  //Triplet eighths
+GRIDTYPE(GridTypeBeatDiv6)
+GRIDTYPE(GridTypeBeatDiv12)
+GRIDTYPE(GridTypeBeatDiv24)
+GRIDTYPE(GridTypeBeatDiv5)  //Quintuplet eighths
+GRIDTYPE(GridTypeBeatDiv10)
+GRIDTYPE(GridTypeBeatDiv20)
+GRIDTYPE(GridTypeBeatDiv7)  //Septuplet eighths
+GRIDTYPE(GridTypeBeatDiv14)
+GRIDTYPE(GridTypeBeatDiv28)
+GRIDTYPE(GridTypeSmpte)
+GRIDTYPE(GridTypeMinSec)
+GRIDTYPE(GridTypeSamples)
+
 
 /* Changing this order will break the menu */
 SNAPMODE(SnapOff)
@@ -65,14 +57,14 @@ REGIONLISTSORTTYPE(BySourceFileName)
 REGIONLISTSORTTYPE(ByStartInFile)
 REGIONLISTSORTTYPE(ByTimestamp)
 
-MOUSEMODE(MouseGain)
+/* Changing this order will break step_mouse_mode */
 MOUSEMODE(MouseObject)
 MOUSEMODE(MouseRange)
-MOUSEMODE(MouseDraw)
+MOUSEMODE(MouseCut)
 MOUSEMODE(MouseTimeFX)
-MOUSEMODE(MouseZoom)
 MOUSEMODE(MouseAudition)
-MOUSEMODE(MouseCut)
+MOUSEMODE(MouseDraw)
+MOUSEMODE(MouseContent)
 
 /* Changing this order will break the menu */
 ZOOMFOCUS(ZoomFocusLeft)
@@ -88,22 +80,22 @@ 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=0)
-IMPORTPOSITION(ImportAtEditPoint=1)
-IMPORTPOSITION(ImportAtPlayhead=2)
-IMPORTPOSITION(ImportAtStart=3)
+IMPORTPOSITION(ImportAtTimestamp)
+IMPORTPOSITION(ImportAtEditPoint)
+IMPORTPOSITION(ImportAtPlayhead)
+IMPORTPOSITION(ImportAtStart)
 
 // if this is changed, remember to update the string table in sfdb_ui.cc
-IMPORTDISPOSITION(ImportDistinctFiles=0)
-IMPORTDISPOSITION(ImportMergeFiles=1)
-IMPORTDISPOSITION(ImportSerializeFiles=2)
-IMPORTDISPOSITION(ImportDistinctChannels=3)
+IMPORTDISPOSITION(ImportDistinctFiles)
+IMPORTDISPOSITION(ImportMergeFiles)
+IMPORTDISPOSITION(ImportSerializeFiles)
+IMPORTDISPOSITION(ImportDistinctChannels)
 
 EDITPOINT(EditAtPlayhead)
 EDITPOINT(EditAtSelectedMarker)