initial pass at session-renaming functionality

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

diff --git a/libs/ardour/automatable.cc b/libs/ardour/automatable.cc
index 20dc910f61d2af439e6bc8c2e693e8b6117d4dae..6d8114939de2c3d8130aa5ae112575cdf4b9bd8c 100644 (file)
--- a/libs/ardour/automatable.cc
+++ b/libs/ardour/automatable.cc
@@ -79,22 +79,6 @@ Automatable::old_set_automation_state (const XMLNode& node)
                warning << _("Automation node has no path property") << endmsg;
        }
 
-       if ((prop = node.property ("visible")) != 0) {
-               uint32_t what;
-               stringstream sstr;
-
-               _visible_controls.clear ();
-
-               sstr << prop->value();
-               while (1) {
-                       sstr >> what;
-                       if (sstr.fail()) {
-                               break;
-                       }
-                       mark_automation_visible (Evoral::Parameter(PluginAutomation, 0, what), true);
-               }
-       }
-
        _last_automation_snapshot = 0;
 
        return 0;
@@ -156,7 +140,7 @@ Automatable::add_control(boost::shared_ptr<Evoral::Control> ac)
 
        boost::shared_ptr<AutomationList> al = boost::dynamic_pointer_cast<AutomationList> (ac->list ());
        assert (al);
-       
+
        al->automation_state_changed.connect_same_thread (
                _list_connections, boost::bind (&Automatable::automation_list_automation_state_changed, this, ac->parameter(), _1)
                );
@@ -167,17 +151,6 @@ Automatable::add_control(boost::shared_ptr<Evoral::Control> ac)
        automation_list_automation_state_changed (param, al->automation_state ()); // sync everything up
 }
 
-void
-Automatable::what_has_visible_data(set<Evoral::Parameter>& s) const
-{
-       Glib::Mutex::Lock lm (control_lock());
-       set<Evoral::Parameter>::const_iterator li;
-
-       for (li = _visible_controls.begin(); li != _visible_controls.end(); ++li) {
-               s.insert  (*li);
-       }
-}
-
 string
 Automatable::describe_parameter (Evoral::Parameter param)
 {
@@ -187,7 +160,7 @@ Automatable::describe_parameter (Evoral::Parameter param)
                return _("Fader");
        } else if (param.type() == MidiCCAutomation) {
                return string_compose("%1: %2 [%3]",
-                               param.id() + 1, midi_name(param.id()), int(param.channel()) + 1);
+                               param.id(), midi_name(param.id()), int(param.channel()) + 1);
        } else if (param.type() == MidiPgmChangeAutomation) {
                return string_compose("Program [%1]", int(param.channel()) + 1);
        } else if (param.type() == MidiPitchBenderAutomation) {
@@ -205,20 +178,6 @@ Automatable::can_automate (Evoral::Parameter what)
        _can_automate_list.insert (what);
 }
 
-void
-Automatable::mark_automation_visible (Evoral::Parameter what, bool yn)
-{
-       if (yn) {
-               _visible_controls.insert (what);
-       } else {
-               set<Evoral::Parameter>::iterator i;
-
-               if ((i = _visible_controls.find (what)) != _visible_controls.end()) {
-                       _visible_controls.erase (i);
-               }
-       }
-}
-
 /** \a legacy_param is used for loading legacy sessions where an object (IO, Panner)
  * had a single automation parameter, with it's type implicit.  Derived objects should
  * pass that type and it will be used for the untyped AutomationList found.
@@ -230,8 +189,6 @@ Automatable::set_automation_xml_state (const XMLNode& node, Evoral::Parameter le
 
        /* Don't clear controls, since some may be special derived Controllable classes */
 
-       _visible_controls.clear ();
-
        XMLNodeList nlist = node.children();
        XMLNodeIterator niter;
 
@@ -255,8 +212,6 @@ Automatable::set_automation_xml_state (const XMLNode& node, Evoral::Parameter le
                                continue;
                         }
 
-
-                       
                        if (!id_prop) {
                                warning << "AutomationList node without automation-id property, "
                                        << "using default: " << EventTypeMap::instance().to_symbol(legacy_param) << endmsg;
@@ -294,8 +249,7 @@ Automatable::get_automation_xml_state ()
        }
 
        for (Controls::iterator li = controls().begin(); li != controls().end(); ++li) {
-               boost::shared_ptr<AutomationList> l
-                               = boost::dynamic_pointer_cast<AutomationList>(li->second->list());
+               boost::shared_ptr<AutomationList> l = boost::dynamic_pointer_cast<AutomationList>(li->second->list());
                if (!l->empty()) {
                        node->add_child_nocopy (l->get_state ());
                }
@@ -366,11 +320,9 @@ void
 Automatable::protect_automation ()
 {
        typedef set<Evoral::Parameter> ParameterSet;
-       ParameterSet automated_params;
-
-       what_has_data(automated_params);
+       const ParameterSet& automated_params = what_can_be_automated ();
 
-       for (ParameterSet::iterator i = automated_params.begin(); i != automated_params.end(); ++i) {
+       for (ParameterSet::const_iterator i = automated_params.begin(); i != automated_params.end(); ++i) {
 
                boost::shared_ptr<Evoral::Control> c = control(*i);
                boost::shared_ptr<AutomationList> l = boost::dynamic_pointer_cast<AutomationList>(c->list());
@@ -415,14 +367,21 @@ Automatable::transport_stopped (framepos_t now)
                 if (c) {
                         boost::shared_ptr<AutomationList> l
                                = boost::dynamic_pointer_cast<AutomationList>(c->list());
-                        
+
                         if (l) {
+                               /* Stop any active touch gesture just before we mark the write pass
+                                  as finished.  If we don't do this, the transport can end up stopped with
+                                  an AutomationList thinking that a touch is still in progress and,
+                                  when the transport is re-started, a touch will magically
+                                  be happening without it ever have being started in the usual way.
+                               */
+                               l->stop_touch (true, now);
                                 l->write_pass_finished (now);
-                                
+
                                 if (l->automation_playback()) {
                                         c->set_value(c->list()->eval(now));
                                 }
-                                
+
                                 if (l->automation_state() == Write) {
                                         l->set_automation_state (Touch);
                                 }