make AutomationList::operator==() private and abort() as its core, because it should...

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

diff --git a/libs/ardour/automation_list.cc b/libs/ardour/automation_list.cc
index 1cda99d76391e18c3dc3002492d690eb0881dd56..e5a4493618b921a5ead23722e6b78b8b75c4382f 100644 (file)
--- a/libs/ardour/automation_list.cc
+++ b/libs/ardour/automation_list.cc
@@ -137,27 +137,16 @@ AutomationList::create_curve_if_necessary()
        }
 }
 
-bool
-AutomationList::operator== (const AutomationList& other)
-{
-       return _events == other._events;
-}
-
 AutomationList&
 AutomationList::operator= (const AutomationList& other)
 {
        if (this != &other) {
 
-               _events.clear ();
 
-               for (const_iterator i = other._events.begin(); i != other._events.end(); ++i) {
-                       _events.push_back (new Evoral::ControlEvent (**i));
-               }
-
-               _min_yval = other._min_yval;
-               _max_yval = other._max_yval;
-               _max_xval = other._max_xval;
-               _default_value = other._default_value;
+               ControlList::operator= (other);
+               _state = other._state;
+               _style = other._style;
+               _touching = other._touching;
 
                mark_dirty ();
                maybe_signal_changed ();
@@ -181,11 +170,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 (false));
-                }
                automation_state_changed (s); /* EMIT SIGNAL */
        }
 }
@@ -203,34 +187,31 @@ void
 AutomationList::start_touch (double when)
 {
         if (_state == Touch) {
-                Glib::Mutex::Lock lm (ControlList::_lock);
-                nascent.push_back (new NascentInfo (true, 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),
+                  so we've nothing to do.
+               */
+               return;
+       }
+
        g_atomic_int_set (&_touching, 0);
 
         if (_state == Touch) {
-                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.
-                         */
-
-                       assert (!nascent.empty ());
-                        
-                        NascentInfo* ninfo = nascent.back ();
-                        nascent.erase (nascent.begin());
-                        delete ninfo;
+                       
+                       /* XXX need to mark the last added point with the
+                        * current time 
+                        */
                 }
         }
 }
@@ -261,7 +242,7 @@ AutomationList::state (bool full)
 
        root->add_property ("automation-id", EventTypeMap::instance().to_symbol(_parameter));
 
-       root->add_property ("id", _id.to_s());
+       root->add_property ("id", id().to_s());
 
        snprintf (buf, sizeof (buf), "%.12g", _default_value);
        root->add_property ("default", buf);
@@ -269,8 +250,6 @@ AutomationList::state (bool full)
        root->add_property ("min-yval", buf);
        snprintf (buf, sizeof (buf), "%.12g", _max_yval);
        root->add_property ("max-yval", buf);
-       snprintf (buf, sizeof (buf), "%.12g", _max_xval);
-       root->add_property ("max-xval", buf);
 
        root->add_property ("interpolation-style", enum_2_string (_interpolation));
 
@@ -373,6 +352,7 @@ AutomationList::deserialize_events (const XMLNode& node)
 int
 AutomationList::set_state (const XMLNode& node, int version)
 {
+       LocaleGuard lg (X_("POSIX"));
        XMLNodeList nlist = node.children();
        XMLNode* nsos;
        XMLNodeIterator niter;
@@ -418,7 +398,7 @@ AutomationList::set_state (const XMLNode& node, int version)
                        fast_simple_add (x, y);
                }
 
-                thaw ();
+               thaw ();
 
                return 0;
        }
@@ -428,8 +408,7 @@ AutomationList::set_state (const XMLNode& node, int version)
                return -1;
        }
 
-       if ((prop = node.property ("id")) != 0) {
-               _id = prop->value ();
+       if (set_id (node)) {
                /* update session AL list */
                AutomationListCreated(this);
        }
@@ -437,7 +416,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) {
@@ -463,6 +442,7 @@ AutomationList::set_state (const XMLNode& node, int version)
                 if (_state == Write) {
                         _state = Off;
                 }
+               automation_state_changed(_state);
        } else {
                _state = Off;
        }
@@ -479,14 +459,8 @@ AutomationList::set_state (const XMLNode& node, int version)
                _max_yval = FLT_MAX;
        }
 
-       if ((prop = node.property (X_("max-xval"))) != 0) {
-               _max_xval = atof (prop->value ().c_str());
-       } else {
-               _max_xval = 0; // means "no limit ;
-       }
-
        bool have_events = false;
-       
+
        for (niter = nlist.begin(); niter != nlist.end(); ++niter) {
                if ((*niter)->name() == X_("events")) {
                        deserialize_events (*(*niter));
@@ -506,3 +480,24 @@ AutomationList::set_state (const XMLNode& node, int version)
        return 0;
 }
 
+bool
+AutomationList::operator!= (AutomationList const & other) const
+{
+       return (
+               static_cast<ControlList const &> (*this) != static_cast<ControlList const &> (other) ||
+               _state != other._state ||
+               _style != other._style ||
+               _touching != other._touching
+               );
+}
+
+PBD::PropertyBase *
+AutomationListProperty::clone () const
+{
+       return new AutomationListProperty (
+               this->property_id(),
+               boost::shared_ptr<AutomationList> (new AutomationList (*this->_old.get())),
+               boost::shared_ptr<AutomationList> (new AutomationList (*this->_current.get()))
+               );
+}
+