summaryrefslogtreecommitdiff
path: root/libs/ardour/panner.cc
diff options
context:
space:
mode:
authorBen Loftis <ben@glw.com>2010-04-20 17:27:45 +0000
committerBen Loftis <ben@glw.com>2010-04-20 17:27:45 +0000
commit4894ec8c413c0447ed3fd60ea2fcf3975ee96ceb (patch)
tree1ce393b9c212e1d45a96848bcc0fe5f970e8f511 /libs/ardour/panner.cc
parentf2588f6814cff6cd9c7ef3a67c41a0bfdc7e5c7b (diff)
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
Diffstat (limited to 'libs/ardour/panner.cc')
-rw-r--r--libs/ardour/panner.cc14
1 files changed, 7 insertions, 7 deletions
diff --git a/libs/ardour/panner.cc b/libs/ardour/panner.cc
index 737c2e052a..25ce8b2277 100644
--- a/libs/ardour/panner.cc
+++ b/libs/ardour/panner.cc
@@ -102,7 +102,7 @@ StreamPanner::PanControllable::can_send_feedback () const
{
AutoState astate = panner.get_parent().automation_state ();
- if ((astate == Play) || (astate == Touch && !panner.get_parent().touching())) {
+ if ((astate == Auto_Play) || (astate == Auto_Touch && !panner.get_parent().touching())) {
return true;
}
@@ -198,7 +198,7 @@ BaseStereoPanner::~BaseStereoPanner ()
void
BaseStereoPanner::snapshot (nframes_t now)
{
- if (_automation.automation_state() == Write || _automation.automation_state() == Touch) {
+ if (_automation.automation_state() == Auto_Write || _automation.automation_state() == Auto_Touch) {
_automation.rt_add (now, x);
}
}
@@ -206,7 +206,7 @@ BaseStereoPanner::snapshot (nframes_t now)
void
BaseStereoPanner::transport_stopped (nframes_t frame)
{
- if (_automation.automation_state() != Off) {
+ if (_automation.automation_state() != Auto_Off) {
set_position (_automation.eval (frame));
}
@@ -229,7 +229,7 @@ BaseStereoPanner::set_automation_state (AutoState state)
/* don't reset pan if we're moving to Off or Write mode;
if we're moving to Write, the user may have manually set up pans
that they don't want to lose */
- if (state != Off && state != Write) {
+ if (state != Auto_Off && state != Auto_Write) {
set_position (_automation.eval (parent.session().transport_frame()));
}
}
@@ -546,7 +546,7 @@ EqualPowerStereoPanner::set_state (const XMLNode& node)
_automation.set_state (*((*iter)->children().front()));
- if (_automation.automation_state() != Off) {
+ if (_automation.automation_state() != Auto_Off) {
set_position (_automation.eval (parent.session().transport_frame()));
}
}
@@ -1067,7 +1067,7 @@ Panner::automation_state () const
if (!empty()) {
return front()->automation().automation_state ();
} else {
- return Off;
+ return Auto_Off;
}
}
@@ -1077,7 +1077,7 @@ Panner::automation_style () const
if (!empty()) {
return front()->automation().automation_style ();
} else {
- return Absolute;
+ return Auto_Absolute;
}
}