append Auto_ to auto modes so they are more easily searchable

git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@6941 d708f5d6-7413-0410-9779-e7cbd77b26cf

3 files changed, 11 insertions, 11 deletions

diff --git a/libs/ardour/ardour/automation_event.h b/libs/ardour/ardour/automation_event.h
index 9d405ec72f..470445d65e 100644
--- a/libs/ardour/ardour/automation_event.h
+++ b/libs/ardour/ardour/automation_event.h
@@ -129,10 +129,10 @@ class AutomationList : public PBD::StatefulDestructible
 	sigc::signal<void> automation_state_changed;
 
 	bool automation_playback() {
-		return (_state & Play) || ((_state & Touch) && !_touching);
+		return (_state & Auto_Play) || ((_state & Auto_Touch) && !_touching);
 	}
 	bool automation_write () {
-		return (_state & Write) || ((_state & Touch) && _touching);
+		return (_state & Auto_Write) || ((_state & Auto_Touch) && _touching);
 	}
 
 	void start_touch ();
diff --git a/libs/ardour/ardour/io.h b/libs/ardour/ardour/io.h
index 3ef3a5a6d4..6ae917b9d4 100644
--- a/libs/ardour/ardour/io.h
+++ b/libs/ardour/ardour/io.h
@@ -245,12 +245,12 @@ class IO : public PBD::StatefulDestructible
 	 void clear_automation ();
 	 
 	 bool gain_automation_recording() const { 
-		 return (_gain_automation_curve.automation_state() & (Write|Touch));
+		 return (_gain_automation_curve.automation_state() & (Auto_Write|Auto_Touch));
 	 }
 	 
 	 bool gain_automation_playback() const {
-		 return (_gain_automation_curve.automation_state() & Play) ||
-			 ((_gain_automation_curve.automation_state() & Touch) && 
+		 return (_gain_automation_curve.automation_state() & Auto_Play) ||
+			 ((_gain_automation_curve.automation_state() & Auto_Touch) && 
 			  !_gain_automation_curve.touching());
 	 }
 
diff --git a/libs/ardour/ardour/types.h b/libs/ardour/ardour/types.h
index 81b7bdd789..84c4d0c5e5 100644
--- a/libs/ardour/ardour/types.h
+++ b/libs/ardour/ardour/types.h
@@ -90,18 +90,18 @@ namespace ARDOUR {
 	};
 
 	enum AutoState {
-		Off = 0x0,
-		Write = 0x1,
-		Touch = 0x2,
-		Play = 0x4
+		Auto_Off = 0x0,
+		Auto_Write = 0x1,
+		Auto_Touch = 0x2,
+		Auto_Play = 0x4
 	};
 
 	std::string auto_state_to_string (AutoState);
 	AutoState string_to_auto_state (std::string);
 
 	enum AutoStyle {
-		Absolute = 0x1,
-		Trim = 0x2
+		Auto_Absolute = 0x1,
+		Auto_Trim = 0x2
 	};
 
 	std::string auto_style_to_string (AutoStyle);