summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/gui/LoadPatchWindow.cpp4
-rw-r--r--src/gui/LoadPluginWindow.cpp4
-rw-r--r--src/gui/NodeModule.cpp16
-rw-r--r--src/gui/PatchCanvas.cpp8
-rw-r--r--src/gui/PatchPortModule.cpp16
-rw-r--r--src/gui/SubpatchModule.cpp12
-rw-r--r--src/http/HTTPClientSender.cpp3
-rw-r--r--src/server/Engine.cpp8
-rw-r--r--src/shared/URIs.cpp5
-rw-r--r--src/shared/World.cpp1
10 files changed, 37 insertions, 40 deletions
diff --git a/src/gui/LoadPatchWindow.cpp b/src/gui/LoadPatchWindow.cpp
index 8c121b5e..33094bbd 100644
--- a/src/gui/LoadPatchWindow.cpp
+++ b/src/gui/LoadPatchWindow.cpp
@@ -176,9 +176,9 @@ LoadPatchWindow::ok_clicked()
std::list<Glib::ustring> uri_list = get_uris();
for (std::list<Glib::ustring>::iterator i = uri_list.begin(); i != uri_list.end(); ++i) {
// Cascade
- Atom& x = _initial_data.find(uris.ingenui_canvas_x)->second;
+ Atom& x = _initial_data.find(uris.ingen_canvas_x)->second;
x = Atom(x.get_float() + 20.0f);
- Atom& y = _initial_data.find(uris.ingenui_canvas_y)->second;
+ Atom& y = _initial_data.find(uris.ingen_canvas_y)->second;
y = Atom(y.get_float() + 20.0f);
Raul::Symbol symbol(symbol_from_filename(*i));
diff --git a/src/gui/LoadPluginWindow.cpp b/src/gui/LoadPluginWindow.cpp
index c89b4c46..238cf7cb 100644
--- a/src/gui/LoadPluginWindow.cpp
+++ b/src/gui/LoadPluginWindow.cpp
@@ -354,9 +354,9 @@ LoadPluginWindow::load_plugin(const Gtk::TreeModel::iterator& iter)
}
// Cascade next node
- Atom& x = _initial_data.find(uris.ingenui_canvas_x)->second;
+ Atom& x = _initial_data.find(uris.ingen_canvas_x)->second;
x = Atom(x.get_float() + 20.0f);
- Atom& y = _initial_data.find(uris.ingenui_canvas_y)->second;
+ Atom& y = _initial_data.find(uris.ingen_canvas_y)->second;
y = Atom(y.get_float() + 20.0f);
}
}
diff --git a/src/gui/NodeModule.cpp b/src/gui/NodeModule.cpp
index 5a8e30ad..0767a175 100644
--- a/src/gui/NodeModule.cpp
+++ b/src/gui/NodeModule.cpp
@@ -365,16 +365,16 @@ NodeModule::store_location()
const URIs& uris = app().uris();
- const Atom& existing_x = _node->get_property(uris.ingenui_canvas_x);
- const Atom& existing_y = _node->get_property(uris.ingenui_canvas_y);
+ const Atom& existing_x = _node->get_property(uris.ingen_canvas_x);
+ const Atom& existing_y = _node->get_property(uris.ingen_canvas_y);
if (x != existing_x && y != existing_y) {
Resource::Properties remove;
- remove.insert(make_pair(uris.ingenui_canvas_x, uris.wildcard));
- remove.insert(make_pair(uris.ingenui_canvas_y, uris.wildcard));
+ remove.insert(make_pair(uris.ingen_canvas_x, uris.wildcard));
+ remove.insert(make_pair(uris.ingen_canvas_y, uris.wildcard));
Resource::Properties add;
- add.insert(make_pair(uris.ingenui_canvas_x, x));
- add.insert(make_pair(uris.ingenui_canvas_y, y));
+ add.insert(make_pair(uris.ingen_canvas_x, x));
+ add.insert(make_pair(uris.ingen_canvas_y, y));
app().engine()->delta(_node->path(), remove, add);
}
}
@@ -385,9 +385,9 @@ NodeModule::property_changed(const URI& key, const Atom& value)
const Shared::URIs& uris = app().uris();
switch (value.type()) {
case Atom::FLOAT:
- if (key == uris.ingenui_canvas_x) {
+ if (key == uris.ingen_canvas_x) {
move_to(value.get_float(), property_y());
- } else if (key == uris.ingenui_canvas_y) {
+ } else if (key == uris.ingen_canvas_y) {
move_to(property_x(), value.get_float());
}
break;
diff --git a/src/gui/PatchCanvas.cpp b/src/gui/PatchCanvas.cpp
index 299336cf..71facb23 100644
--- a/src/gui/PatchCanvas.cpp
+++ b/src/gui/PatchCanvas.cpp
@@ -717,11 +717,11 @@ PatchCanvas::paste()
GraphObject::Properties& props = i->second->properties();
- GraphObject::Properties::iterator x = props.find(uris.ingenui_canvas_x);
+ GraphObject::Properties::iterator x = props.find(uris.ingen_canvas_x);
if (x != i->second->properties().end())
x->second = x->second.get_float() + (20.0f * _paste_count);
- GraphObject::Properties::iterator y = props.find(uris.ingenui_canvas_y);
+ GraphObject::Properties::iterator y = props.find(uris.ingen_canvas_y);
if (y != i->second->properties().end())
y->second = y->second.get_float() + (20.0f * _paste_count);
@@ -821,9 +821,9 @@ PatchCanvas::get_initial_data(Resource::Graph ctx)
{
GraphObject::Properties result;
const URIs& uris = _app.uris();
- result.insert(make_pair(uris.ingenui_canvas_x,
+ result.insert(make_pair(uris.ingen_canvas_x,
Resource::Property((float)_last_click_x, ctx)));
- result.insert(make_pair(uris.ingenui_canvas_y,
+ result.insert(make_pair(uris.ingen_canvas_y,
Resource::Property((float)_last_click_y, ctx)));
return result;
}
diff --git a/src/gui/PatchPortModule.cpp b/src/gui/PatchPortModule.cpp
index 3a00c344..51669f6d 100644
--- a/src/gui/PatchPortModule.cpp
+++ b/src/gui/PatchPortModule.cpp
@@ -91,17 +91,17 @@ PatchPortModule::store_location()
const URIs& uris = app().uris();
- const Atom& existing_x = _model->get_property(uris.ingenui_canvas_x);
- const Atom& existing_y = _model->get_property(uris.ingenui_canvas_y);
+ const Atom& existing_x = _model->get_property(uris.ingen_canvas_x);
+ const Atom& existing_y = _model->get_property(uris.ingen_canvas_y);
if (x != existing_x && y != existing_y) {
Resource::Properties remove;
- remove.insert(make_pair(uris.ingenui_canvas_x, uris.wildcard));
- remove.insert(make_pair(uris.ingenui_canvas_y, uris.wildcard));
+ remove.insert(make_pair(uris.ingen_canvas_x, uris.wildcard));
+ remove.insert(make_pair(uris.ingen_canvas_y, uris.wildcard));
Resource::Properties add;
- add.insert(make_pair(uris.ingenui_canvas_x,
+ add.insert(make_pair(uris.ingen_canvas_x,
Resource::Property(x, Resource::INTERNAL)));
- add.insert(make_pair(uris.ingenui_canvas_y,
+ add.insert(make_pair(uris.ingen_canvas_y,
Resource::Property(y, Resource::INTERNAL)));
app().engine()->delta(_model->path(), remove, add);
}
@@ -131,9 +131,9 @@ PatchPortModule::property_changed(const URI& key, const Atom& value)
const URIs& uris = app().uris();
switch (value.type()) {
case Atom::FLOAT:
- if (key == uris.ingenui_canvas_x) {
+ if (key == uris.ingen_canvas_x) {
move_to(value.get_float(), property_y());
- } else if (key == uris.ingenui_canvas_y) {
+ } else if (key == uris.ingen_canvas_y) {
move_to(property_x(), value.get_float());
}
break;
diff --git a/src/gui/SubpatchModule.cpp b/src/gui/SubpatchModule.cpp
index 72bcd8af..4dbb56a5 100644
--- a/src/gui/SubpatchModule.cpp
+++ b/src/gui/SubpatchModule.cpp
@@ -68,17 +68,17 @@ SubpatchModule::store_location()
const URIs& uris = app().uris();
- const Atom& existing_x = _node->get_property(uris.ingenui_canvas_x);
- const Atom& existing_y = _node->get_property(uris.ingenui_canvas_y);
+ const Atom& existing_x = _node->get_property(uris.ingen_canvas_x);
+ const Atom& existing_y = _node->get_property(uris.ingen_canvas_y);
if (x != existing_x && y != existing_y) {
Resource::Properties remove;
- remove.insert(make_pair(uris.ingenui_canvas_x, uris.wildcard));
- remove.insert(make_pair(uris.ingenui_canvas_y, uris.wildcard));
+ remove.insert(make_pair(uris.ingen_canvas_x, uris.wildcard));
+ remove.insert(make_pair(uris.ingen_canvas_y, uris.wildcard));
Resource::Properties add;
- add.insert(make_pair(uris.ingenui_canvas_x,
+ add.insert(make_pair(uris.ingen_canvas_x,
Resource::Property(x, Resource::EXTERNAL)));
- add.insert(make_pair(uris.ingenui_canvas_y,
+ add.insert(make_pair(uris.ingen_canvas_y,
Resource::Property(y, Resource::EXTERNAL)));
app().engine()->delta(_node->path(), remove, add);
}
diff --git a/src/http/HTTPClientSender.cpp b/src/http/HTTPClientSender.cpp
index 564954ae..979d1e64 100644
--- a/src/http/HTTPClientSender.cpp
+++ b/src/http/HTTPClientSender.cpp
@@ -118,8 +118,7 @@ HTTPClientSender::set_property(const URI& subject, const URI& key, const Atom& v
Sord::Node node = AtomRDF::atom_to_node(*_engine.world()->rdf_world(), value);
const string msg = string(
"@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .\n"
- "@prefix ingen: <http://drobilla.net/ns/ingen#> .\n"
- "@prefix ingenui: <http://drobilla.net/ns/ingenuity#> .\n").append(
+ "@prefix ingen: <http://drobilla.net/ns/ingen#> .\n").append(
subject.str()).append("> ingen:property [\n"
"rdf:predicate ").append(key.str()).append(" ;\n"
"rdf:value ").append(node.to_string()).append("\n] .\n");
diff --git a/src/server/Engine.cpp b/src/server/Engine.cpp
index bf0ef61b..2bd96a47 100644
--- a/src/server/Engine.cpp
+++ b/src/server/Engine.cpp
@@ -180,9 +180,9 @@ Engine::activate()
in_properties.insert(make_pair(uris.lv2_index, 0));
in_properties.insert(make_pair(uris.lv2_portProperty,
uris.lv2_connectionOptional));
- in_properties.insert(make_pair(uris.ingenui_canvas_x,
+ in_properties.insert(make_pair(uris.ingen_canvas_x,
Resource::Property(32.0f, Resource::EXTERNAL)));
- in_properties.insert(make_pair(uris.ingenui_canvas_y,
+ in_properties.insert(make_pair(uris.ingen_canvas_y,
Resource::Property(32.0f, Resource::EXTERNAL)));
execute_and_delete_event(
@@ -196,9 +196,9 @@ Engine::activate()
out_properties.insert(make_pair(uris.lv2_index, 1));
in_properties.insert(make_pair(uris.lv2_portProperty,
uris.lv2_connectionOptional));
- out_properties.insert(make_pair(uris.ingenui_canvas_x,
+ out_properties.insert(make_pair(uris.ingen_canvas_x,
Resource::Property(128.0f, Resource::EXTERNAL)));
- out_properties.insert(make_pair(uris.ingenui_canvas_y,
+ out_properties.insert(make_pair(uris.ingen_canvas_y,
Resource::Property(32.0f, Resource::EXTERNAL)));
execute_and_delete_event(
diff --git a/src/shared/URIs.cpp b/src/shared/URIs.cpp
index c0753d5d..869aa26e 100644
--- a/src/shared/URIs.cpp
+++ b/src/shared/URIs.cpp
@@ -48,7 +48,6 @@ URIs::Quark::c_str() const
#define NS_CTX "http://lv2plug.in/ns/ext/contexts#"
#define NS_INGEN "http://drobilla.net/ns/ingen#"
-#define NS_INGENUI "http://drobilla.net/ns/ingenuity#"
#define NS_LV2 "http://lv2plug.in/ns/lv2core#"
#define NS_MIDI "http://drobilla.net/ns/ext/midi#"
#define NS_MIDI "http://drobilla.net/ns/ext/midi#"
@@ -86,8 +85,8 @@ URIs::URIs()
, ingen_sampleRate (NS_INGEN "sampleRate")
, ingen_selected (NS_INGEN "selected")
, ingen_value (NS_INGEN "value")
- , ingenui_canvas_x (NS_INGENUI "canvas-x")
- , ingenui_canvas_y (NS_INGENUI "canvas-y")
+ , ingen_canvas_x (NS_INGEN "canvas-x")
+ , ingen_canvas_y (NS_INGEN "canvas-y")
, lv2_AudioPort (NS_LV2 "AudioPort")
, lv2_ControlPort (NS_LV2 "ControlPort")
, lv2_InputPort (NS_LV2 "InputPort")
diff --git a/src/shared/World.cpp b/src/shared/World.cpp
index e66f04a5..1e3dc46f 100644
--- a/src/shared/World.cpp
+++ b/src/shared/World.cpp
@@ -116,7 +116,6 @@ public:
rdf_world->add_prefix("ctx", "http://lv2plug.in/ns/ext/contexts#");
rdf_world->add_prefix("doap", "http://usefulinc.com/ns/doap#");
rdf_world->add_prefix("ingen", "http://drobilla.net/ns/ingen#");
- rdf_world->add_prefix("ingenui", "http://drobilla.net/ns/ingenuity#");
rdf_world->add_prefix("lv2", "http://lv2plug.in/ns/lv2core#");
rdf_world->add_prefix("lv2ev", "http://lv2plug.in/ns/ext/event#");
rdf_world->add_prefix("lv2midi", "http://lv2plug.in/ns/ext/midi#");
generated by cgit v1.2.1 (git 2.18.0) at 2024-04-28 18:56:06 +0000