diff options
| author | David Robillard <d@drobilla.net> | 2016-08-01 15:44:14 -0400 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2016-08-17 17:25:42 -0400 |
| commit | 17ad0ca1ad23b336b0fa5952f42dfad95397fc47 (patch) | |
| tree | 1cac18de3f2b56ac7885fa7f9566ded8eab8872e /src/gui | |
| parent | d6621e5d1e6f705a09106f62cc75cb33c8c18670 (diff) | |
| download | ingen-17ad0ca1ad23b336b0fa5952f42dfad95397fc47.tar.gz ingen-17ad0ca1ad23b336b0fa5952f42dfad95397fc47.tar.bz2 ingen-17ad0ca1ad23b336b0fa5952f42dfad95397fc47.zip | |
Rename main graph and control/notify ports
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/ConnectWindow.cpp | 2 | ||||
| -rw-r--r-- | src/gui/GraphCanvas.cpp | 8 | ||||
| -rw-r--r-- | src/gui/ingen_gui_lv2.cpp | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/src/gui/ConnectWindow.cpp b/src/gui/ConnectWindow.cpp index 9b735dd9..3078ff05 100644 --- a/src/gui/ConnectWindow.cpp +++ b/src/gui/ConnectWindow.cpp @@ -505,7 +505,7 @@ ConnectWindow::gtk_callback() } } } else if (_connect_stage == 3) { - _app->interface()->get(Raul::URI(Node::root_graph_uri() + "/")); + _app->interface()->get(Raul::URI(Node::main_uri() + "/")); next_stage(); } else if (_connect_stage == 4) { if (_app->store()->size() > 0) { diff --git a/src/gui/GraphCanvas.cpp b/src/gui/GraphCanvas.cpp index df950eb7..ea989c36 100644 --- a/src/gui/GraphCanvas.cpp +++ b/src/gui/GraphCanvas.cpp @@ -565,8 +565,8 @@ destroy_node(GanvNode* node, void* data) } else { GraphPortModule* port_module = dynamic_cast<GraphPortModule*>(module); if (port_module && - strcmp(port_module->port()->path().symbol(), "control_in") && - strcmp(port_module->port()->path().symbol(), "control_out")) { + strcmp(port_module->port()->path().symbol(), "control") && + strcmp(port_module->port()->path().symbol(), "notify")) { app->interface()->del(port_module->port()->uri()); } } @@ -667,12 +667,12 @@ GraphCanvas::paste() // Make a client store to serve as clipboard ClientStore clipboard(_app.world()->uris(), _app.log()); clipboard.set_plugins(_app.store()->plugins()); - clipboard.put(Node::root_graph_uri(), + clipboard.put(Node::main_uri(), {{uris.rdf_type, Resource::Property(uris.ingen_Graph)}}); // Parse clipboard text into clipboard store boost::optional<Raul::URI> base_uri = parser->parse_string( - _app.world(), &clipboard, str, Node::root_graph_uri()); + _app.world(), &clipboard, str, Node::main_uri()); // Figure out the copy graph base path Raul::Path copy_root("/"); diff --git a/src/gui/ingen_gui_lv2.cpp b/src/gui/ingen_gui_lv2.cpp index 6d1dfdba..682df7a1 100644 --- a/src/gui/ingen_gui_lv2.cpp +++ b/src/gui/ingen_gui_lv2.cpp @@ -147,7 +147,7 @@ instantiate(const LV2UI_Descriptor* descriptor, props.insert(std::make_pair(ui->app->uris().rdf_type, Ingen::Resource::Property( ui->app->uris().ingen_Graph))); - ui->app->store()->put(Ingen::Node::root_graph_uri(), props); + ui->app->store()->put(Ingen::Node::main_uri(), props); // Create a GraphBox for the root and set as the UI widget SPtr<const Ingen::Client::GraphModel> root = @@ -158,7 +158,7 @@ instantiate(const LV2UI_Descriptor* descriptor, *widget = ui->view->gobj(); // Request the actual root graph - ui->world->interface()->get(Ingen::Node::root_graph_uri()); + ui->world->interface()->get(Ingen::Node::main_uri()); return ui; } |