From 551ba602e3123a4efdf2fb32d0e32a0c5506503a Mon Sep 17 00:00:00 2001 From: David Robillard Date: Thu, 2 Aug 2012 22:13:57 +0000 Subject: Pass parent widget to suil_instance_new. git-svn-id: http://svn.drobilla.net/lad/trunk/jalv@4600 a436a847-0d15-0410-975c-d299462d15a1 --- src/jalv_gtkmm2.cpp | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) (limited to 'src/jalv_gtkmm2.cpp') diff --git a/src/jalv_gtkmm2.cpp b/src/jalv_gtkmm2.cpp index 14e41c7..4e31d17 100644 --- a/src/jalv_gtkmm2.cpp +++ b/src/jalv_gtkmm2.cpp @@ -29,11 +29,10 @@ jalv_init(int* argc, char*** argv, JalvOptions* opts) return 0; } -LilvNode* +const char* jalv_native_ui_type(Jalv* jalv) { - return lilv_new_uri(jalv->world, - "http://lv2plug.in/ns/extensions/ui#GtkUI"); + return "http://lv2plug.in/ns/extensions/ui#GtkUI"; } int @@ -59,13 +58,17 @@ jalv_ui_port_event(Jalv* jalv, } int -jalv_open_ui(Jalv* jalv, - SuilInstance* instance) +jalv_open_ui(Jalv* jalv) { Gtk::Window* window = new Gtk::Window(); - if (instance) { - GtkWidget* widget = (GtkWidget*)suil_instance_get_widget(instance); + if (jalv->ui) { + jalv_ui_instantiate(jalv, jalv_native_ui_type(jalv), NULL); + } + + if (jalv->ui_instance) { + GtkWidget* widget = (GtkWidget*)suil_instance_get_widget( + jalv->ui_instance); Gtk::Widget* widgetmm = Glib::wrap(widget); window->add(*Gtk::manage(widgetmm)); widgetmm->show_all(); -- cgit v1.2.1