add explict destructor for Pannable

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

diff --git a/libs/ardour/automation_list.cc b/libs/ardour/automation_list.cc
index e785104367a1e7cd7939cd1837505aecb315d997..5f18bbcebba1fc242866209fbe8bf50854459700 100644 (file)
--- a/libs/ardour/automation_list.cc
+++ b/libs/ardour/automation_list.cc
@@ -41,19 +41,18 @@ PBD::Signal1<void,AutomationList *> AutomationList::AutomationListCreated;
 static void dumpit (const AutomationList& al, string prefix = "")
 {
        cerr << prefix << &al << endl;
-       for (AutomationList::const_iterator i = al.const_begin(); i != al.const_end(); ++i) {
+       for (AutomationList::const_iterator i = al.begin(); i != al.end(); ++i) {
                cerr << prefix << '\t' << (*i)->when << ',' << (*i)->value << endl;
        }
        cerr << "\n";
 }
 #endif
-
 AutomationList::AutomationList (Evoral::Parameter id)
        : ControlList(id)
 {
        _state = Off;
        _style = Absolute;
-       _touching = false;
+       g_atomic_int_set (&_touching, 0);
 
        create_curve_if_necessary();
 
@@ -67,7 +66,7 @@ AutomationList::AutomationList (const AutomationList& other)
 {
        _style = other._style;
        _state = other._state;
-       _touching = other._touching;
+       g_atomic_int_set (&_touching, other.touching());
 
        create_curve_if_necessary();
 
@@ -80,7 +79,7 @@ AutomationList::AutomationList (const AutomationList& other, double start, doubl
 {
        _style = other._style;
        _state = other._state;
-       _touching = other._touching;
+       g_atomic_int_set (&_touching, other.touching());
 
        create_curve_if_necessary();
 
@@ -94,7 +93,7 @@ AutomationList::AutomationList (const AutomationList& other, double start, doubl
 AutomationList::AutomationList (const XMLNode& node, Evoral::Parameter id)
        : ControlList(id)
 {
-       _touching = false;
+       g_atomic_int_set (&_touching, 0);
        _state = Off;
        _style = Absolute;
 
@@ -125,7 +124,9 @@ AutomationList::create_curve_if_necessary()
 {
        switch (_parameter.type()) {
        case GainAutomation:
-       case PanAutomation:
+       case PanAzimuthAutomation:
+       case PanElevationAutomation:
+       case PanWidthAutomation:
        case FadeInAutomation:
        case FadeOutAutomation:
        case EnvelopeAutomation:
@@ -180,7 +181,12 @@ AutomationList::set_automation_state (AutoState s)
 {
        if (s != _state) {
                _state = s;
-               automation_state_changed (); /* EMIT SIGNAL */
+
+                if (_state == Write) {
+                        Glib::Mutex::Lock lm (ControlList::_lock);
+                        nascent.push_back (new NascentInfo (false));
+                }
+               automation_state_changed (s); /* EMIT SIGNAL */
        }
 }
 
@@ -194,17 +200,37 @@ AutomationList::set_automation_style (AutoStyle s)
 }
 
 void
-AutomationList::start_touch ()
+AutomationList::start_touch (double when)
 {
-       _touching = true;
-       _new_value = true;
+        if (_state == Touch) {
+                Glib::Mutex::Lock lm (ControlList::_lock);
+                nascent.push_back (new NascentInfo (true, when));
+        }
+
+       g_atomic_int_set (&_touching, 1);
 }
 
 void
-AutomationList::stop_touch ()
+AutomationList::stop_touch (bool mark, double when)
 {
-       _touching = false;
-       _new_value = false;
+       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.
+                         */
+                        
+                        NascentInfo* ninfo = nascent.back ();
+                        nascent.erase (nascent.begin());
+                        delete ninfo;
+                }
+        }
 }
 
 void
@@ -247,7 +273,14 @@ AutomationList::state (bool full)
        root->add_property ("interpolation-style", enum_2_string (_interpolation));
 
        if (full) {
-               root->add_property ("state", auto_state_to_string (_state));
+                /* never serialize state with Write enabled - too dangerous
+                   for the user's data
+                */
+                if (_state != Write) {
+                        root->add_property ("state", auto_state_to_string (_state));
+                } else {
+                        root->add_property ("state", auto_state_to_string (Off));
+                }
        } else {
                /* never save anything but Off for automation state to a template */
                root->add_property ("state", auto_state_to_string (Off));
@@ -327,12 +360,11 @@ AutomationList::deserialize_events (const XMLNode& node)
                error << _("automation list: cannot load coordinates from XML, all points ignored") << endmsg;
        } else {
                mark_dirty ();
-               reposition_for_rt_add (0);
                maybe_signal_changed ();
        }
 
         thaw ();
-        
+
        return 0;
 }
 
@@ -361,7 +393,7 @@ AutomationList::set_state (const XMLNode& node, int version)
                const XMLNodeList& elist = node.children();
                XMLNodeConstIterator i;
                XMLProperty* prop;
-               nframes_t x;
+               pframes_t x;
                double y;
 
                 ControlList::freeze ();
@@ -426,34 +458,49 @@ AutomationList::set_state (const XMLNode& node, int version)
 
        if ((prop = node.property (X_("state"))) != 0) {
                _state = string_to_auto_state (prop->value());
+                if (_state == Write) {
+                        _state = Off;
+                }
        } else {
                _state = Off;
        }
 
-       if ((prop = node.property (X_("min_yval"))) != 0) {
+       if ((prop = node.property (X_("min-yval"))) != 0) {
                _min_yval = atof (prop->value ().c_str());
        } else {
                _min_yval = FLT_MIN;
        }
 
-       if ((prop = node.property (X_("max_yval"))) != 0) {
+       if ((prop = node.property (X_("max-yval"))) != 0) {
                _max_yval = atof (prop->value ().c_str());
        } else {
                _max_yval = FLT_MAX;
        }
 
-       if ((prop = node.property (X_("max_xval"))) != 0) {
+       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));
+                       have_events = true;
                }
        }
 
+       if (!have_events) {
+               /* there was no Events child node; clear any current events */
+               freeze ();
+               clear ();
+               mark_dirty ();
+               maybe_signal_changed ();
+               thaw ();
+       }
+
        return 0;
 }