major, substantive reworking of how we store GUI information (visibility, height...

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

diff --git a/libs/evoral/evoral/Control.hpp b/libs/evoral/evoral/Control.hpp
index ed957522a14f4e3037b95cb5d3bf8e7775be62b7..5c45823184a24d2a51cf6de932a325cd1a98d524 100644 (file)
--- a/libs/evoral/evoral/Control.hpp
+++ b/libs/evoral/evoral/Control.hpp
@@ -1,16 +1,16 @@
 /* This file is part of Evoral.
- * Copyright (C) 2008 Dave Robillard <http://drobilla.net>
+ * Copyright (C) 2008 David 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,9 +22,9 @@
 #include <set>
 #include <map>
 #include <boost/shared_ptr.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"
 
 namespace Evoral {
 
@@ -34,23 +34,38 @@ class Transport;
 class Control
 {
 public:
-       Control(boost::shared_ptr<ControlList>);
+       Control(const Parameter& parameter, boost::shared_ptr<ControlList>);
        virtual ~Control() {}
 
-       void  set_value(float val, bool to_list=false, nframes_t frame=0);
-       float get_value(bool from_list=false, nframes_t frame=0) const;
-       float user_value() const;
+       virtual void   set_double(double val, bool to_list=false, double frame=0);
+       virtual double get_double(bool from_list=false, double frame=0) const;
+
+       /** Get the latest user-set value
+        * (which may not equal get_value() when automation is playing back).
+        *
+        * Automation write/touch works by periodically sampling this value
+        * and adding it to the ControlList.
+        */
+       double user_double() const { return _user_value; }
 
        void set_list(boost::shared_ptr<ControlList>);
 
        boost::shared_ptr<ControlList>       list()       { return _list; }
        boost::shared_ptr<const ControlList> list() const { return _list; }
 
-       Parameter parameter() const;
+       inline const Parameter& parameter() const { return _parameter; }
+
+       /** Emitted when the our ControlList is marked dirty */
+       PBD::Signal0<void> ListMarkedDirty;
 
 protected:
+       Parameter                      _parameter;
        boost::shared_ptr<ControlList> _list;
-       float                          _user_value;
+       double                         _user_value;
+       PBD::ScopedConnection          _list_marked_dirty_connection;
+
+private:
+       void list_marked_dirty ();
 };
 
 } // namespace Evoral