# HG changeset patch # User Chris Cannam # Date 1463564113 -3600 # Node ID fbdb06ce1e9a8273807fa2defe3929580c186d3d # Parent 9c25e2289faabdffd9c1608260ae46c8f47e7958 Move ConfigurationRequest/Response into RequestResponse.h diff -r 9c25e2289faa -r fbdb06ce1e9a vamp-hostsdk/PluginConfiguration.h --- a/vamp-hostsdk/PluginConfiguration.h Wed May 18 10:33:08 2016 +0100 +++ b/vamp-hostsdk/PluginConfiguration.h Wed May 18 10:35:13 2016 +0100 @@ -104,44 +104,6 @@ } }; -/** - * \class ConfigurationRequest PluginConfiguration.h - * - * A wrapper for a plugin pointer and PluginConfiguration, bundling up - * the data needed to configure a plugin after it has been loaded. - * - * \see PluginConfiguration, ConfigurationResponse, LoadRequest, LoadResponse - */ -struct ConfigurationRequest -{ -public: - ConfigurationRequest() : // invalid request by default - plugin(0) { } - - Plugin *plugin; - PluginConfiguration configuration; -}; - -/** - * \class ConfigurationResponse PluginConfiguration.h - * - * The return value from a configuration request (i.e. setting the - * parameters and initialising the plugin). If the configuration was - * successful, the output list will contain the final - * post-initialisation output descriptors. If configuration failed, - * the output list will be empty. - * - * \see PluginConfiguration, ConfigurationRequest, LoadRequest, LoadResponse - */ -struct ConfigurationResponse -{ -public: - ConfigurationResponse() // failed by default - { } - - Plugin::OutputList outputs; -}; - } } diff -r 9c25e2289faa -r fbdb06ce1e9a vamp-hostsdk/RequestResponse.h --- a/vamp-hostsdk/RequestResponse.h Wed May 18 10:33:08 2016 +0100 +++ b/vamp-hostsdk/RequestResponse.h Wed May 18 10:35:13 2016 +0100 @@ -34,8 +34,8 @@ authorization. */ -#ifndef VAMP_LOAD_REQUEST_H -#define VAMP_LOAD_REQUEST_H +#ifndef VAMP_REQUEST_RESPONSE_H +#define VAMP_REQUEST_RESPONSE_H #include "PluginStaticData.h" #include "PluginConfiguration.h" @@ -148,6 +148,44 @@ PluginConfiguration defaultConfiguration; }; +/** + * \class ConfigurationRequest RequestResponse.h + * + * A wrapper for a plugin pointer and PluginConfiguration, bundling up + * the data needed to configure a plugin after it has been loaded. + * + * \see PluginConfiguration, ConfigurationResponse, LoadRequest, LoadResponse + */ +struct ConfigurationRequest +{ +public: + ConfigurationRequest() : // invalid request by default + plugin(0) { } + + Plugin *plugin; + PluginConfiguration configuration; +}; + +/** + * \class ConfigurationResponse RequestResponse.h + * + * The return value from a configuration request (i.e. setting the + * parameters and initialising the plugin). If the configuration was + * successful, the output list will contain the final + * post-initialisation output descriptors. If configuration failed, + * the output list will be empty. + * + * \see PluginConfiguration, ConfigurationRequest, LoadRequest, LoadResponse + */ +struct ConfigurationResponse +{ +public: + ConfigurationResponse() // failed by default + { } + + Plugin::OutputList outputs; +}; + } }