Remove unnecessary 0 checks before delete; see http://www.parashift.com/c++-faq-lite...

[ardour.git] / libs / ardour / automation_control.cc

diff --git a/libs/ardour/automation_control.cc b/libs/ardour/automation_control.cc
index 73d5819bc4bcf19d7da47648d8e3d140e08c4654..2100265a87b513d7e217e17e1732f4c9d5caaaae 100644 (file)
--- a/libs/ardour/automation_control.cc
+++ b/libs/ardour/automation_control.cc
@@ -29,64 +29,42 @@ using namespace ARDOUR;
 using namespace PBD;
 
 
-AutomationControl::AutomationControl(Session& session, boost::shared_ptr<AutomationList> list, string name)
-       : Controllable((name == "unnamed controllable") ? list->parameter().to_string() : name)
+AutomationControl::AutomationControl(
+               ARDOUR::Session& session,
+               const Evoral::Parameter& parameter,
+               boost::shared_ptr<ARDOUR::AutomationList> list,
+               const string& name)
+       : Controllable((name != "") ? name : EventTypeMap::instance().to_symbol(parameter))
+       , Evoral::Control(parameter, list)
        , _session(session)
-       , _list(list)
-       , _user_value(list->default_value())
 {
-       cerr << "Created AutomationControl " << name << "(" << list->parameter().to_string() << ")" << endl;
 }
 
 
-/** Get the currently effective value (ie the one that corresponds to current output)
- */
 float
 AutomationControl::get_value() const
 {
-       if (_list->automation_playback())
-               return _list->eval(_session.transport_frame());
-       else
-               return _user_value;
+       bool from_list = _list && ((AutomationList*)_list.get())->automation_playback();
+       return Control::get_float(from_list, _session.transport_frame());
 }
 
 
 void
 AutomationControl::set_value(float value)
 {
-       _user_value = value;
+       bool to_list = _list && _session.transport_stopped()
+               && ((AutomationList*)_list.get())->automation_write();
        
-       if (_session.transport_stopped() && _list->automation_write())
-               _list->add(_session.transport_frame(), value);
+       Control::set_float(value, to_list, _session.transport_frame());
 
        Changed(); /* EMIT SIGNAL */
 }
 
 
-/** Get the latest user-set value, which may not equal get_value() when automation
- * is playing back, etc.
- *
- * Automation write/touch works by periodically sampling this value and adding it
- * to the AutomationList.
- */
-float
-AutomationControl::user_value() const
-{
-       return _user_value;
-}
-       
-
 void
-AutomationControl::set_list(boost::shared_ptr<ARDOUR::AutomationList> list)
+AutomationControl::set_list(boost::shared_ptr<Evoral::ControlList> list)
 {
-       _list = list;
-       _user_value = list->default_value();
+       Control::set_list(list);
        Changed();  /* EMIT SIGNAL */
 }
 
-       
-Parameter
-AutomationControl::parameter() const
-{
-       return _list->parameter();
-}