ardour/livetrax
13
0
Fork 0
Code

Fix deadlock, shared_ptr d'tor called from ScopedConnectionList d'tor

Browse Source 
See https://ardour.org/styleguide.html #10
https://pastebin.com/gJfrNhL2
This commit is contained in:
Robin Gareus 2020-02-25 22:55:59 +01:00
parent bcfe16610a
commit 61b6b740bc
Signed by: rgareus
GPG Key ID: A090BCE02CF57F04
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libs/surfaces/websockets/feedback.cc
View File

@ -68,8 +68,12 @@ struct PluginBypassObserver {
struct PluginParamValueObserver { struct PluginParamValueObserver {
void operator() (ArdourFeedback* p, uint32_t strip_n, uint32_t plugin_n, void operator() (ArdourFeedback* p, uint32_t strip_n, uint32_t plugin_n,
uint32_t param_n, boost::shared_ptr<AutomationControl> control) uint32_t param_n, boost::weak_ptr<AutomationControl> ctrl)
{ {
boost::shared_ptr<AutomationControl> control = ctrl.lock ();
if (!control) {
return;
}
p->update_all (Node::strip_plugin_param_value, strip_n, plugin_n, param_n, p->update_all (Node::strip_plugin_param_value, strip_n, plugin_n, param_n,
ArdourStrips::plugin_param_value (control)); ArdourStrips::plugin_param_value (control));
} }
@ -221,7 +225,7 @@ ArdourFeedback::observe_strip_plugin_param_values (uint32_t strip_n,
control->Changed.connect (_signal_connections, MISSING_INVALIDATOR, control->Changed.connect (_signal_connections, MISSING_INVALIDATOR,
boost::bind<void> (PluginParamValueObserver (), this, strip_n, plugin_n, param_n, boost::bind<void> (PluginParamValueObserver (), this, strip_n, plugin_n, param_n,
control), boost::weak_ptr<AutomationControl>(control)),
event_loop ()); event_loop ());
} }
} }