A few fixes to interpolation of MIDI controller data. Don't interpolate

[ardour.git] / libs / evoral / evoral / ControlSet.hpp

diff --git a/libs/evoral/evoral/ControlSet.hpp b/libs/evoral/evoral/ControlSet.hpp
index ba6e5e5623416e57f3fd232cbdbef2254b6d6e71..95de58dead03f14a231001fa9af3052a4b85cef1 100644 (file)
--- a/libs/evoral/evoral/ControlSet.hpp
+++ b/libs/evoral/evoral/ControlSet.hpp
@@ -1,16 +1,16 @@
 /* This file is part of Evoral.
  * Copyright (C) 2008 Dave Robillard <http://drobilla.net>
  * Copyright (C) 2000-2008 Paul Davis
- * 
+ *
  * Evoral is free software; you can redistribute it and/or modify it under the
  * terms of the GNU General Public License as published by the Free Software
  * Foundation; either version 2 of the License, or (at your option) any later
  * version.
- * 
+ *
  * Evoral is distributed in the hope that it will be useful, but WITHOUT ANY
  * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
  * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for details.
- * 
+ *
  * You should have received a copy of the GNU General Public License along
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
@@ -22,48 +22,65 @@
 #include <set>
 #include <map>
 #include <boost/shared_ptr.hpp>
+#include <boost/utility.hpp>
 #include <glibmm/thread.h>
-#include <evoral/types.hpp>
-#include <evoral/Parameter.hpp>
+#include "pbd/signals.h"
+#include "evoral/types.hpp"
+#include "evoral/Parameter.hpp"
+#include "evoral/ControlList.hpp"
 
 namespace Evoral {
 
 class Control;
-class ControlList;
 class ControlEvent;
 
-class ControlSet {
+class ControlSet : public boost::noncopyable {
 public:
        ControlSet();
+        ControlSet (const ControlSet&);
        virtual ~ControlSet() {}
 
-       virtual boost::shared_ptr<Control> control(Evoral::Parameter id, bool create_if_missing=false);
-       virtual boost::shared_ptr<const Control> control(Evoral::Parameter id) const;
-       
-       virtual boost::shared_ptr<Control> control_factory(boost::shared_ptr<ControlList> list) const;
-       virtual boost::shared_ptr<ControlList> control_list_factory(const Parameter& param) const;
-       
+       virtual boost::shared_ptr<Evoral::Control>
+       control_factory(const Evoral::Parameter& id) = 0;
+
+       boost::shared_ptr<Control>
+       control (const Parameter& id, bool create_if_missing=false);
+
+       inline boost::shared_ptr<const Control>
+       control (const Parameter& id) const {
+               const Controls::const_iterator i = _controls.find(id);
+               return (i != _controls.end() ? i->second : boost::shared_ptr<Control>());
+       }
+
        typedef std::map< Parameter, boost::shared_ptr<Control> > Controls;
-       Controls&       controls()       { return _controls; }
-       const Controls& controls() const { return _controls; }
+       inline Controls&       controls()       { return _controls; }
+       inline const Controls& controls() const { return _controls; }
 
        virtual void add_control(boost::shared_ptr<Control>);
 
-       virtual bool find_next_event(nframes_t start, nframes_t end, ControlEvent& ev) const;
-       
-       virtual float default_parameter_value(Parameter param) { return 1.0f; }
+       bool find_next_event(FrameTime start, FrameTime end, ControlEvent& ev) const;
 
-       virtual void clear();
+       virtual bool controls_empty() const { return _controls.size() == 0; }
+       virtual void clear_controls();
 
        void what_has_data(std::set<Parameter>&) const;
-       
+
        Glib::Mutex& control_lock() const { return _control_lock; }
 
 protected:
+       virtual void control_list_marked_dirty () {}
+       virtual void control_list_interpolation_changed (Parameter, ControlList::InterpolationStyle) {}
+
        mutable Glib::Mutex _control_lock;
        Controls            _controls;
+
+private:
+
+       PBD::ScopedConnectionList _control_connections;
+       PBD::ScopedConnectionList _list_connections;
 };
 
+
 } // namespace Evoral
 
 #endif // EVORAL_CONTROLLABLE_HPP