Only create a Curve for an AutomationList if we need it.

[ardour.git] / libs / evoral / src / ControlSet.cpp

diff --git a/libs/evoral/src/ControlSet.cpp b/libs/evoral/src/ControlSet.cpp
index 93a0b0ef2523db5c1fe3226b9327a73058bd1ba6..860419a187f6424fb7dee0aaf929c64b8ba8f797 100644 (file)
--- a/libs/evoral/src/ControlSet.cpp
+++ b/libs/evoral/src/ControlSet.cpp
@@ -17,15 +17,16 @@
  */
 
 #include <limits>
-#include <evoral/ControlSet.hpp>
-#include <evoral/ControlList.hpp>
-#include <evoral/Control.hpp>
-#include <evoral/Event.hpp>
+#include "evoral/ControlSet.hpp"
+#include "evoral/ControlList.hpp"
+#include "evoral/Control.hpp"
+#include "evoral/Event.hpp"
 
 using namespace std;
 
 namespace Evoral {
 
+
 ControlSet::ControlSet()
 {
 }
@@ -40,20 +41,17 @@ void
 ControlSet::what_has_data (set<Parameter>& s) const
 {
        Glib::Mutex::Lock lm (_control_lock);
-       Controls::const_iterator li;
-       
-       // FIXME: correct semantics?
-       for (li = _controls.begin(); li != _controls.end(); ++li) {
-               s.insert  ((*li).first);
+       for (Controls::const_iterator li = _controls.begin(); li != _controls.end(); ++li) {
+               s.insert(li->first);
        }
 }
 
-/** If \a create_if_missing is true, a control list will be created and returned
- * if one does not already exists.  Otherwise NULL will be returned if a control list
- * for \a parameter does not exist.
+/** If a control for the given parameter does not exist and \a create_if_missing is true,
+ * a control will be created, added to this set, and returned.
+ * If \a create_if_missing is false this function may return null.
  */
 boost::shared_ptr<Control>
-ControlSet::control (Parameter parameter, bool create_if_missing)
+ControlSet::control (const Parameter& parameter, bool create_if_missing)
 {
        Controls::iterator i = _controls.find(parameter);
 
@@ -61,8 +59,7 @@ ControlSet::control (Parameter parameter, bool create_if_missing)
                return i->second;
 
        } else if (create_if_missing) {
-               boost::shared_ptr<ControlList> al (control_list_factory(parameter));
-               boost::shared_ptr<Control> ac(control_factory(al));
+               boost::shared_ptr<Control> ac(control_factory(parameter));
                add_control(ac);
                return ac;
 
@@ -72,25 +69,12 @@ ControlSet::control (Parameter parameter, bool create_if_missing)
        }
 }
 
-boost::shared_ptr<const Control>
-ControlSet::control (Parameter parameter) const
-{
-       Controls::const_iterator i = _controls.find(parameter);
-
-       if (i != _controls.end()) {
-               return i->second;
-       } else {
-               //warning << "ControlList " << parameter.to_string() << " not found for " << _name << endmsg;
-               return boost::shared_ptr<Control>();
-       }
-}
-
 bool
-ControlSet::find_next_event (nframes_t now, nframes_t end, ControlEvent& next_event) const
+ControlSet::find_next_event (FrameTime now, FrameTime end, ControlEvent& next_event) const
 {
        Controls::const_iterator li;    
 
-       next_event.when = std::numeric_limits<nframes_t>::max();
+       next_event.when = std::numeric_limits<FrameTime>::max();
        
        for (li = _controls.begin(); li != _controls.end(); ++li) {
                ControlList::const_iterator i;
@@ -111,7 +95,7 @@ ControlSet::find_next_event (nframes_t now, nframes_t end, ControlEvent& next_ev
                }
        }
 
-       return next_event.when != std::numeric_limits<nframes_t>::max();
+       return next_event.when != std::numeric_limits<FrameTime>::max();
 }
 
 void
@@ -122,18 +106,6 @@ ControlSet::clear ()
        for (Controls::iterator li = _controls.begin(); li != _controls.end(); ++li)
                li->second->list()->clear();
 }
-       
-boost::shared_ptr<Control>
-ControlSet::control_factory(boost::shared_ptr<ControlList> list) const
-{
-       return boost::shared_ptr<Control>(new Control(list));
-}
-
-boost::shared_ptr<ControlList>
-ControlSet::control_list_factory(const Parameter& param) const
-{
-       return boost::shared_ptr<ControlList>(new ControlList(param));
-}
 
 
 } // namespace Evoral