diff options
| author | Carl Hetherington <carl@carlh.net> | 2010-08-09 22:23:23 +0000 |
|---|---|---|
| committer | Carl Hetherington <carl@carlh.net> | 2010-08-09 22:23:23 +0000 |
| commit | 78986385e17b82a6704c8792fb21a42cd86add9a (patch) | |
| tree | 54bdca03098ff7e26b536b0640e3321b4b0a042e /libs/ardour/ardour/automatable.h | |
| parent | 7c5f1b7a26df60417590340d4cfe367ed00e180a (diff) | |
Fix save/load of MIDI automation state. Fixes #3354.
git-svn-id: svn://localhost/ardour2/branches/3.0@7578 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/ardour/automatable.h')
| -rw-r--r-- | libs/ardour/ardour/automatable.h | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/libs/ardour/ardour/automatable.h b/libs/ardour/ardour/automatable.h index 2f35fc6b42..e0fe38e67e 100644 --- a/libs/ardour/ardour/automatable.h +++ b/libs/ardour/ardour/automatable.h @@ -65,7 +65,7 @@ public: virtual std::string describe_parameter(Evoral::Parameter param); - AutoState get_parameter_automation_state (Evoral::Parameter param, bool lock = true); + AutoState get_parameter_automation_state (Evoral::Parameter param); virtual void set_parameter_automation_state (Evoral::Parameter param, AutoState); AutoStyle get_parameter_automation_style (Evoral::Parameter param); @@ -95,16 +95,13 @@ public: int set_automation_state (const XMLNode&, Evoral::Parameter default_param); XMLNode& get_automation_state(); - - /** Emitted when the automation state of one of our controls changes */ - PBD::Signal1<void, Evoral::Parameter> AutomationStateChanged; protected: Session& _a_session; void can_automate(Evoral::Parameter); - virtual void auto_state_changed (Evoral::Parameter /*which*/) {} + virtual void automation_list_automation_state_changed (Evoral::Parameter, AutoState) {} int load_automation (const std::string& path); int old_set_automation_state(const XMLNode&); @@ -116,7 +113,6 @@ public: static nframes_t _automation_interval; private: - void automation_state_changed (Evoral::Parameter const &); PBD::ScopedConnectionList _control_connections; ///< connections to our controls' signals }; |