forward port ConfigVariable<bool> fix from 2.X

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

diff --git a/libs/ardour/ardour/automatable.h b/libs/ardour/ardour/automatable.h
index ca4624f281ade92222434dd06f726415a958935d..9b83705b0a02e28a124a80b28c44c3f79aab2e05 100644 (file)
--- a/libs/ardour/ardour/automatable.h
+++ b/libs/ardour/ardour/automatable.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2000-2007 Paul Davis 
+    Copyright (C) 2000-2007 Paul Davis
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -20,12 +20,14 @@
 #ifndef __ardour_automatable_h__
 #define __ardour_automatable_h__
 
-#include <set>
 #include <map>
+#include <set>
+#include <string>
 #include <boost/shared_ptr.hpp>
-#include <ardour/event_type_map.h>
-#include <evoral/ControlSet.hpp>
-#include <evoral/Sequence.hpp>
+#include "evoral/ControlSet.hpp"
+#include "ardour/types.h"
+
+class XMLNode;
 
 namespace ARDOUR {
 
@@ -40,6 +42,7 @@ class Automatable : virtual public Evoral::ControlSet
 {
 public:
        Automatable(Session&);
+        Automatable (const Automatable& other);
        Automatable();
 
        virtual ~Automatable() {}
@@ -49,20 +52,20 @@ public:
 
        boost::shared_ptr<AutomationControl>
        automation_control (const Evoral::Parameter& id, bool create_if_missing=false);
-       
+
        boost::shared_ptr<const AutomationControl>
        automation_control (const Evoral::Parameter& id) const;
 
        virtual void add_control(boost::shared_ptr<Evoral::Control>);
-       
+
        virtual void automation_snapshot(nframes_t now, bool force);
-       virtual void transport_stopped(nframes_t now);
+       virtual void transport_stopped (sframes_t now);
+
+       virtual std::string describe_parameter(Evoral::Parameter param);
 
-       virtual string describe_parameter(Evoral::Parameter param);
-       
        AutoState get_parameter_automation_state (Evoral::Parameter param, bool lock = true);
        virtual void set_parameter_automation_state (Evoral::Parameter param, AutoState);
-       
+
        AutoStyle get_parameter_automation_style (Evoral::Parameter param);
        void set_parameter_automation_style (Evoral::Parameter param, AutoStyle);
 
@@ -72,24 +75,21 @@ public:
        const std::set<Evoral::Parameter>& what_can_be_automated() const { return _can_automate_list; }
 
        void mark_automation_visible(Evoral::Parameter, bool);
-       
+
        inline bool should_snapshot (nframes_t now) {
                return (_last_automation_snapshot > now
                                || (now - _last_automation_snapshot) > _automation_interval);
        }
-       
+
        static void set_automation_interval (jack_nframes_t frames) {
                _automation_interval = frames;
        }
 
-       static jack_nframes_t automation_interval() { 
+       static jack_nframes_t automation_interval() {
                return _automation_interval;
        }
-       
+
        typedef Evoral::ControlSet::Controls Controls;
-       
-       Evoral::ControlSet&       data()       { return *this; }
-       const Evoral::ControlSet& data() const { return *this; }
 
        int set_automation_state (const XMLNode&, Evoral::Parameter default_param);
        XMLNode& get_automation_state();
@@ -99,38 +99,19 @@ public:
 
        void can_automate(Evoral::Parameter);
 
-       virtual void auto_state_changed (Evoral::Parameter which) {}
+       virtual void auto_state_changed (Evoral::Parameter /*which*/) {}
 
-       
        int load_automation (const std::string& path);
        int old_set_automation_state(const XMLNode&);
 
        std::set<Evoral::Parameter> _visible_controls;
        std::set<Evoral::Parameter> _can_automate_list;
-       
+
        nframes_t        _last_automation_snapshot;
        static nframes_t _automation_interval;
 };
 
 
-/** Contains notes and controllers */
-class AutomatableSequence : public Automatable, public Evoral::Sequence {
-public:
-       AutomatableSequence(Session& s, size_t size)
-               : Evoral::ControlSet()
-               , Automatable(s)
-               , Evoral::Sequence(EventTypeMap::instance())
-       {}
-};
-
-
-/** Contains only controllers */
-class AutomatableControls : public Automatable {
-public:
-       AutomatableControls(Session& s) : Evoral::ControlSet(), Automatable(s) {}
-};
-
-
 } // namespace ARDOUR
 
 #endif /* __ardour_automatable_h__ */