projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
NO-OP: whitespace
[ardour.git]
/
libs
/
ardour
/
automatable.cc
diff --git
a/libs/ardour/automatable.cc
b/libs/ardour/automatable.cc
index 981c4b571f01d754094defd459748a3fef1e1867..3230dac28f28fd40200765a6aad808c412f062b3 100644
(file)
--- a/
libs/ardour/automatable.cc
+++ b/
libs/ardour/automatable.cc
@@
-65,12
+65,12
@@
Automatable::Automatable (const Automatable& other)
, _a_session (other._a_session)
, _automated_controls (new ControlList)
{
, _a_session (other._a_session)
, _automated_controls (new ControlList)
{
-
Glib::Threads::Mutex::Lock lm (other._control_lock);
+ Glib::Threads::Mutex::Lock lm (other._control_lock);
-
for (Controls::const_iterator i = other._controls.begin(); i != other._controls.end(); ++i) {
-
boost::shared_ptr<Evoral::Control> ac (control_factory (i->first));
+ for (Controls::const_iterator i = other._controls.begin(); i != other._controls.end(); ++i) {
+ boost::shared_ptr<Evoral::Control> ac (control_factory (i->first));
add_control (ac);
add_control (ac);
-
}
+ }
}
Automatable::~Automatable ()
}
Automatable::~Automatable ()
@@
-148,7
+148,7
@@
Automatable::load_automation (const string& path)
return 0;
return 0;
-
bad:
+bad:
error << string_compose(_("cannot load automation data from %2"), fullpath) << endmsg;
controls().clear ();
::fclose (in);
error << string_compose(_("cannot load automation data from %2"), fullpath) << endmsg;
controls().clear ();
::fclose (in);
@@
-270,11
+270,11
@@
Automatable::set_automation_xml_state (const XMLNode& node, Evoral::Parameter le
boost::shared_ptr<AutomationControl> existing = automation_control (param);
if (existing) {
boost::shared_ptr<AutomationControl> existing = automation_control (param);
if (existing) {
-
existing->alist()->set_state (**niter, 3000);
+ existing->alist()->set_state (**niter, 3000);
} else {
} else {
-
boost::shared_ptr<Evoral::Control> newcontrol = control_factory(param);
+ boost::shared_ptr<Evoral::Control> newcontrol = control_factory(param);
add_control (newcontrol);
add_control (newcontrol);
-
boost::shared_ptr<AutomationList> al (new AutomationList(**niter, param));
+ boost::shared_ptr<AutomationList> al (new AutomationList(**niter, param));
newcontrol->set_list(al);
}
newcontrol->set_list(al);
}
@@
-478,7
+478,7
@@
Automatable::automation_list_automation_state_changed (Evoral::Parameter param,
RCUWriter<ControlList> writer (_automated_controls);
boost::shared_ptr<ControlList> cl = writer.get_copy ();
RCUWriter<ControlList> writer (_automated_controls);
boost::shared_ptr<ControlList> cl = writer.get_copy ();
- ControlList::
const_
iterator fi = std::find (cl->begin(), cl->end(), c);
+ ControlList::iterator fi = std::find (cl->begin(), cl->end(), c);
if (fi != cl->end()) {
cl->erase (fi);
}
if (fi != cl->end()) {
cl->erase (fi);
}