mirror of
https://github.com/Ardour/ardour.git
synced 2026-01-04 12:45:45 +01:00
merge 12389:12436 from svn+ssh://ardoursvn@subversion.ardour.org/ardour2/branches/3.0
git-svn-id: svn://localhost/ardour2/branches/3.0-SG@12437 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
parent
ee2017d9ee
commit
a2bb5c1feb
272 changed files with 4246 additions and 3800 deletions
|
|
@ -18,12 +18,10 @@
|
|||
*/
|
||||
|
||||
#include "ardour/lv2_plugin.h"
|
||||
#include "ardour/plugin_manager.h"
|
||||
#include "ardour/processor.h"
|
||||
#include "ardour/session.h"
|
||||
#include "pbd/error.h"
|
||||
|
||||
#include "ardour_ui.h"
|
||||
#include "gui_thread.h"
|
||||
#include "lv2_plugin_ui.h"
|
||||
|
||||
#include "lv2/lv2plug.in/ns/extensions/ui/ui.h"
|
||||
|
|
@ -31,6 +29,8 @@
|
|||
#include <lilv/lilv.h>
|
||||
#include <suil/suil.h>
|
||||
|
||||
#include "i18n.h"
|
||||
|
||||
using namespace ARDOUR;
|
||||
using namespace Gtk;
|
||||
using namespace PBD;
|
||||
|
|
@ -272,6 +272,12 @@ LV2PluginUI::lv2ui_instantiate(const std::string& title)
|
|||
pack_start(*_ardour_buttons_box, false, false);
|
||||
|
||||
GtkWidget* c_widget = (GtkWidget*)GET_WIDGET(_inst);
|
||||
if (!c_widget) {
|
||||
error << _("failed to get LV2 UI widget") << endmsg;
|
||||
suil_instance_free((SuilInstance*)_inst);
|
||||
_inst = NULL;
|
||||
return;
|
||||
}
|
||||
_gui_widget = Gtk::manage(Glib::wrap(c_widget));
|
||||
_gui_widget->show_all();
|
||||
pack_start(*_gui_widget, true, true);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue