smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2026-01-16 10:26:03 +01:00
Code Issues Projects Releases Wiki Activity

append Auto_ to auto modes so they are more easily searchable

Browse source 
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@6941 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Ben Loftis 2010-04-20 17:27:45 +00:00
parent f2588f6814
commit 4894ec8c41
16 changed files with 122 additions and 122 deletions
Download patch file Download diff file Expand all files Collapse all files

28
gtk2_ardour/automation_time_axis.cc
View file

@ -204,13 +204,13 @@ AutomationTimeAxisView::auto_clicked ()
MenuList& items (automation_menu->items());
items.push_back (MenuElem (_("Manual"),
bind (mem_fun(*this, &AutomationTimeAxisView::set_automation_state), (AutoState) Off)));
bind (mem_fun(*this, &AutomationTimeAxisView::set_automation_state), (AutoState) Auto_Off)));
items.push_back (MenuElem (_("Play"),
bind (mem_fun(*this, &AutomationTimeAxisView::set_automation_state), (AutoState) Play)));
bind (mem_fun(*this, &AutomationTimeAxisView::set_automation_state), (AutoState) Auto_Play)));
items.push_back (MenuElem (_("Write"),
bind (mem_fun(*this, &AutomationTimeAxisView::set_automation_state), (AutoState) Write)));
bind (mem_fun(*this, &AutomationTimeAxisView::set_automation_state), (AutoState) Auto_Write)));
items.push_back (MenuElem (_("Touch"),
bind (mem_fun(*this, &AutomationTimeAxisView::set_automation_state), (AutoState) Touch)));
bind (mem_fun(*this, &AutomationTimeAxisView::set_automation_state), (AutoState) Auto_Touch)));
}
automation_menu->popup (1, gtk_get_current_event_time());
@ -225,13 +225,13 @@ AutomationTimeAxisView::automation_state_changed ()
/* update button label */
if (lines.empty()) {
state = Off;
state = Auto_Off;
} else {
state = lines.front()->the_list().automation_state ();
}
switch (state & (Off|Play|Touch|Write)) {
case Off:
switch (state & (Auto_Off|Auto_Play|Auto_Touch|Auto_Write)) {
case Auto_Off:
auto_button.set_label (_("Manual"));
if (auto_off_item) {
ignore_state_request = true;
@ -242,7 +242,7 @@ AutomationTimeAxisView::automation_state_changed ()
ignore_state_request = false;
}
break;
case Play:
case Auto_Play:
auto_button.set_label (_("Play"));
if (auto_play_item) {
ignore_state_request = true;
@ -253,7 +253,7 @@ AutomationTimeAxisView::automation_state_changed ()
ignore_state_request = false;
}
break;
case Write:
case Auto_Write:
auto_button.set_label (_("Write"));
if (auto_write_item) {
ignore_state_request = true;
@ -264,7 +264,7 @@ AutomationTimeAxisView::automation_state_changed ()
ignore_state_request = false;
}
break;
case Touch:
case Auto_Touch:
auto_button.set_label (_("Touch"));
if (auto_touch_item) {
ignore_state_request = true;
@ -421,19 +421,19 @@ AutomationTimeAxisView::build_display_menu ()
MenuList& as_items = auto_state_menu->items();
as_items.push_back (CheckMenuElem (_("Manual"),
bind (mem_fun(*this, &AutomationTimeAxisView::set_automation_state), (AutoState) Off)));
bind (mem_fun(*this, &AutomationTimeAxisView::set_automation_state), (AutoState) Auto_Off)));
auto_off_item = dynamic_cast<CheckMenuItem*>(&as_items.back());
as_items.push_back (CheckMenuElem (_("Play"),
bind (mem_fun(*this, &AutomationTimeAxisView::set_automation_state), (AutoState) Play)));
bind (mem_fun(*this, &AutomationTimeAxisView::set_automation_state), (AutoState) Auto_Play)));
auto_play_item = dynamic_cast<CheckMenuItem*>(&as_items.back());
as_items.push_back (CheckMenuElem (_("Write"),
bind (mem_fun(*this, &AutomationTimeAxisView::set_automation_state), (AutoState) Write)));
bind (mem_fun(*this, &AutomationTimeAxisView::set_automation_state), (AutoState) Auto_Write)));
auto_write_item = dynamic_cast<CheckMenuItem*>(&as_items.back());
as_items.push_back (CheckMenuElem (_("Touch"),
bind (mem_fun(*this, &AutomationTimeAxisView::set_automation_state), (AutoState) Touch)));
bind (mem_fun(*this, &AutomationTimeAxisView::set_automation_state), (AutoState) Auto_Touch)));
auto_touch_item = dynamic_cast<CheckMenuItem*>(&as_items.back());
items.push_back (MenuElem (_("State"), *auto_state_menu));

22
gtk2_ardour/gain_meter.cc
View file

@ -180,13 +180,13 @@ GainMeterBase::set_io (boost::shared_ptr<IO> io)
gain_astate_menu.items().clear ();
gain_astate_menu.items().push_back (MenuElem (_("Manual"),
bind (mem_fun (*_io, &IO::set_gain_automation_state), (AutoState) Off)));
bind (mem_fun (*_io, &IO::set_gain_automation_state), (AutoState) Auto_Off)));
gain_astate_menu.items().push_back (MenuElem (_("Play"),
bind (mem_fun (*_io, &IO::set_gain_automation_state), (AutoState) Play)));
bind (mem_fun (*_io, &IO::set_gain_automation_state), (AutoState) Auto_Play)));
gain_astate_menu.items().push_back (MenuElem (_("Write"),
bind (mem_fun (*_io, &IO::set_gain_automation_state), (AutoState) Write)));
bind (mem_fun (*_io, &IO::set_gain_automation_state), (AutoState) Auto_Write)));
gain_astate_menu.items().push_back (MenuElem (_("Touch"),
bind (mem_fun (*_io, &IO::set_gain_automation_state), (AutoState) Touch)));
bind (mem_fun (*_io, &IO::set_gain_automation_state), (AutoState) Auto_Touch)));
connections.push_back (gain_automation_style_button.signal_button_press_event().connect (mem_fun(*this, &GainMeterBase::gain_automation_style_button_event), false));
connections.push_back (gain_automation_state_button.signal_button_press_event().connect (mem_fun(*this, &GainMeterBase::gain_automation_state_button_event), false));
@ -410,7 +410,7 @@ GainMeterBase::set_fader_name (const char * name)
void
GainMeterBase::update_gain_sensitive ()
{
static_cast<Gtkmm2ext::SliderController*>(gain_slider)->set_sensitive (!(_io->gain_automation_state() & Play));
static_cast<Gtkmm2ext::SliderController*>(gain_slider)->set_sensitive (!(_io->gain_automation_state() & Auto_Play));
}
@ -622,16 +622,16 @@ GainMeterBase::_astate_string (AutoState state, bool shrt)
string sstr;
switch (state) {
case Off:
case Auto_Off:
sstr = (shrt ? "M" : _("M"));
break;
case Play:
case Auto_Play:
sstr = (shrt ? "P" : _("P"));
break;
case Touch:
case Auto_Touch:
sstr = (shrt ? "T" : _("T"));
break;
case Write:
case Auto_Write:
sstr = (shrt ? "W" : _("W"));
break;
}
@ -654,7 +654,7 @@ GainMeterBase::short_astyle_string (AutoStyle style)
string
GainMeterBase::_astyle_string (AutoStyle style, bool shrt)
{
if (style & Trim) {
if (style & Auto_Trim) {
return _("Trim");
} else {
/* XXX it might different in different languages */
@ -692,7 +692,7 @@ GainMeterBase::gain_automation_state_changed ()
break;
}
x = (_io->gain_automation_state() != Off);
x = (_io->gain_automation_state() != Auto_Off);
if (gain_automation_state_button.get_active() != x) {
ignore_toggle = true;

20
gtk2_ardour/generic_pluginui.cc
View file

@ -332,17 +332,17 @@ GenericPluginUI::automation_state_changed (ControlUI* cui)
{
/* update button label */
switch (insert->get_port_automation_state (cui->port_index) & (Off|Play|Touch|Write)) {
case Off:
switch (insert->get_port_automation_state (cui->port_index) & (Auto_Off|Auto_Play|Auto_Touch|Auto_Write)) {
case Auto_Off:
cui->automate_button.set_label (_("Manual"));
break;
case Play:
case Auto_Play:
cui->automate_button.set_label (_("Play"));
break;
case Write:
case Auto_Write:
cui->automate_button.set_label (_("Write"));
break;
case Touch:
case Auto_Touch:
cui->automate_button.set_label (_("Touch"));
break;
default:
@ -603,7 +603,7 @@ GenericPluginUI::stop_touch (GenericPluginUI::ControlUI* cui)
when = insert->session().transport_frame();
}
if (insert->automation_list (cui->port_index).automation_state() == Touch) {
if (insert->automation_list (cui->port_index).automation_state() == Auto_Touch) {
insert->automation_list (cui->port_index).stop_touch (mark, when);
}
}
@ -622,13 +622,13 @@ GenericPluginUI::astate_clicked (ControlUI* cui, uint32_t port)
items.clear ();
items.push_back (MenuElem (_("Manual"),
bind (mem_fun(*this, &GenericPluginUI::set_automation_state), (AutoState) Off, cui)));
bind (mem_fun(*this, &GenericPluginUI::set_automation_state), (AutoState) Auto_Off, cui)));
items.push_back (MenuElem (_("Play"),
bind (mem_fun(*this, &GenericPluginUI::set_automation_state), (AutoState) Play, cui)));
bind (mem_fun(*this, &GenericPluginUI::set_automation_state), (AutoState) Auto_Play, cui)));
items.push_back (MenuElem (_("Write"),
bind (mem_fun(*this, &GenericPluginUI::set_automation_state), (AutoState) Write, cui)));
bind (mem_fun(*this, &GenericPluginUI::set_automation_state), (AutoState) Auto_Write, cui)));
items.push_back (MenuElem (_("Touch"),
bind (mem_fun(*this, &GenericPluginUI::set_automation_state), (AutoState) Touch, cui)));
bind (mem_fun(*this, &GenericPluginUI::set_automation_state), (AutoState) Auto_Touch, cui)));
automation_menu->popup (1, gtk_get_current_event_time());
}

22
gtk2_ardour/panner_ui.cc
View file

@ -175,13 +175,13 @@ PannerUI::build_astate_menu ()
}
pan_astate_menu->items().push_back (MenuElem (_("Manual"),
bind (mem_fun (_io->panner(), &Panner::set_automation_state), (AutoState) Off)));
bind (mem_fun (_io->panner(), &Panner::set_automation_state), (AutoState) Auto_Off)));
pan_astate_menu->items().push_back (MenuElem (_("Play"),
bind (mem_fun (_io->panner(), &Panner::set_automation_state), (AutoState) Play)));
bind (mem_fun (_io->panner(), &Panner::set_automation_state), (AutoState) Auto_Play)));
pan_astate_menu->items().push_back (MenuElem (_("Write"),
bind (mem_fun (_io->panner(), &Panner::set_automation_state), (AutoState) Write)));
bind (mem_fun (_io->panner(), &Panner::set_automation_state), (AutoState) Auto_Write)));
pan_astate_menu->items().push_back (MenuElem (_("Touch"),
bind (mem_fun (_io->panner(), &Panner::set_automation_state), (AutoState) Touch)));
bind (mem_fun (_io->panner(), &Panner::set_automation_state), (AutoState) Auto_Touch)));
}
@ -684,7 +684,7 @@ PannerUI::pan_printer (char *buf, uint32_t len, Adjustment* adj)
void
PannerUI::update_pan_sensitive ()
{
bool sensitive = !(_io->panner().automation_state() & Play);
bool sensitive = !(_io->panner().automation_state() & Auto_Play);
switch (_io->n_outputs()) {
case 0:
@ -786,7 +786,7 @@ PannerUI::pan_automation_state_changed ()
return;
}
x = (_io->panner().front()->automation().automation_state() != Off);
x = (_io->panner().front()->automation().automation_state() != Auto_Off);
if (pan_automation_state_button.get_active() != x) {
ignore_toggle = true;
@ -823,16 +823,16 @@ PannerUI::_astate_string (AutoState state, bool shrt)
string sstr;
switch (state) {
case Off:
case Auto_Off:
sstr = (shrt ? "M" : _("M"));
break;
case Play:
case Auto_Play:
sstr = (shrt ? "P" : _("P"));
break;
case Touch:
case Auto_Touch:
sstr = (shrt ? "T" : _("T"));
break;
case Write:
case Auto_Write:
sstr = (shrt ? "W" : _("W"));
break;
}
@ -855,7 +855,7 @@ PannerUI::short_astyle_string (AutoStyle style)
string
PannerUI::_astyle_string (AutoStyle style, bool shrt)
{
if (style & Trim) {
if (style & Auto_Trim) {
return _("Trim");
} else {
/* XXX it might different in different languages */

4
libs/ardour/ardour/automation_event.h
View file

@ -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 ();

6
libs/ardour/ardour/io.h
View file

@ -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());
}

12
libs/ardour/ardour/types.h
View file

@ -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);

6
libs/ardour/audio_track.cc
View file

@ -813,7 +813,7 @@ AudioTrack::export_stuff (vector<Sample*>& buffers, uint32_t nbufs, nframes_t st
}
}
if (_gain_automation_curve.automation_state() == Play) {
if (_gain_automation_curve.automation_state() == Auto_Play) {
_gain_automation_curve.get_vector (start, start + nframes, gain_automation, nframes);
@ -961,8 +961,8 @@ AudioTrack::freeze (InterThreadInfo& itt)
/* reset stuff that has already been accounted for in the freeze process */
set_gain (1.0, this);
_gain_automation_curve.set_automation_state (Off);
_panner->set_automation_state (Off);
_gain_automation_curve.set_automation_state (Auto_Off);
_panner->set_automation_state (Auto_Off);
_freeze_record.state = Frozen;
FreezeChange(); /* EMIT SIGNAL */

16
libs/ardour/automation_event.cc
View file

@ -57,8 +57,8 @@ AutomationList::AutomationList (double defval)
{
_frozen = 0;
changed_when_thawed = false;
_state = Off;
_style = Absolute;
_state = Auto_Off;
_style = Auto_Absolute;
_touching = false;
_new_touch = false;
min_yval = FLT_MIN;
@ -146,8 +146,8 @@ AutomationList::AutomationList (const XMLNode& node)
max_yval = FLT_MAX;
max_xval = 0; // means "no limit"
_dirty = false;
_state = Off;
_style = Absolute;
_state = Auto_Off;
_style = Auto_Absolute;
rt_insertion_point = events.end();
lookup_cache.left = -1;
lookup_cache.range.first = events.end();
@ -327,7 +327,7 @@ AutomationList::rt_add (double when, double value)
{
/* this is for automation recording */
if ((_state & Touch) && !_touching) {
if ((_state & Auto_Touch) && !_touching) {
return;
}
@ -1267,7 +1267,7 @@ AutomationList::state (bool full)
root->add_property ("state", auto_state_to_string (_state));
} else {
/* never save anything but Off for automation state to a template */
root->add_property ("state", auto_state_to_string (Off));
root->add_property ("state", auto_state_to_string (Auto_Off));
}
root->add_property ("style", auto_style_to_string (_style));
@ -1426,13 +1426,13 @@ AutomationList::set_state (const XMLNode& node)
if ((prop = node.property (X_("style"))) != 0) {
_style = string_to_auto_style (prop->value());
} else {
_style = Absolute;
_style = Auto_Absolute;
}
if ((prop = node.property (X_("state"))) != 0) {
_state = string_to_auto_state (prop->value());
} else {
_state = Off;
_state = Auto_Off;
}
if ((prop = node.property (X_("min_yval"))) != 0) {

12
libs/ardour/enums.cc
View file

@ -107,14 +107,14 @@ setup_enum_writer ()
REGISTER_ENUM (MuteAutomation);
REGISTER_BITS (_AutomationType);
REGISTER_ENUM (Off);
REGISTER_ENUM (Write);
REGISTER_ENUM (Touch);
REGISTER_ENUM (Play);
REGISTER_ENUM (Auto_Off);
REGISTER_ENUM (Auto_Write);
REGISTER_ENUM (Auto_Touch);
REGISTER_ENUM (Auto_Play);
REGISTER_BITS (_AutoState);
REGISTER_ENUM (Absolute);
REGISTER_ENUM (Trim);
REGISTER_ENUM (Auto_Absolute);
REGISTER_ENUM (Auto_Trim);
REGISTER_BITS (_AutoStyle);
REGISTER_ENUM (CaptureTime);

16
libs/ardour/insert.cc
View file

@ -169,7 +169,7 @@ PluginInsert::auto_state_changed (uint32_t which)
/* don't reset automation if we're moving to Off or Write mode;
if we're moving to Write, the user may have manually set up automation
that they don't want to lose */
if (alist.automation_state() != Off && alist.automation_state() != Write) {
if (alist.automation_state() != Auto_Off && alist.automation_state() != Auto_Write) {
_plugins[0]->set_parameter (which, alist.eval (_session.transport_frame()));
}
}
@ -361,7 +361,7 @@ PluginInsert::transport_stopped (nframes_t now)
if (alist) {
alist->reposition_for_rt_add (now);
if (alist->automation_state() != Off) {
if (alist->automation_state() != Auto_Off) {
_plugins[0]->set_parameter (n, alist->eval (now));
}
}
@ -507,7 +507,7 @@ PluginInsert::get_port_automation_state (uint32_t port)
if (port < _plugins[0]->parameter_count()) {
return automation_list (port).automation_state();
} else {
return Off;
return Auto_Off;
}
}
@ -523,11 +523,11 @@ PluginInsert::protect_automation ()
AutomationList& al = automation_list (*i);
switch (al.automation_state()) {
case Write:
al.set_automation_state (Off);
case Auto_Write:
al.set_automation_state (Auto_Off);
break;
case Touch:
al.set_automation_state (Play);
case Auto_Touch:
al.set_automation_state (Auto_Play);
break;
default:
break;
@ -831,7 +831,7 @@ PluginInsert::set_state(const XMLNode& node)
/* missing */
automation_list (port_id).set_automation_state (Off);
automation_list (port_id).set_automation_state (Auto_Off);
}
}

14
libs/ardour/io.cc
View file

@ -165,8 +165,8 @@ IO::IO (Session& s, string name,
last_automation_snapshot = 0;
_gain_automation_state = Off;
_gain_automation_style = Absolute;
_gain_automation_state = Auto_Off;
_gain_automation_style = Auto_Absolute;
{
// IO::Meter is emitted from another thread so the
@ -1565,7 +1565,7 @@ IO::state (bool full_state)
snprintf (buf, sizeof (buf), "0x%x", (int) _gain_automation_curve.automation_state());
} else {
/* never store anything except Off for automation state in a template */
snprintf (buf, sizeof (buf), "0x%x", ARDOUR::Off);
snprintf (buf, sizeof (buf), "0x%x", ARDOUR::Auto_Off);
}
return *node;
@ -2591,7 +2591,7 @@ IO::set_gain_automation_state (AutoState state)
/* don't reset gain if we're moving to Off or Write mode;
if we're moving to Write, the user may have manually set up gains
that they don't want to lose */
if (state != Off && state != Write) {
if (state != Auto_Off && state != Auto_Write) {
set_gain (_gain_automation_curve.eval (_session.transport_frame()), this);
}
}
@ -2671,7 +2671,7 @@ IO::end_gain_touch ()
bool mark = false;
double when = 0;
if (_session.transport_rolling() && _gain_automation_curve.automation_state() == Touch) {
if (_session.transport_rolling() && _gain_automation_curve.automation_state() == Auto_Touch) {
mark = true;
when = _session.transport_frame();
}
@ -2694,7 +2694,7 @@ IO::end_pan_touch (uint32_t which)
bool mark = false;
double when = 0;
if (_session.transport_rolling() && (*_panner)[which]->automation().automation_state() == Touch) {
if (_session.transport_rolling() && (*_panner)[which]->automation().automation_state() == Auto_Touch) {
mark = true;
when = _session.transport_frame();
}
@ -2719,7 +2719,7 @@ IO::transport_stopped (nframes_t frame)
{
_gain_automation_curve.reposition_for_rt_add (frame);
if (_gain_automation_curve.automation_state() != Off) {
if (_gain_automation_curve.automation_state() != Auto_Off) {
/* the src=0 condition is a special signal to not propagate
automation gain changes into the mix group when locating.

14
libs/ardour/panner.cc
View file

@ -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;
}
}

20
libs/ardour/route.cc
View file

@ -717,8 +717,8 @@ Route::process_output_buffers (vector<Sample*>& bufs, uint32_t nbufs,
} else {
// cerr << _name << " panner state = " << _panner->automation_state() << endl;
if (!_panner->empty() &&
(_panner->automation_state() & Play ||
((_panner->automation_state() & Touch) && !_panner->touching()))) {
(_panner->automation_state() & Auto_Play ||
((_panner->automation_state() & Auto_Touch) && !_panner->touching()))) {
pan_automated (bufs, nbufs, start_frame, end_frame, nframes);
} else {
pan (bufs, nbufs, nframes, 1.0);
@ -2608,21 +2608,21 @@ void
Route::protect_automation ()
{
switch (gain_automation_state()) {
case Write:
set_gain_automation_state (Off);
case Touch:
set_gain_automation_state (Play);
case Auto_Write:
set_gain_automation_state (Auto_Off);
case Auto_Touch:
set_gain_automation_state (Auto_Play);
break;
default:
break;
}
switch (panner().automation_state ()) {
case Write:
panner().set_automation_state (Off);
case Auto_Write:
panner().set_automation_state (Auto_Off);
break;
case Touch:
panner().set_automation_state (Play);
case Auto_Touch:
panner().set_automation_state (Auto_Play);
break;
default:
break;

28
libs/ardour/utils.cc
View file

@ -511,18 +511,18 @@ AutoState
ARDOUR::string_to_auto_state (std::string str)
{
if (str == X_("Off")) {
return Off;
return Auto_Off;
} else if (str == X_("Play")) {
return Play;
return Auto_Play;
} else if (str == X_("Write")) {
return Write;
return Auto_Write;
} else if (str == X_("Touch")) {
return Touch;
return Auto_Touch;
}
fatal << string_compose (_("programming error: %1 %2"), "illegal AutoState string: ", str) << endmsg;
/*NOTREACHED*/
return Touch;
return Auto_Touch;
}
string
@ -531,16 +531,16 @@ ARDOUR::auto_state_to_string (AutoState as)
/* to be used only for XML serialization, no i18n done */
switch (as) {
case Off:
case Auto_Off:
return X_("Off");
break;
case Play:
case Auto_Play:
return X_("Play");
break;
case Write:
case Auto_Write:
return X_("Write");
break;
case Touch:
case Auto_Touch:
return X_("Touch");
}
@ -553,14 +553,14 @@ AutoStyle
ARDOUR::string_to_auto_style (std::string str)
{
if (str == X_("Absolute")) {
return Absolute;
return Auto_Absolute;
} else if (str == X_("Trim")) {
return Trim;
return Auto_Trim;
}
fatal << string_compose (_("programming error: %1 %2"), "illegal AutoStyle string: ", str) << endmsg;
/*NOTREACHED*/
return Trim;
return Auto_Trim;
}
string
@ -569,10 +569,10 @@ ARDOUR::auto_style_to_string (AutoStyle as)
/* to be used only for XML serialization, no i18n done */
switch (as) {
case Absolute:
case Auto_Absolute:
return X_("Absolute");
break;
case Trim:
case Auto_Trim:
return X_("Trim");
break;
}

4
libs/surfaces/mackie/mackie_control_protocol.cc
View file

@ -1117,13 +1117,13 @@ void
MackieControlProtocol::update_automation( RouteSignal & rs )
{
ARDOUR::AutoState gain_state = rs.route()->gain_automation_state();
if ( gain_state == Touch || gain_state == Play )
if ( gain_state == Auto_Touch || gain_state == Auto_Play )
{
notify_gain_changed( &rs, false );
}
ARDOUR::AutoState panner_state = rs.route()->panner().automation_state();
if ( panner_state == Touch || panner_state == Play )
if ( panner_state == Auto_Touch || panner_state == Auto_Play )
{
notify_panner_changed( &rs, false );
}