make 3.0 catch up with transport and other changes in 2.X (hand applied, not merged)

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

diff --git a/libs/ardour/ardour/automation_control.h b/libs/ardour/ardour/automation_control.h
index 74b8a54aada8147bd84f4c6d82696936957c10c6..15bac5fef863c2d40f182389241af4b95c30674f 100644 (file)
--- a/libs/ardour/ardour/automation_control.h
+++ b/libs/ardour/ardour/automation_control.h
@@ -40,8 +40,8 @@ public:
        AutomationControl(ARDOUR::Session&,
                        const Evoral::Parameter& parameter,
                        boost::shared_ptr<ARDOUR::AutomationList> l=boost::shared_ptr<ARDOUR::AutomationList>(),
-                       const string& name="");
-       
+                       const std::string& name="");
+
        boost::shared_ptr<AutomationList> alist() const {
                return boost::dynamic_pointer_cast<AutomationList>(_list);
        }
@@ -51,24 +51,24 @@ public:
        inline bool automation_playback() const {
                return ((ARDOUR::AutomationList*)_list.get())->automation_playback();
        }
-       
+
        inline bool automation_write() const {
                return ((ARDOUR::AutomationList*)_list.get())->automation_write();
        }
-       
+
        inline AutoState automation_state() const {
                return ((ARDOUR::AutomationList*)_list.get())->automation_state();
        }
-       
+
        inline void set_automation_state(AutoState as) {
                return ((ARDOUR::AutomationList*)_list.get())->set_automation_state(as);
        }
-       
+
        inline void start_touch() {
                set_touching (true);
                return ((ARDOUR::AutomationList*)_list.get())->start_touch();
        }
-       
+
        inline void stop_touch() {
                set_touching (false);
                return ((ARDOUR::AutomationList*)_list.get())->stop_touch();