13
0

Fix websocket C++11ism

This commit is contained in:
Robin Gareus 2020-08-30 21:15:33 +02:00
parent af79240c81
commit 8eb4dcb675
Signed by: rgareus
GPG Key ID: A090BCE02CF57F04
4 changed files with 11 additions and 4 deletions

View File

@ -95,7 +95,7 @@ WebsocketsDispatcher::update_all_nodes (Client client)
try {
a_ctrl = strip.plugin (plugin_id).param_control (param_id);
} catch (ArdourMixerNotFoundException) {
} catch (ArdourMixerNotFoundException& err) {
continue;
}

View File

@ -241,7 +241,7 @@ ArdourFeedback::observe_strip_plugins (uint32_t strip_id, ArdourMixerStrip::Plug
boost::bind<void> (PluginParamValueObserver (), this, strip_id, plugin_id, param_id,
boost::weak_ptr<AutomationControl>(control)),
event_loop ());
} catch (ArdourMixerNotFoundException) {
} catch (ArdourMixerNotFoundException& e) {
/* ignore */
}
}

View File

@ -101,7 +101,7 @@ ArdourMixerPlugin::param_control (uint32_t param_id) const
uint32_t control_id = plugin->nth_parameter (param_id, ok);
if (!ok || !plugin->parameter_is_input (control_id)) {
throw ArdourMixerNotFoundException("invalid automation control for param id = "
throw ArdourMixerNotFoundException ("invalid automation control for param id = "
+ boost::lexical_cast<std::string>(param_id));
}

View File

@ -28,7 +28,14 @@ namespace ArdourSurface {
struct ArdourMixerNotFoundException : public virtual std::runtime_error
{
using std::runtime_error::runtime_error; // XXX!
public:
ArdourMixerNotFoundException (std::string const & what)
: runtime_error (what)
, _what (what)
{}
virtual const char* what() const throw() { return _what.c_str(); }
private:
std::string _what;
};
class ArdourMixerPlugin