Prefer testing the session instead of using a global variable

[ardour.git] / gtk2_ardour / editing.cc

diff --git a/gtk2_ardour/editing.cc b/gtk2_ardour/editing.cc
index 963b83647ca1407cd0a89a8c74d9fe6f7403ea2d..b7f624e7efbf92de5a1074e700bab95157cbad3f 100644 (file)
--- a/gtk2_ardour/editing.cc
+++ b/gtk2_ardour/editing.cc
@@ -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
@@ -17,17 +17,17 @@
 
 */
 
-#include <string>
+#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*/
@@ -37,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
@@ -63,7 +63,7 @@ SnapMode
 str2snapmode (const string & str) {
        const char* type = str.c_str();
        #include "editing_syms.h"
-       return SnapNormal;
+       return SnapMagnetic;
 }
 
 #undef SNAPMODE
@@ -114,25 +114,6 @@ const char *mousemodestrs[] = {
 #undef MOUSEMODE
 #define MOUSEMODE(a) /*empty*/
 
-// MIDIEDITMODE
-#undef MIDIEDITMODE
-#define MIDIEDITMODE(s) if (!strcmp(type, #s)) {return s;}
-MidiEditMode
-str2midieditmode (const string & str) {
-       const char* type = str.c_str();
-       #include "editing_syms.h"
-       return MidiEditSelect;
-}
-
-#undef MIDIEDITMODE
-#define MIDIEDITMODE(s) N_(#s),
-const char *midieditmodestrs[] = {
-       #include "editing_syms.h"
-       0
-};
-#undef MIDIEDITMODE
-#define MIDIEDITMODE(a) /*empty*/
-
 // ZOOMFOCUS
 #undef ZOOMFOCUS
 #define ZOOMFOCUS(s) if (!strcmp(type, #s)) {return s;}