From 7804a524dc106ec1540fa5f02e26f84c71cbef9a Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Tue, 20 Oct 2015 10:10:35 -0400 Subject: Revert "rename ParameterChanged signal in Plugin to ParameterChangedExternally to reflect its intent, and clean up the result." This reverts commit 336b2eb9a4a8634bae84a15e952d20335aa28c12. --- libs/ardour/ardour/plugin.h | 22 +++------------------- libs/ardour/ardour/plugin_insert.h | 4 ++-- 2 files changed, 5 insertions(+), 21 deletions(-) (limited to 'libs/ardour/ardour') diff --git a/libs/ardour/ardour/plugin.h b/libs/ardour/ardour/plugin.h index 7bef40ab88..2554a6816c 100644 --- a/libs/ardour/ardour/plugin.h +++ b/libs/ardour/ardour/plugin.h @@ -208,17 +208,10 @@ class LIBARDOUR_API Plugin : public PBD::StatefulDestructible, public Latent /** Emitted when a preset has been loaded */ PBD::Signal0 PresetLoaded; - /** Emitted when a parameter is altered in a way that may have - * changed the settings with respect to any loaded preset. - */ - PBD::Signal0 PresetDirty; - virtual bool has_editor () const = 0; - /** Emitted when a parameter is altered by something outside of our - * control, most typically a Plugin GUI/editor - */ - PBD::Signal2 ParameterChangedExternally; + /** Emitted when any parameter changes */ + PBD::Signal2 ParameterChanged; virtual bool configure_io (ChanCount /*in*/, ChanCount /*out*/) { return true; } @@ -279,18 +272,9 @@ class LIBARDOUR_API Plugin : public PBD::StatefulDestructible, public Latent protected: friend class PluginInsert; - friend class Session; - /* Called when a parameter of the plugin is changed outside of this - * host's control (typical via a plugin's own GUI/editor) - */ - void parameter_changed_externally (uint32_t which, float val); - - /* should be overridden by plugin API specific derived types to - * actually implement changing the parameter. The derived type should - * call this after the change is made. - */ virtual void set_parameter (uint32_t which, float val); + virtual void set_parameter_automated (uint32_t which, float val); /** Do the actual saving of the current plugin settings to a preset of the provided name. * Should return a URI on success, or an empty string on failure. diff --git a/libs/ardour/ardour/plugin_insert.h b/libs/ardour/ardour/plugin_insert.h index d4d9adb54d..8788778a3a 100644 --- a/libs/ardour/ardour/plugin_insert.h +++ b/libs/ardour/ardour/plugin_insert.h @@ -96,7 +96,6 @@ class LIBARDOUR_API PluginInsert : public Processor void set_value (double val); double get_value (void) const; - void catch_up_with_external_value (double val); XMLNode& get_state(); private: @@ -165,9 +164,10 @@ class LIBARDOUR_API PluginInsert : public Processor /* disallow copy construction */ PluginInsert (const PluginInsert&); - void parameter_changed_externally (uint32_t, float); + void parameter_changed (uint32_t, float); void set_parameter (Evoral::Parameter param, float val); + float get_parameter (Evoral::Parameter param); float default_parameter_value (const Evoral::Parameter& param); -- cgit v1.2.3