ardour/livetrax
13
0
Fork 0
Code

gracefully handle LV2 GUI instantiation failure.

Browse Source
This commit is contained in:
Robin Gareus 2015-09-06 19:32:13 +02:00
parent 53cdc8046f
commit ebe15849d4
1 changed files with 22 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
gtk2_ardour/lv2_plugin_ui.cc
View File

@ -316,6 +316,11 @@ LV2PluginUI::lv2ui_instantiate(const std::string& title)
free(ui_binary_path); free(ui_binary_path);
free(features); free(features);
if (!_inst) {
error << _("failed to instantiate LV2 GUI") << endmsg;
return;
}
#define GET_WIDGET(inst) suil_instance_get_widget((SuilInstance*)inst); #define GET_WIDGET(inst) suil_instance_get_widget((SuilInstance*)inst);
const uint32_t num_ports = _lv2->num_ports(); const uint32_t num_ports = _lv2->num_ports();
@ -328,25 +333,23 @@ LV2PluginUI::lv2ui_instantiate(const std::string& title)
} }
_external_ui_ptr = NULL; _external_ui_ptr = NULL;
if (_inst) { if (!is_external_ui) {
if (!is_external_ui) { GtkWidget* c_widget = (GtkWidget*)GET_WIDGET(_inst);
GtkWidget* c_widget = (GtkWidget*)GET_WIDGET(_inst); if (!c_widget) {
if (!c_widget) { error << _("failed to get LV2 UI widget") << endmsg;
error << _("failed to get LV2 UI widget") << endmsg; suil_instance_free((SuilInstance*)_inst);
suil_instance_free((SuilInstance*)_inst); _inst = NULL;
_inst = NULL; return;
return;
}
if (!container->get_child()) {
// Suil didn't add the UI to the container for us, so do it now
container->add(*Gtk::manage(Glib::wrap(c_widget)));
}
container->show_all();
gtk_widget_set_can_focus(c_widget, true);
gtk_widget_grab_focus(c_widget);
} else {
_external_ui_ptr = (struct lv2_external_ui*)GET_WIDGET(_inst);
} }
if (!container->get_child()) {
// Suil didn't add the UI to the container for us, so do it now
container->add(*Gtk::manage(Glib::wrap(c_widget)));
}
container->show_all();
gtk_widget_set_can_focus(c_widget, true);
gtk_widget_grab_focus(c_widget);
} else {
_external_ui_ptr = (struct lv2_external_ui*)GET_WIDGET(_inst);
} }
_values = new float[num_ports]; _values = new float[num_ports];
@ -502,7 +505,7 @@ LV2PluginUI::on_window_show(const std::string& title)
lv2ui_instantiate("gtk2gui"); lv2ui_instantiate("gtk2gui");
} }
return true; return _inst ? true : false;
} }
void void