From 2b7f487f515929099744c69afe22f85c332b2f20 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Thu, 28 Jan 2010 05:55:01 +0000 Subject: Use ingen-ui for prefix instead of ingenuity. git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@2388 a436a847-0d15-0410-975c-d299462d15a1 --- src/client/DeprecatedLoader.cpp | 4 ++-- src/engine/HTTPClientSender.cpp | 6 +++--- src/gui/LoadPluginWindow.cpp | 4 ++-- src/gui/LoadSubpatchWindow.cpp | 4 ++-- src/gui/NodeModule.cpp | 12 ++++++------ src/gui/PatchCanvas.cpp | 8 ++++---- src/gui/PatchPortModule.cpp | 12 ++++++------ src/gui/ingen_gui.gladep | 4 ++-- src/ingen/main.cpp | 22 +++++++++++----------- 9 files changed, 38 insertions(+), 38 deletions(-) diff --git a/src/client/DeprecatedLoader.cpp b/src/client/DeprecatedLoader.cpp index 18785667..0b3243d1 100644 --- a/src/client/DeprecatedLoader.cpp +++ b/src/client/DeprecatedLoader.cpp @@ -152,9 +152,9 @@ DeprecatedLoader::add_variable(GraphObject::Properties& data, string old_key, st { string key = ""; if (old_key == "module-x") - key = "ingenuity:canvas-x"; + key = "ingen-ui:canvas-x"; else if (old_key == "module-y") - key = "ingenuity:canvas-y"; + key = "ingen-ui:canvas-y"; if (key != "") { // FIXME: should this overwrite existing values? diff --git a/src/engine/HTTPClientSender.cpp b/src/engine/HTTPClientSender.cpp index 7d7070f9..8804c65c 100644 --- a/src/engine/HTTPClientSender.cpp +++ b/src/engine/HTTPClientSender.cpp @@ -104,9 +104,9 @@ HTTPClientSender::set_property(const URI& subject, const URI& key, const Atom& v { Redland::Node node = AtomRDF::atom_to_node(*_engine.world()->rdf_world, value); const string msg = string( - "@prefix rdf: .\n" - "@prefix ingen: .\n" - "@prefix ingenuity: .\n").append( + "@prefix rdf: .\n" + "@prefix ingen: .\n" + "@prefix ingen-ui: .\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/gui/LoadPluginWindow.cpp b/src/gui/LoadPluginWindow.cpp index daa8e88a..07605f3c 100644 --- a/src/gui/LoadPluginWindow.cpp +++ b/src/gui/LoadPluginWindow.cpp @@ -350,9 +350,9 @@ LoadPluginWindow::load_plugin(const Gtk::TreeModel::iterator& iter) _node_name_entry->set_text(generate_module_name(plugin, _plugin_name_offset + 1)); // Cascade next node - Atom& x = _initial_data.find("ingenuity:canvas-x")->second; + Atom& x = _initial_data.find("ingen-ui:canvas-x")->second; x = Atom(x.get_float() + 20.0f); - Atom& y = _initial_data.find("ingenuity:canvas-y")->second; + Atom& y = _initial_data.find("ingen-ui:canvas-y")->second; y = Atom(y.get_float() + 20.0f); } } diff --git a/src/gui/LoadSubpatchWindow.cpp b/src/gui/LoadSubpatchWindow.cpp index 82edc3a2..b2066ff6 100644 --- a/src/gui/LoadSubpatchWindow.cpp +++ b/src/gui/LoadSubpatchWindow.cpp @@ -165,9 +165,9 @@ LoadSubpatchWindow::ok_clicked() std::list uris = get_uris(); for (std::list::iterator i = uris.begin(); i != uris.end(); ++i) { // Cascade - Atom& x = _initial_data.find("ingenuity:canvas-x")->second; + Atom& x = _initial_data.find("ingen-ui:canvas-x")->second; x = Atom(x.get_float() + 20.0f); - Atom& y = _initial_data.find("ingenuity:canvas-y")->second; + Atom& y = _initial_data.find("ingen-ui:canvas-y")->second; y = Atom(y.get_float() + 20.0f); App::instance().loader()->load_patch(false, *i, Path("/"), diff --git a/src/gui/NodeModule.cpp b/src/gui/NodeModule.cpp index de479c54..69b8eb55 100644 --- a/src/gui/NodeModule.cpp +++ b/src/gui/NodeModule.cpp @@ -379,14 +379,14 @@ NodeModule::store_location() const float x = static_cast(property_x()); const float y = static_cast(property_y()); - const Atom& existing_x = _node->get_property("ingenuity:canvas-x"); - const Atom& existing_y = _node->get_property("ingenuity:canvas-y"); + const Atom& existing_x = _node->get_property("ingen-ui:canvas-x"); + const Atom& existing_y = _node->get_property("ingen-ui:canvas-y"); if (existing_x.type() != Atom::FLOAT || existing_y.type() != Atom::FLOAT || existing_x.get_float() != x || existing_y.get_float() != y) { Shared::Resource::Properties props; - props.insert(make_pair("ingenuity:canvas-x", Atom(x))); - props.insert(make_pair("ingenuity:canvas-y", Atom(y))); + props.insert(make_pair("ingen-ui:canvas-x", Atom(x))); + props.insert(make_pair("ingen-ui:canvas-y", Atom(y))); App::instance().engine()->put(_node->path(), props); } } @@ -397,9 +397,9 @@ NodeModule::set_property(const URI& key, const Atom& value) { switch (value.type()) { case Atom::FLOAT: - if (key.str() == "ingenuity:canvas-x") { + if (key.str() == "ingen-ui:canvas-x") { move_to(value.get_float(), property_y()); - } else if (key.str() == "ingenuity:canvas-y") { + } else if (key.str() == "ingen-ui:canvas-y") { move_to(property_x(), value.get_float()); } break; diff --git a/src/gui/PatchCanvas.cpp b/src/gui/PatchCanvas.cpp index 2d389e4e..c56c965a 100644 --- a/src/gui/PatchCanvas.cpp +++ b/src/gui/PatchCanvas.cpp @@ -685,10 +685,10 @@ PatchCanvas::paste() for (Store::iterator i = clipboard.begin(); i != clipboard.end(); ++i) { if (_patch->path().is_root() && i->first.is_root()) continue; - GraphObject::Properties::iterator x = i->second->properties().find("ingenuity:canvas-x"); + GraphObject::Properties::iterator x = i->second->properties().find("ingen-ui:canvas-x"); if (x != i->second->properties().end()) x->second = x->second.get_float() + (20.0f * _paste_count); - GraphObject::Properties::iterator y = i->second->properties().find("ingenuity:canvas-y"); + GraphObject::Properties::iterator y = i->second->properties().find("ingen-ui:canvas-y"); if (y != i->second->properties().end()) y->second = y->second.get_float() + (20.0f * _paste_count); if (i->first.parent().is_root()) { @@ -794,8 +794,8 @@ GraphObject::Properties PatchCanvas::get_initial_data() { GraphObject::Properties result; - result.insert(make_pair("ingenuity:canvas-x", Atom((float)_last_click_x))); - result.insert(make_pair("ingenuity:canvas-y", Atom((float)_last_click_y))); + result.insert(make_pair("ingen-ui:canvas-x", Atom((float)_last_click_x))); + result.insert(make_pair("ingen-ui:canvas-y", Atom((float)_last_click_y))); return result; } diff --git a/src/gui/PatchPortModule.cpp b/src/gui/PatchPortModule.cpp index 1147e4c9..236a6250 100644 --- a/src/gui/PatchPortModule.cpp +++ b/src/gui/PatchPortModule.cpp @@ -97,14 +97,14 @@ PatchPortModule::store_location() const float x = static_cast(property_x()); const float y = static_cast(property_y()); - const Atom& existing_x = _model->get_property("ingenuity:canvas-x"); - const Atom& existing_y = _model->get_property("ingenuity:canvas-y"); + const Atom& existing_x = _model->get_property("ingen-ui:canvas-x"); + const Atom& existing_y = _model->get_property("ingen-ui:canvas-y"); if (existing_x.type() != Atom::FLOAT || existing_y.type() != Atom::FLOAT || existing_x.get_float() != x || existing_y.get_float() != y) { Shared::Resource::Properties props; - props.insert(make_pair("ingenuity:canvas-x", Atom(x))); - props.insert(make_pair("ingenuity:canvas-y", Atom(y))); + props.insert(make_pair("ingen-ui:canvas-x", Atom(x))); + props.insert(make_pair("ingen-ui:canvas-y", Atom(y))); App::instance().engine()->put(_model->meta_uri(), props); } } @@ -138,9 +138,9 @@ PatchPortModule::set_property(const URI& key, const Atom& value) { switch (value.type()) { case Atom::FLOAT: - if (key.str() == "ingenuity:canvas-x") { + if (key.str() == "ingen-ui:canvas-x") { move_to(value.get_float(), property_y()); - } else if (key.str() == "ingenuity:canvas-y") { + } else if (key.str() == "ingen-ui:canvas-y") { move_to(property_x(), value.get_float()); } break; diff --git a/src/gui/ingen_gui.gladep b/src/gui/ingen_gui.gladep index 7cd9c6ce..184ff460 100644 --- a/src/gui/ingen_gui.gladep +++ b/src/gui/ingen_gui.gladep @@ -2,8 +2,8 @@ - Ingenuity - ingenuity + Ingen + ingen C++ FALSE diff --git a/src/ingen/main.cpp b/src/ingen/main.cpp index 0532a5e0..7a6586c8 100644 --- a/src/ingen/main.cpp +++ b/src/ingen/main.cpp @@ -123,17 +123,17 @@ main(int argc, char** argv) world->conf = &conf; // Set up RDF namespaces - world->rdf_world->add_prefix("dc", "http://purl.org/dc/elements/1.1/"); - world->rdf_world->add_prefix("doap", "http://usefulinc.com/ns/doap#"); - world->rdf_world->add_prefix("ingen", "http://drobilla.net/ns/ingen#"); - world->rdf_world->add_prefix("ingenuity", "http://drobilla.net/ns/ingenuity#"); - world->rdf_world->add_prefix("lv2", "http://lv2plug.in/ns/lv2core#"); - world->rdf_world->add_prefix("lv2ev", "http://lv2plug.in/ns/ext/event#"); - world->rdf_world->add_prefix("lv2midi", "http://lv2plug.in/ns/ext/midi#"); - world->rdf_world->add_prefix("owl", "http://www.w3.org/2002/07/owl#"); - world->rdf_world->add_prefix("rdfs", "http://www.w3.org/2000/01/rdf-schema#"); - world->rdf_world->add_prefix("sp", "http://lv2plug.in/ns/dev/string-port#"); - world->rdf_world->add_prefix("xsd", "http://www.w3.org/2001/XMLSchema#"); + world->rdf_world->add_prefix("dc", "http://purl.org/dc/elements/1.1/"); + world->rdf_world->add_prefix("doap", "http://usefulinc.com/ns/doap#"); + world->rdf_world->add_prefix("ingen", "http://drobilla.net/ns/ingen#"); + world->rdf_world->add_prefix("ingen-ui", "http://drobilla.net/ns/ingenuity#"); + world->rdf_world->add_prefix("lv2", "http://lv2plug.in/ns/lv2core#"); + world->rdf_world->add_prefix("lv2ev", "http://lv2plug.in/ns/ext/event#"); + world->rdf_world->add_prefix("lv2midi", "http://lv2plug.in/ns/ext/midi#"); + world->rdf_world->add_prefix("owl", "http://www.w3.org/2002/07/owl#"); + world->rdf_world->add_prefix("rdfs", "http://www.w3.org/2000/01/rdf-schema#"); + world->rdf_world->add_prefix("sp", "http://lv2plug.in/ns/dev/string-port#"); + world->rdf_world->add_prefix("xsd", "http://www.w3.org/2001/XMLSchema#"); // Run engine if (conf.option("engine").get_bool()) { -- cgit v1.2.1