summaryrefslogtreecommitdiffstats
path: root/src/client
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2012-05-11 01:29:18 +0000
committerDavid Robillard <d@drobilla.net>2012-05-11 01:29:18 +0000
commite77d4fcf31bfdad0b34e184e4743b4750848472c (patch)
treedd3e9aa6d8b8d1e54cae56138ab25f92eba8624a /src/client
parent00957dd74a97252d9a790141cb7f475573da1a91 (diff)
downloadingen-e77d4fcf31bfdad0b34e184e4743b4750848472c.tar.gz
ingen-e77d4fcf31bfdad0b34e184e4743b4750848472c.tar.bz2
ingen-e77d4fcf31bfdad0b34e184e4743b4750848472c.zip
Use more reasonable names for the world's interface and engine (if present).
Don't require separate Configuration initialisation from World (simplify API). git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@4343 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/client')
-rw-r--r--src/client/PluginUI.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/client/PluginUI.cpp b/src/client/PluginUI.cpp
index 59d4c1b4..5cdf5ab2 100644
--- a/src/client/PluginUI.cpp
+++ b/src/client/PluginUI.cpp
@@ -41,8 +41,8 @@ lv2_ui_write(SuilController controller,
const NodeModel::Ports& ports = ui->node()->ports();
if (port_index >= ports.size()) {
- Raul::error << (Raul::fmt("%1% UI tried to write to invalid port %2%")
- % ui->node()->plugin()->uri() % port_index) << endl;
+ Raul::error(Raul::fmt("%1% UI tried to write to invalid port %2%\n")
+ % ui->node()->plugin()->uri() % port_index);
return;
}
@@ -56,7 +56,7 @@ lv2_ui_write(SuilController controller,
if (*(float*)buffer == port->value().get_float())
return; // do nothing (handle stupid plugin UIs that feed back)
- ui->world()->engine()->set_property(
+ ui->world()->interface()->set_property(
port->path(),
uris.ingen_value,
ui->world()->forge().make(*(float*)buffer));
@@ -65,9 +65,9 @@ lv2_ui_write(SuilController controller,
LV2_Atom* atom = (LV2_Atom*)buffer;
Raul::Atom val = ui->world()->forge().alloc(
atom->size, atom->type, LV2_ATOM_BODY(atom));
- ui->world()->engine()->set_property(port->path(),
- uris.ingen_value,
- val);
+ ui->world()->interface()->set_property(port->path(),
+ uris.ingen_value,
+ val);
} else {
Raul::warn(Raul::fmt("Unknown value format %1% from LV2 UI\n")
@@ -144,7 +144,7 @@ PluginUI::create(Ingen::Shared::World* world,
if (instance) {
ret->_instance = instance;
} else {
- Raul::error << "Failed to instantiate LV2 UI" << endl;
+ Raul::error("Failed to instantiate LV2 UI\n");
ret.reset();
}