X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fediting_syms.h;h=715202bfc9c41b2535054d6b96bcd9279cd674e5;hb=7d553eea8028977021f1526b8ab538737a21767c;hp=71a7747b474e5cbda303a825af3afdc63540e3de;hpb=997e4b1f9cd7ccfc704b7c035051da7f60d831e7;p=ardour.git

diff --git a/gtk2_ardour/editing_syms.h b/gtk2_ardour/editing_syms.h
index 71a7747b47..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
@@ -19,16 +19,28 @@
 
 /* Changing this order will break the menu */
 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)
@@ -53,17 +65,14 @@ 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)
-
-MIDIEDITMODE(MidiEditPencil)
-MIDIEDITMODE(MidiEditSelect)
-MIDIEDITMODE(MidiEditErase)
+MOUSEMODE(MouseDraw)
+MOUSEMODE(MouseContent)
 
 /* Changing this order will break the menu */
 ZOOMFOCUS(ZoomFocusLeft)
@@ -79,32 +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=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)
 EDITPOINT(EditAtMouse)
 
-WAVEFORMSCALE(LinearWaveform)
-WAVEFORMSCALE(LogWaveform)
-
-WAVEFORMSHAPE(Traditional)
-WAVEFORMSHAPE(Rectified)
-
-
+INSERTTIMEOPT(LeaveIntersected)
+INSERTTIMEOPT(MoveIntersected)
+INSERTTIMEOPT(SplitIntersected)