X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fediting.cc;h=b7f624e7efbf92de5a1074e700bab95157cbad3f;hb=20fb871d5ac252c820bc8dc38403b2fbb4e4aca8;hp=486808065e28ed9b11b0de10d415ca837346a100;hpb=c359f881a1fbcbcbeeed3fadfe3b9df19418998a;p=ardour.git

diff --git a/gtk2_ardour/editing.cc b/gtk2_ardour/editing.cc
index 486808065e..b7f624e7ef 100644
--- a/gtk2_ardour/editing.cc
+++ b/gtk2_ardour/editing.cc
@@ -17,18 +17,17 @@
 
 */
 
-#include <cstring>
 #include <cstring>
 
 #include "editing.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 
 // This involves some cpp magic. --taybin
 
-#define SNAPTYPE(a) /*empty*/
+#define GRIDTYPE(a) /*empty*/
 #define SNAPMODE(a) /*empty*/
 #define REGIONLISTSORTTYPE(a) /*empty*/
 #define MOUSEMODE(a) /*empty*/
@@ -38,24 +37,24 @@ using namespace std;
 
 namespace Editing {
 
-// SNAPTYPE
-#undef SNAPTYPE
-#define SNAPTYPE(s) if (!strcmp(type, #s)) {return s;}
-SnapType
-str2snaptype (const string & str) {
+// GRIDTYPE
+#undef GRIDTYPE
+#define GRIDTYPE(s) if (!strcmp(type, #s)) {return s;}
+GridType
+str2gridtype (const string & str) {
 	const char* type = str.c_str();
 	#include "editing_syms.h"
-	return SnapToBar;
+	return GridTypeBar;
 }
 
-#undef SNAPTYPE
-#define SNAPTYPE(s) N_(#s),
-const char *snaptypestrs[] = {
+#undef GRIDTYPE
+#define GRIDTYPE(s) N_(#s),
+const char *gridtypestrs[] = {
 	#include "editing_syms.h"
 	0
 };
-#undef SNAPTYPE
-#define SNAPTYPE(a) /*empty*/
+#undef GRIDTYPE
+#define GRIDTYPE(a) /*empty*/
 
 // SNAPMODE
 #undef SNAPMODE
@@ -64,7 +63,7 @@ SnapMode
 str2snapmode (const string & str) {
 	const char* type = str.c_str();
 	#include "editing_syms.h"
-	return SnapNormal;
+	return SnapMagnetic;
 }
 
 #undef SNAPMODE