summaryrefslogtreecommitdiffstats
path: root/src/gui
diff options
context:
space:
mode:
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/App.cpp18
-rw-r--r--src/gui/App.hpp10
-rw-r--r--src/gui/ConnectWindow.cpp57
-rw-r--r--src/gui/LoadPluginWindow.cpp2
-rw-r--r--src/gui/NewSubpatchWindow.cpp4
-rw-r--r--src/gui/NodeMenu.cpp14
-rw-r--r--src/gui/NodeModule.cpp10
-rw-r--r--src/gui/ObjectMenu.cpp8
-rw-r--r--src/gui/PatchBox.cpp2
-rw-r--r--src/gui/PatchCanvas.cpp16
-rw-r--r--src/gui/PatchPortModule.cpp4
-rw-r--r--src/gui/PatchTreeWindow.cpp4
-rw-r--r--src/gui/PatchView.cpp8
-rw-r--r--src/gui/Port.cpp12
-rw-r--r--src/gui/PortMenu.cpp20
-rw-r--r--src/gui/PortPropertiesWindow.cpp2
-rw-r--r--src/gui/PropertiesWindow.cpp2
-rw-r--r--src/gui/RenameWindow.cpp4
-rw-r--r--src/gui/SubpatchModule.cpp4
-rw-r--r--src/gui/ThreadedLoader.cpp2
-rw-r--r--src/gui/ingen_gui_lv2.cpp11
21 files changed, 105 insertions, 109 deletions
diff --git a/src/gui/App.cpp b/src/gui/App.cpp
index 3b3fa6f9..f56f6f41 100644
--- a/src/gui/App.cpp
+++ b/src/gui/App.cpp
@@ -159,13 +159,13 @@ App::attach(SharedPtr<SigClientInterface> client)
assert(!_store);
assert(!_loader);
- if (_world->local_engine()) {
- _world->local_engine()->register_client(client->uri(), client);
+ if (_world->engine()) {
+ _world->engine()->register_client(client->uri(), client);
}
_client = client;
- _store = SharedPtr<ClientStore>(new ClientStore(_world->uris(), _world->engine(), client));
- _loader = SharedPtr<ThreadedLoader>(new ThreadedLoader(*this, _world->engine()));
+ _store = SharedPtr<ClientStore>(new ClientStore(_world->uris(), _world->interface(), client));
+ _loader = SharedPtr<ThreadedLoader>(new ThreadedLoader(*this, _world->interface()));
_patch_tree_window->init(*this, *_store);
@@ -180,14 +180,14 @@ App::attach(SharedPtr<SigClientInterface> client)
void
App::detach()
{
- if (_world->engine()) {
+ if (_world->interface()) {
_window_factory->clear();
_store->clear();
_loader.reset();
_store.reset();
_client.reset();
- _world->set_engine(SharedPtr<Interface>());
+ _world->set_interface(SharedPtr<Interface>());
}
}
@@ -292,8 +292,8 @@ App::gtk_main_iteration()
if (!_client)
return false;
- if (_world->local_engine()) {
- if (!_world->local_engine()->main_iteration()) {
+ if (_world->engine()) {
+ if (!_world->engine()->main_iteration()) {
Gtk::Main::quit();
return false;
}
@@ -320,7 +320,7 @@ bool
App::quit(Gtk::Window* dialog_parent)
{
bool quit = true;
- if (_world->local_engine()) {
+ if (_world->engine()) {
Gtk::MessageDialog d(
"The engine is running in this process. Quitting will terminate Ingen."
"\n\n" "Are you sure you want to quit?",
diff --git a/src/gui/App.hpp b/src/gui/App.hpp
index a66a83a8..64eed0ff 100644
--- a/src/gui/App.hpp
+++ b/src/gui/App.hpp
@@ -105,11 +105,11 @@ public:
Glib::RefPtr<Gdk::Pixbuf> icon_from_path(const std::string& path, int size);
- Ingen::Forge& forge() const { return _world->forge(); }
- SharedPtr<Ingen::Interface> engine() const { return _world->engine(); }
- SharedPtr<Client::SigClientInterface> client() const { return _client; }
- SharedPtr<Client::ClientStore> store() const { return _store; }
- SharedPtr<ThreadedLoader> loader() const { return _loader; }
+ Ingen::Forge& forge() const { return _world->forge(); }
+ SharedPtr<Ingen::Interface> interface() const { return _world->interface(); }
+ SharedPtr<Client::SigClientInterface> client() const { return _client; }
+ SharedPtr<Client::ClientStore> store() const { return _store; }
+ SharedPtr<ThreadedLoader> loader() const { return _loader; }
SharedPtr<Serialisation::Serialiser> serialiser();
diff --git a/src/gui/ConnectWindow.cpp b/src/gui/ConnectWindow.cpp
index b08efb85..b27a9f70 100644
--- a/src/gui/ConnectWindow.cpp
+++ b/src/gui/ConnectWindow.cpp
@@ -61,22 +61,21 @@ ConnectWindow::start(App& app, Ingen::Shared::World* world)
{
_app = &app;
- if (world->local_engine()) {
+ if (world->engine()) {
_mode = INTERNAL;
if (_widgets_loaded) {
_internal_radio->set_active(true);
}
}
- set_connected_to(world->engine());
-
- connect(world->engine());
+ set_connected_to(world->interface());
+ connect(world->interface());
}
void
ConnectWindow::set_connected_to(SharedPtr<Ingen::Interface> engine)
{
- _app->world()->set_engine(engine);
+ _app->world()->set_interface(engine);
if (!_widgets_loaded)
return;
@@ -98,7 +97,7 @@ ConnectWindow::set_connected_to(SharedPtr<Ingen::Interface> engine)
_connect_button->set_sensitive(true);
_disconnect_button->set_sensitive(false);
- if (_app->world()->local_engine())
+ if (_app->world()->engine())
_internal_radio->set_sensitive(true);
else
_internal_radio->set_sensitive(false);
@@ -158,17 +157,17 @@ ConnectWindow::connect(bool existing)
}
if (existing) {
- uri = world->engine()->uri().str();
+ uri = world->interface()->uri().str();
}
SharedPtr<ThreadedSigClientInterface> tsci;
- if (world->engine()) {
+ if (world->interface()) {
tsci = PtrCast<ThreadedSigClientInterface>(
- world->engine()->respondee());
+ world->interface()->respondee());
}
if (!tsci) {
- world->set_engine(world->interface(uri, tsci));
+ world->set_interface(world->new_interface(uri, tsci));
}
_app->attach(tsci);
@@ -187,7 +186,7 @@ ConnectWindow::connect(bool existing)
const std::string engine_uri = string("tcp://localhost:").append(port_str);
SharedPtr<ThreadedSigClientInterface> tsci(new ThreadedSigClientInterface(1024));
- world->set_engine(world->interface(engine_uri, tsci));
+ world->set_interface(world->new_interface(engine_uri, tsci));
_app->attach(tsci);
_app->register_callbacks();
@@ -201,15 +200,15 @@ ConnectWindow::connect(bool existing)
} else
#endif
if (_mode == INTERNAL) {
- if (!world->local_engine()) {
+ if (!world->engine()) {
world->load_module("server");
world->load_module("jack");
- world->local_engine()->activate();
+ world->engine()->activate();
}
SharedPtr<SigClientInterface> client(new SigClientInterface());
- world->engine()->set_respondee(client);
+ world->interface()->set_respondee(client);
_app->attach(client);
_app->register_callbacks();
@@ -241,17 +240,17 @@ ConnectWindow::disconnect()
void
ConnectWindow::activate()
{
- _app->engine()->set_property("ingen:driver",
- "ingen:enabled",
- _app->forge().make(true));
+ _app->interface()->set_property("ingen:driver",
+ "ingen:enabled",
+ _app->forge().make(true));
}
void
ConnectWindow::deactivate()
{
- _app->engine()->set_property("ingen:driver",
- "ingen:enabled",
- _app->forge().make(false));
+ _app->interface()->set_property("ingen:driver",
+ "ingen:enabled",
+ _app->forge().make(false));
}
void
@@ -260,7 +259,7 @@ ConnectWindow::on_show()
if (!_widgets_loaded) {
load_widgets();
if (_attached)
- set_connected_to(_app->engine());
+ set_connected_to(_app->interface());
}
Gtk::Dialog::on_show();
@@ -375,8 +374,8 @@ ConnectWindow::gtk_callback()
sigc::mem_fun(this, &ConnectWindow::ingen_response));
_ping_id = abs(rand()) / 2 * 2; // avoid -1
- _app->engine()->set_response_id(_ping_id);
- _app->engine()->get("ingen:engine");
+ _app->interface()->set_response_id(_ping_id);
+ _app->interface()->get("ingen:engine");
if (_widgets_loaded) {
_progress_label->set_text("Connecting to engine...");
@@ -392,13 +391,13 @@ ConnectWindow::gtk_callback()
const float ms_since_last = (now.tv_sec - last.tv_sec) * 1000.0f +
(now.tv_usec - last.tv_usec) * 0.001f;
if (ms_since_last > 1000) {
- _app->engine()->set_response_id(_ping_id);
- _app->engine()->get("ingen:engine");
+ _app->interface()->set_response_id(_ping_id);
+ _app->interface()->get("ingen:engine");
last = now;
}
}
} else if (_connect_stage == 2) {
- _app->engine()->get(Path("/"));
+ _app->interface()->get(Path("/"));
if (_widgets_loaded)
_progress_label->set_text(string("Requesting root patch..."));
++_connect_stage;
@@ -407,16 +406,16 @@ ConnectWindow::gtk_callback()
SharedPtr<const PatchModel> root = PtrCast<const PatchModel>(
_app->store()->object("/"));
if (root) {
- set_connected_to(_app->engine());
+ set_connected_to(_app->interface());
_app->window_factory()->present_patch(root);
- _app->engine()->get("ingen:plugins");
+ _app->interface()->get("ingen:plugins");
if (_widgets_loaded)
_progress_label->set_text(string("Loading plugins..."));
++_connect_stage;
}
}
} else if (_connect_stage == 4) {
- _app->engine()->get("ingen:plugins");
+ _app->interface()->get("ingen:plugins");
hide();
if (_widgets_loaded)
_progress_label->set_text("Connected to engine");
diff --git a/src/gui/LoadPluginWindow.cpp b/src/gui/LoadPluginWindow.cpp
index 09830642..8eda5400 100644
--- a/src/gui/LoadPluginWindow.cpp
+++ b/src/gui/LoadPluginWindow.cpp
@@ -352,7 +352,7 @@ LoadPluginWindow::load_plugin(const Gtk::TreeModel::iterator& iter)
Raul::warn << "FIXME: polyphonic" << std::endl;
//props.insert(make_pair(uris.ingen_polyphonic,
// _app->forge().make(polyphonic)));
- _app->engine()->put(path, props);
+ _app->interface()->put(path, props);
if (_selection->get_selected_rows().size() == 1) {
_name_offset = (_name_offset == 0) ? 2 : _name_offset + 1;
diff --git a/src/gui/NewSubpatchWindow.cpp b/src/gui/NewSubpatchWindow.cpp
index 8b99a921..9e815df1 100644
--- a/src/gui/NewSubpatchWindow.cpp
+++ b/src/gui/NewSubpatchWindow.cpp
@@ -100,12 +100,12 @@ NewSubpatchWindow::ok_clicked()
props.insert(make_pair(_app->uris().rdf_type, _app->uris().ingen_Patch));
props.insert(make_pair(_app->uris().ingen_polyphony, _app->forge().make(int32_t(poly))));
props.insert(make_pair(_app->uris().ingen_enabled, _app->forge().make(bool(true))));
- _app->engine()->put(path, props, Resource::INTERNAL);
+ _app->interface()->put(path, props, Resource::INTERNAL);
// Set external (node perspective) properties
props = _initial_data;
props.insert(make_pair(_app->uris().rdf_type, _app->uris().ingen_Patch));
- _app->engine()->put(path, _initial_data, Resource::EXTERNAL);
+ _app->interface()->put(path, _initial_data, Resource::EXTERNAL);
hide();
}
diff --git a/src/gui/NodeMenu.cpp b/src/gui/NodeMenu.cpp
index 750baf08..c184384e 100644
--- a/src/gui/NodeMenu.cpp
+++ b/src/gui/NodeMenu.cpp
@@ -144,7 +144,7 @@ NodeMenu::on_menu_embed_gui()
void
NodeMenu::on_menu_randomize()
{
- _app->engine()->bundle_begin();
+ _app->interface()->bundle_begin();
const NodeModel* const nm = (NodeModel*)_object.get();
for (NodeModel::Ports::const_iterator i = nm->ports().begin(); i != nm->ports().end(); ++i) {
@@ -152,20 +152,20 @@ NodeMenu::on_menu_randomize()
float min = 0.0f, max = 1.0f;
nm->port_value_range(*i, min, max, _app->sample_rate());
const float val = ((rand() / (float)RAND_MAX) * (max - min) + min);
- _app->engine()->set_property(
+ _app->interface()->set_property(
(*i)->path(),
_app->uris().ingen_value,
_app->forge().make(val));
}
}
- _app->engine()->bundle_end();
+ _app->interface()->bundle_end();
}
void
NodeMenu::on_menu_disconnect()
{
- _app->engine()->disconnect_all(_object->parent()->path(), _object->path());
+ _app->interface()->disconnect_all(_object->parent()->path(), _object->path());
}
void
@@ -186,7 +186,7 @@ NodeMenu::on_preset_activated(const std::string& uri)
subject,
port_pred,
NULL);
- _app->engine()->bundle_begin();
+ _app->interface()->bundle_begin();
LILV_FOREACH(nodes, i, ports) {
const LilvNode* uri = lilv_nodes_get(ports, i);
LilvNodes* values = lilv_world_find_nodes(
@@ -196,13 +196,13 @@ NodeMenu::on_preset_activated(const std::string& uri)
if (values && symbols) {
const LilvNode* val = lilv_nodes_get_first(values);
const LilvNode* sym = lilv_nodes_get_first(symbols);
- _app->engine()->set_property(
+ _app->interface()->set_property(
node->path().base() + lilv_node_as_string(sym),
_app->uris().ingen_value,
_app->forge().make(lilv_node_as_float(val)));
}
}
- _app->engine()->bundle_end();
+ _app->interface()->bundle_end();
lilv_nodes_free(ports);
lilv_node_free(value_pred);
lilv_node_free(symbol_pred);
diff --git a/src/gui/NodeModule.cpp b/src/gui/NodeModule.cpp
index b471d525..7d9fa2f6 100644
--- a/src/gui/NodeModule.cpp
+++ b/src/gui/NodeModule.cpp
@@ -194,7 +194,7 @@ void
NodeModule::on_embed_gui_toggled(bool embed)
{
embed_gui(embed);
- app().engine()->set_property(_node->path(),
+ app().interface()->set_property(_node->path(),
app().uris().ingen_uiEmbedded,
app().forge().make(embed));
}
@@ -376,7 +376,7 @@ NodeModule::store_location(double ax, double ay)
Resource::Properties add;
add.insert(make_pair(uris.ingen_canvasX, x));
add.insert(make_pair(uris.ingen_canvasY, y));
- app().engine()->delta(_node->path(), remove, add);
+ app().interface()->delta(_node->path(), remove, add);
}
}
@@ -434,9 +434,9 @@ NodeModule::set_selected(gboolean b)
}
}
if (app().signal()) {
- app().engine()->set_property(_node->path(),
- uris.ingen_selected,
- app().forge().make(b));
+ app().interface()->set_property(_node->path(),
+ uris.ingen_selected,
+ app().forge().make(b));
}
}
}
diff --git a/src/gui/ObjectMenu.cpp b/src/gui/ObjectMenu.cpp
index b1d1a766..3b8ac66f 100644
--- a/src/gui/ObjectMenu.cpp
+++ b/src/gui/ObjectMenu.cpp
@@ -96,7 +96,7 @@ ObjectMenu::init(App& app, SharedPtr<const ObjectModel> object)
void
ObjectMenu::on_menu_learn()
{
- _app->engine()->set_property(_object->path(),
+ _app->interface()->set_property(_object->path(),
_app->uris().ingen_controlBinding,
_app->uris().wildcard);
}
@@ -108,14 +108,14 @@ ObjectMenu::on_menu_unlearn()
remove.insert(std::make_pair(
_app->uris().ingen_controlBinding,
_app->uris().wildcard));
- _app->engine()->delta(_object->path(), remove, Resource::Properties());
+ _app->interface()->delta(_object->path(), remove, Resource::Properties());
}
void
ObjectMenu::on_menu_polyphonic()
{
if (_enable_signal)
- _app->engine()->set_property(
+ _app->interface()->set_property(
_object->path(),
_app->uris().ingen_polyphonic,
_app->forge().make(bool(_polyphonic_menuitem->get_active())));
@@ -134,7 +134,7 @@ ObjectMenu::property_changed(const URI& predicate, const Atom& value)
void
ObjectMenu::on_menu_destroy()
{
- _app->engine()->del(_object->path());
+ _app->interface()->del(_object->path());
}
void
diff --git a/src/gui/PatchBox.cpp b/src/gui/PatchBox.cpp
index 9988b252..dbf011ce 100644
--- a/src/gui/PatchBox.cpp
+++ b/src/gui/PatchBox.cpp
@@ -172,7 +172,7 @@ PatchBox::init_box(App& app)
{
_app = &app;
- std::string engine_name = _app->engine()->uri().str();
+ std::string engine_name = _app->interface()->uri().str();
if (engine_name == "http://drobilla.net/ns/ingen#internal") {
engine_name = "internal engine";
}
diff --git a/src/gui/PatchCanvas.cpp b/src/gui/PatchCanvas.cpp
index 9bbf3bc5..c8347bcb 100644
--- a/src/gui/PatchCanvas.cpp
+++ b/src/gui/PatchCanvas.cpp
@@ -511,7 +511,7 @@ PatchCanvas::connect(Ganv::Node* tail,
if (!src || !dst)
return;
- _app.engine()->connect(src->model()->path(), dst->model()->path());
+ _app.interface()->connect(src->model()->path(), dst->model()->path());
}
void
@@ -521,7 +521,7 @@ PatchCanvas::disconnect(Ganv::Node* tail,
const Ingen::GUI::Port* const t = dynamic_cast<Ingen::GUI::Port*>(tail);
const Ingen::GUI::Port* const h = dynamic_cast<Ingen::GUI::Port*>(head);
- _app.engine()->disconnect(t->model()->path(), h->model()->path());
+ _app.interface()->disconnect(t->model()->path(), h->model()->path());
}
void
@@ -608,11 +608,11 @@ destroy_node(GanvNode* node, void* data)
NodeModule* node_module = dynamic_cast<NodeModule*>(module);
if (node_module) {
- app->engine()->del(node_module->node()->path());
+ app->interface()->del(node_module->node()->path());
} else {
PatchPortModule* port_module = dynamic_cast<PatchPortModule*>(module);
if (port_module) {
- app->engine()->del(port_module->port()->path());
+ app->interface()->del(port_module->port()->path());
}
}
}
@@ -625,7 +625,7 @@ destroy_edge(GanvEdge* edge, void* data)
Port* tail = dynamic_cast<Port*>(edgemm->get_tail());
Port* head = dynamic_cast<Port*>(edgemm->get_head());
- app->engine()->disconnect(tail->model()->path(), head->model()->path());
+ app->interface()->disconnect(tail->model()->path(), head->model()->path());
}
void
@@ -688,7 +688,7 @@ PatchCanvas::paste()
const URIs& uris = _app.uris();
- Builder builder(_app.world()->uris(), *_app.engine());
+ Builder builder(_app.world()->uris(), *_app.interface());
ClientStore clipboard(_app.world()->uris());
clipboard.set_plugins(_app.store()->plugins());
@@ -792,7 +792,7 @@ PatchCanvas::menu_add_port(const string& sym_base, const string& name_base,
_app.forge().make(int32_t(_patch->num_ports()))));
props.insert(make_pair(uris.lv2_name,
_app.forge().alloc(name.c_str())));
- _app.engine()->put(path, props);
+ _app.interface()->put(path, props);
}
void
@@ -818,7 +818,7 @@ PatchCanvas::load_plugin(WeakPtr<PluginModel> weak_plugin)
props.insert(make_pair(uris.rdf_type, uris.ingen_Node));
props.insert(make_pair(uris.ingen_prototype,
uris.forge.alloc_uri(plugin->uri().str())));
- _app.engine()->put(path, props);
+ _app.interface()->put(path, props);
}
/** Try to guess a suitable location for a new module.
diff --git a/src/gui/PatchPortModule.cpp b/src/gui/PatchPortModule.cpp
index c663f926..3961eacf 100644
--- a/src/gui/PatchPortModule.cpp
+++ b/src/gui/PatchPortModule.cpp
@@ -109,7 +109,7 @@ PatchPortModule::store_location(double ax, double ay)
Resource::Property(x, Resource::INTERNAL)));
add.insert(make_pair(uris.ingen_canvasY,
Resource::Property(y, Resource::INTERNAL)));
- app().engine()->delta(_model->path(), remove, add);
+ app().interface()->delta(_model->path(), remove, add);
}
}
@@ -165,7 +165,7 @@ PatchPortModule::set_selected(gboolean b)
if (b != get_selected()) {
Module::set_selected(b);
if (app().signal())
- app().engine()->set_property(
+ app().interface()->set_property(
_model->path(),
app().uris().ingen_selected,
app().forge().make(b));
diff --git a/src/gui/PatchTreeWindow.cpp b/src/gui/PatchTreeWindow.cpp
index b17e8a71..29dc3721 100644
--- a/src/gui/PatchTreeWindow.cpp
+++ b/src/gui/PatchTreeWindow.cpp
@@ -93,7 +93,7 @@ PatchTreeWindow::add_patch(SharedPtr<PatchModel> pm)
Gtk::TreeModel::iterator iter = _patch_treestore->append();
Gtk::TreeModel::Row row = *iter;
if (pm->path().is_root()) {
- row[_patch_tree_columns.name_col] = _app->engine()->uri().str();
+ row[_patch_tree_columns.name_col] = _app->interface()->uri().str();
} else {
row[_patch_tree_columns.name_col] = pm->symbol().c_str();
}
@@ -188,7 +188,7 @@ PatchTreeWindow::event_patch_enabled_toggled(const Glib::ustring& path_str)
assert(pm);
if (_enable_signal)
- _app->engine()->set_property(
+ _app->interface()->set_property(
pm->path(),
_app->uris().ingen_enabled,
_app->forge().make((bool)!pm->enabled()));
diff --git a/src/gui/PatchView.cpp b/src/gui/PatchView.cpp
index 4d54f4dc..d8e00ac2 100644
--- a/src/gui/PatchView.cpp
+++ b/src/gui/PatchView.cpp
@@ -162,7 +162,7 @@ PatchView::process_toggled()
if (!_enable_signal)
return;
- _app->engine()->set_property(
+ _app->interface()->set_property(
_patch->path(),
_app->uris().ingen_enabled,
_app->forge().make((bool)_process_but->get_active()));
@@ -171,7 +171,7 @@ PatchView::process_toggled()
void
PatchView::poly_changed()
{
- _app->engine()->set_property(
+ _app->interface()->set_property(
_patch->path(),
_app->uris().ingen_polyphony,
_app->forge().make(_poly_spin->get_value_as_int()));
@@ -180,9 +180,9 @@ PatchView::poly_changed()
void
PatchView::refresh_clicked()
{
- _app->engine()->get(_patch->path());
+ _app->interface()->get(_patch->path());
Raul::warn("Refreshing plugins\n");
- _app->engine()->get("ingen:plugins");
+ _app->interface()->get("ingen:plugins");
}
void
diff --git a/src/gui/Port.cpp b/src/gui/Port.cpp
index 7d84abca..fb32a9ac 100644
--- a/src/gui/Port.cpp
+++ b/src/gui/Port.cpp
@@ -143,9 +143,9 @@ Port::on_value_changed(GVariant* value)
const Raul::Atom atom = _app.forge().make(float(g_variant_get_double(value)));
if (atom != model()->value()) {
Ingen::Shared::World* const world = _app.world();
- _app.engine()->set_property(model()->path(),
- world->uris()->ingen_value,
- atom);
+ _app.interface()->set_property(model()->path(),
+ world->uris()->ingen_value,
+ atom);
}
PatchBox* box = get_patch_box();
@@ -165,9 +165,9 @@ Port::value_changed(const Atom& value)
void
Port::on_scale_point_activated(float f)
{
- _app.engine()->set_property(model()->path(),
- _app.world()->uris()->ingen_value,
- _app.world()->forge().make(f));
+ _app.interface()->set_property(model()->path(),
+ _app.world()->uris()->ingen_value,
+ _app.world()->forge().make(f));
}
Gtk::Menu*
diff --git a/src/gui/PortMenu.cpp b/src/gui/PortMenu.cpp
index 19a6770a..378e48cc 100644
--- a/src/gui/PortMenu.cpp
+++ b/src/gui/PortMenu.cpp
@@ -93,10 +93,10 @@ void
PortMenu::on_menu_disconnect()
{
if (_patch_port) {
- _app->engine()->disconnect_all(
+ _app->interface()->disconnect_all(
_object->parent()->path(), _object->path());
} else {
- _app->engine()->disconnect_all(
+ _app->interface()->disconnect_all(
_object->parent()->path().parent(), _object->path());
}
}
@@ -108,7 +108,7 @@ PortMenu::on_menu_set_min()
SharedPtr<const PortModel> model = PtrCast<const PortModel>(_object);
const Raul::Atom& value = model->get_property(uris.ingen_value);
if (value.is_valid())
- _app->engine()->set_property(_object->path(), uris.lv2_minimum, value);
+ _app->interface()->set_property(_object->path(), uris.lv2_minimum, value);
}
void
@@ -118,7 +118,7 @@ PortMenu::on_menu_set_max()
SharedPtr<const PortModel> model = PtrCast<const PortModel>(_object);
const Raul::Atom& value = model->get_property(uris.ingen_value);
if (value.is_valid())
- _app->engine()->set_property(_object->path(), uris.lv2_maximum, value);
+ _app->interface()->set_property(_object->path(), uris.lv2_maximum, value);
}
void
@@ -132,14 +132,14 @@ PortMenu::on_menu_reset_range()
parent->default_port_value_range(model, min, max);
if (!std::isnan(min))
- _app->engine()->set_property(_object->path(),
- uris.lv2_minimum,
- _app->forge().make(min));
+ _app->interface()->set_property(_object->path(),
+ uris.lv2_minimum,
+ _app->forge().make(min));
if (!std::isnan(max))
- _app->engine()->set_property(_object->path(),
- uris.lv2_maximum,
- _app->forge().make(max));
+ _app->interface()->set_property(_object->path(),
+ uris.lv2_maximum,
+ _app->forge().make(max));
}
} // namespace GUI
diff --git a/src/gui/PortPropertiesWindow.cpp b/src/gui/PortPropertiesWindow.cpp
index ca48e239..b7df2445 100644
--- a/src/gui/PortPropertiesWindow.cpp
+++ b/src/gui/PortPropertiesWindow.cpp
@@ -158,7 +158,7 @@ PortPropertiesWindow::ok()
props.insert(
make_pair(uris.lv2_maximum,
_app->forge().make(float(_max_spinner->get_value()))));
- _app->engine()->put(_port_model->path(), props);
+ _app->interface()->put(_port_model->path(), props);
hide();
}
diff --git a/src/gui/PropertiesWindow.cpp b/src/gui/PropertiesWindow.cpp
index 098640ec..07e01d0f 100644
--- a/src/gui/PropertiesWindow.cpp
+++ b/src/gui/PropertiesWindow.cpp
@@ -282,7 +282,7 @@ PropertiesWindow::apply_clicked()
}
}
- _app->engine()->put(_model->path(), properties);
+ _app->interface()->put(_model->path(), properties);
LOG(debug) << "}" << endl;
}
diff --git a/src/gui/RenameWindow.cpp b/src/gui/RenameWindow.cpp
index e10c3fcf..097b9aea 100644
--- a/src/gui/RenameWindow.cpp
+++ b/src/gui/RenameWindow.cpp
@@ -128,12 +128,12 @@ RenameWindow::ok_clicked()
const Symbol& symbol(symbol_str);
if (symbol != _object->symbol()) {
path = _object->path().parent().child(symbol);
- _app->engine()->move(_object->path(), path);
+ _app->interface()->move(_object->path(), path);
}
}
if (!label.empty() && (!name_atom.is_valid() || label != name_atom.get_string())) {
- _app->engine()->set_property(path,
+ _app->interface()->set_property(path,
uris.lv2_name,
_app->forge().alloc(label));
}
diff --git a/src/gui/SubpatchModule.cpp b/src/gui/SubpatchModule.cpp
index 6c74ec69..dcc55e20 100644
--- a/src/gui/SubpatchModule.cpp
+++ b/src/gui/SubpatchModule.cpp
@@ -80,7 +80,7 @@ SubpatchModule::store_location(double ax, double ay)
Resource::Property(x, Resource::EXTERNAL)));
add.insert(make_pair(uris.ingen_canvasY,
Resource::Property(y, Resource::EXTERNAL)));
- app().engine()->delta(_node->path(), remove, add);
+ app().interface()->delta(_node->path(), remove, add);
}
}
@@ -104,7 +104,7 @@ SubpatchModule::browse_to_patch()
void
SubpatchModule::menu_remove()
{
- app().engine()->del(_patch->path());
+ app().interface()->del(_patch->path());
}
} // namespace GUI
diff --git a/src/gui/ThreadedLoader.cpp b/src/gui/ThreadedLoader.cpp
index 4800d003..81bec1eb 100644
--- a/src/gui/ThreadedLoader.cpp
+++ b/src/gui/ThreadedLoader.cpp
@@ -89,7 +89,7 @@ ThreadedLoader::load_patch(bool merge,
sigc::bind(sigc::mem_fun(world->parser().get(),
&Ingen::Serialisation::Parser::parse_file),
_app.world(),
- _app.world()->engine().get(),
+ _app.world()->interface().get(),
document_uri,
engine_parent,
engine_symbol,
diff --git a/src/gui/ingen_gui_lv2.cpp b/src/gui/ingen_gui_lv2.cpp
index 3448f4a9..6afe7f68 100644
--- a/src/gui/ingen_gui_lv2.cpp
+++ b/src/gui/ingen_gui_lv2.cpp
@@ -55,15 +55,12 @@ struct IngenLV2AtomSink : public Ingen::Shared::AtomSink {
struct IngenLV2UI {
IngenLV2UI()
- : conf()
- , sink(NULL)
- {
- }
+ : sink(NULL)
+ {}
int argc;
char** argv;
Ingen::Forge* forge;
- Ingen::Shared::Configuration conf;
Ingen::Shared::World* world;
IngenLV2AtomSink* sink;
SharedPtr<Ingen::GUI::App> app;
@@ -97,7 +94,7 @@ instantiate(const LV2UI_Descriptor* descriptor,
}
ui->world = new Ingen::Shared::World(
- &ui->conf, ui->argc, ui->argv, map, unmap);
+ ui->argc, ui->argv, map, unmap);
ui->forge = new Ingen::Forge(*ui->world->uri_map().get());
@@ -115,7 +112,7 @@ instantiate(const LV2UI_Descriptor* descriptor,
*ui->world->uris().get(),
*ui->sink));
- ui->world->set_engine(ui->engine);
+ ui->world->set_interface(ui->engine);
// Create App and client
ui->app = Ingen::GUI::App::create(ui->world);
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-28 13:29:06 +0000