Stop ardour exiting in the case where you have a loaded session, then select New...

[ardour.git] / gtk2_ardour / editing_syms.h

diff --git a/gtk2_ardour/editing_syms.h b/gtk2_ardour/editing_syms.h
index a520b0d318a3414f291b1991574997f334a8edeb..56cd91f6918ad2278f5171b9bbff366c958aa236 100644 (file)
--- 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,7 +18,6 @@
 */
 
 /* Changing this order will break the menu */
-SNAPTYPE(SnapToFrame)
 SNAPTYPE(SnapToCDFrame)
 SNAPTYPE(SnapToSMPTEFrame)
 SNAPTYPE(SnapToSMPTESeconds)
@@ -33,13 +32,13 @@ SNAPTYPE(SnapToAThirdBeat)
 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)
 
@@ -60,17 +59,13 @@ MOUSEMODE(MouseRange)
 MOUSEMODE(MouseTimeFX)
 MOUSEMODE(MouseZoom)
 MOUSEMODE(MouseAudition)
-MOUSEMODE(MouseNote)
-
-MIDIEDITMODE(MidiEditSelect)
-MIDIEDITMODE(MidiEditPencil)
-MIDIEDITMODE(MidiEditErase)
 
 /* Changing this order will break the menu */
 ZOOMFOCUS(ZoomFocusLeft)
 ZOOMFOCUS(ZoomFocusRight)
 ZOOMFOCUS(ZoomFocusCenter)
 ZOOMFOCUS(ZoomFocusPlayhead)
+ZOOMFOCUS(ZoomFocusMouse)
 ZOOMFOCUS(ZoomFocusEdit)
 
 DISPLAYCONTROL(FollowPlayhead)
@@ -86,7 +81,7 @@ IMPORTMODE(ImportAsTapeTrack=3)
 
 // if this is changed, remember to update the string table in sfdb_ui.cc
 IMPORTPOSITION(ImportAtTimestamp=0)
-IMPORTPOSITION(ImportAtEditCursor=1)
+IMPORTPOSITION(ImportAtEditPoint=1)
 IMPORTPOSITION(ImportAtPlayhead=2)
 IMPORTPOSITION(ImportAtStart=3)
 
@@ -95,3 +90,11 @@ IMPORTDISPOSITION(ImportDistinctFiles=0)
 IMPORTDISPOSITION(ImportMergeFiles=1)
 IMPORTDISPOSITION(ImportSerializeFiles=2)
 IMPORTDISPOSITION(ImportDistinctChannels=3)
+
+EDITPOINT(EditAtPlayhead)
+EDITPOINT(EditAtSelectedMarker)
+EDITPOINT(EditAtMouse)
+
+INSERTTIMEOPT(LeaveIntersected)
+INSERTTIMEOPT(MoveIntersected)
+INSERTTIMEOPT(SplitIntersected)