diff options
| author | David Robillard <d@drobilla.net> | 2015-05-25 09:12:44 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2015-05-25 09:12:44 +0000 |
| commit | ccb7d738d37fb21245a563cd41727f2609f0bc07 (patch) | |
| tree | f13f750311b3b768b87b6dd64b47cd82584a6262 /src/gui | |
| parent | 4f00b8a2ae7148b3a13fd6af0e79eb9b6abf5634 (diff) | |
| download | ingen-ccb7d738d37fb21245a563cd41727f2609f0bc07.tar.gz ingen-ccb7d738d37fb21245a563cd41727f2609f0bc07.tar.bz2 ingen-ccb7d738d37fb21245a563cd41727f2609f0bc07.zip | |
Use ingen:/ as base URI on the wire.
This allows referring to non-graph items, which are converted to
bundle-relative URIs on save, resolving issue #1049.
Change root graph URI to ingen:/graph.
git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@5687 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/ConnectWindow.cpp | 2 | ||||
| -rw-r--r-- | src/gui/GraphCanvas.cpp | 4 | ||||
| -rw-r--r-- | src/gui/ingen_gui_lv2.cpp | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/gui/ConnectWindow.cpp b/src/gui/ConnectWindow.cpp index 6555ce35..cb3012c3 100644 --- a/src/gui/ConnectWindow.cpp +++ b/src/gui/ConnectWindow.cpp @@ -482,7 +482,7 @@ ConnectWindow::gtk_callback() } } } else if (_connect_stage == 3) { - _app->interface()->get(Raul::URI(Node::root_uri() + "/")); + _app->interface()->get(Raul::URI(Node::root_graph_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 0725aa67..9987e0b8 100644 --- a/src/gui/GraphCanvas.cpp +++ b/src/gui/GraphCanvas.cpp @@ -635,12 +635,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_uri(), + clipboard.put(Node::root_graph_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_uri()); + _app.world(), &clipboard, str, Node::root_graph_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 386f30c0..c81d48a0 100644 --- a/src/gui/ingen_gui_lv2.cpp +++ b/src/gui/ingen_gui_lv2.cpp @@ -148,7 +148,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_uri(), props); + ui->app->store()->put(Ingen::Node::root_graph_uri(), props); // Create a GraphBox for the root and set as the UI widget SPtr<const Ingen::Client::GraphModel> root = @@ -159,7 +159,7 @@ instantiate(const LV2UI_Descriptor* descriptor, *widget = ui->view->gobj(); // Request the actual root graph - ui->world->interface()->get(Ingen::Node::root_uri()); + ui->world->interface()->get(Ingen::Node::root_graph_uri()); return ui; } |