summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2007-09-23 14:44:40 +0000
committerDavid Robillard <d@drobilla.net>2007-09-23 14:44:40 +0000
commit0d5d00431191b77081d083e518c1f192f4e9b6dc (patch)
treec7fed3202a7e917a45c5f8a50678c25e6f2f6116
parent614d86f6582847c056959ab129d2256d2fbd5075 (diff)
downloadingen-0d5d00431191b77081d083e518c1f192f4e9b6dc.tar.gz
ingen-0d5d00431191b77081d083e518c1f192f4e9b6dc.tar.bz2
ingen-0d5d00431191b77081d083e518c1f192f4e9b6dc.zip
Fix liblo thing for real this time.
git-svn-id: http://svn.drobilla.net/lad/ingen@769 a436a847-0d15-0410-975c-d299462d15a1
-rw-r--r--src/libs/client/OSCEngineSender.cpp6
-rw-r--r--src/libs/gui/NodeModule.cpp8
2 files changed, 9 insertions, 5 deletions
diff --git a/src/libs/client/OSCEngineSender.cpp b/src/libs/client/OSCEngineSender.cpp
index 78c7ab8c..1618f2a1 100644
--- a/src/libs/client/OSCEngineSender.cpp
+++ b/src/libs/client/OSCEngineSender.cpp
@@ -388,7 +388,7 @@ OSCEngineSender::set_port_value(const string& port_path,
port_path.c_str(),
*(float*)data);
} else {
- lo_blob b = lo_blob_new(data_size, data);
+ lo_blob b = lo_blob_new(data_size, (void*)data);
lo_send(_engine_addr, "/ingen/set_port_value", "isb",
next_id(),
port_path.c_str(),
@@ -413,7 +413,7 @@ OSCEngineSender::set_port_value_immediate(const string& port_path,
port_path.c_str(),
*(float*)data);
} else {
- lo_blob b = lo_blob_new(data_size, data);
+ lo_blob b = lo_blob_new(data_size, (void*)data);
lo_send(_engine_addr, "/ingen/set_port_value_immediate", "isb",
next_id(),
port_path.c_str(),
@@ -440,7 +440,7 @@ OSCEngineSender::set_port_value_immediate(const string& port_path,
voice,
*(float*)data);
} else {
- lo_blob b = lo_blob_new(data_size, data);
+ lo_blob b = lo_blob_new(data_size, (void*)data);
lo_send(_engine_addr, "/ingen/set_port_value_immediate", "isib",
next_id(),
port_path.c_str(),
diff --git a/src/libs/gui/NodeModule.cpp b/src/libs/gui/NodeModule.cpp
index f9d34af0..55aa9594 100644
--- a/src/libs/gui/NodeModule.cpp
+++ b/src/libs/gui/NodeModule.cpp
@@ -98,13 +98,16 @@ void
NodeModule::embed_gui(bool embed)
{
if (embed) {
+
+ GtkWidget* c_widget = NULL;
+
if (!_gui_item) {
cerr << "Embedding LV2 GUI" << endl;
// FIXME: leaks?
SLV2UIInstance ui = _node->plugin()->ui(App::instance().engine().get(), _node.get());
if (ui) {
cerr << "Found UI" << endl;
- GtkWidget* c_widget = (GtkWidget*)slv2_ui_instance_get_widget(ui);
+ c_widget = (GtkWidget*)slv2_ui_instance_get_widget(ui);
_gui = Glib::wrap(c_widget);
assert(_gui);
const double y = 4 + _canvas_title.property_text_height();
@@ -118,7 +121,8 @@ NodeModule::embed_gui(bool embed)
_gui->show();
_gui->show_all();
_gui_item->show();
- Gtk::Requisition r = _gui->size_request();
+ GtkRequisition r;
+ gtk_widget_size_request(c_widget, &r);
cerr << "Size request: " << r.width << "x" << r.height << endl;
_width = max(_width, (double)r.width);
_height = max(_height, (double)r.height);