fix merge issues with master

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

diff --git a/libs/ardour/automation_list.cc b/libs/ardour/automation_list.cc
index 26ca7b097a06bffe4d89163f8ea74f8eabff6e4a..83df92488b02087b3adf6357992ffe57da0224de 100644 (file)
--- a/libs/ardour/automation_list.cc
+++ b/libs/ardour/automation_list.cc
@@ -180,11 +180,6 @@ AutomationList::set_automation_state (AutoState s)
 {
        if (s != _state) {
                _state = s;
-
-                if (_state == Write) {
-                        Glib::Mutex::Lock lm (ControlList::_lock);
-                        nascent.push_back (new NascentInfo ());
-                }
                automation_state_changed (s); /* EMIT SIGNAL */
        }
 }
@@ -202,15 +197,14 @@ void
 AutomationList::start_touch (double when)
 {
         if (_state == Touch) {
-                Glib::Mutex::Lock lm (ControlList::_lock);
-                nascent.push_back (new NascentInfo (when));
+               start_write_pass (when);
         }
 
        g_atomic_int_set (&_touching, 1);
 }
 
 void
-AutomationList::stop_touch (bool mark, double when)
+AutomationList::stop_touch (bool mark, double)
 {
        if (g_atomic_int_get (&_touching) == 0) {
                /* this touch has already been stopped (probably by Automatable::transport_stopped),
@@ -223,22 +217,11 @@ AutomationList::stop_touch (bool mark, double when)
 
         if (_state == Touch) {
 
-               assert (!nascent.empty ());
-
-                Glib::Mutex::Lock lm (ControlList::_lock);
-
                 if (mark) {
-
-                       nascent.back()->end_time = when;
-
-                } else {
-
-                        /* nascent info created in start touch but never used. just get rid of it.
-                         */
-
-                        NascentInfo* ninfo = nascent.back ();
-                        nascent.erase (nascent.begin());
-                        delete ninfo;
+                       
+                       /* XXX need to mark the last added point with the
+                        * current time 
+                        */
                 }
         }
 }
@@ -447,7 +430,7 @@ AutomationList::set_state (const XMLNode& node, int version)
        if ((prop = node.property (X_("automation-id"))) != 0){
                _parameter = EventTypeMap::instance().new_parameter(prop->value());
        } else {
-               warning << "Legacy session: automation list has no automation-id property.";
+               warning << "Legacy session: automation list has no automation-id property." << endmsg;
        }
 
        if ((prop = node.property (X_("interpolation-style"))) != 0) {
@@ -473,6 +456,7 @@ AutomationList::set_state (const XMLNode& node, int version)
                 if (_state == Write) {
                         _state = Off;
                 }
+               automation_state_changed(_state);
        } else {
                _state = Off;
        }