aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/engine/Action.cpp9
-rw-r--r--src/engine/Action.hpp2
-rw-r--r--src/engine/Edge.cpp17
-rw-r--r--src/engine/Edge.hpp2
-rw-r--r--src/engine/Engine.cpp2
-rw-r--r--src/engine/Loader.cpp72
-rw-r--r--src/engine/Machine.cpp16
-rw-r--r--src/engine/MidiAction.cpp8
-rw-r--r--src/engine/MidiAction.hpp2
-rw-r--r--src/engine/Node.cpp23
-rw-r--r--src/engine/Node.hpp2
-rw-r--r--src/engine/Stateful.cpp6
-rw-r--r--src/engine/Stateful.hpp11
-rw-r--r--src/engine/machina/Engine.hpp6
-rw-r--r--src/engine/machina/Loader.hpp12
-rw-r--r--src/engine/machina/Machine.hpp5
-rw-r--r--src/engine/wscript2
-rw-r--r--src/gui/MachinaGUI.cpp12
-rw-r--r--src/gui/main.cpp4
-rw-r--r--src/gui/wscript4
-rw-r--r--src/machina.cpp2
-rw-r--r--src/midi2machina.cpp6
-rw-r--r--wscript2
23 files changed, 109 insertions, 118 deletions
diff --git a/src/engine/Action.cpp b/src/engine/Action.cpp
index 67a41c2..e77ae0e 100644
--- a/src/engine/Action.cpp
+++ b/src/engine/Action.cpp
@@ -15,21 +15,20 @@
* along with Machina. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "redlandmm/World.hpp"
-#include "redlandmm/Model.hpp"
+#include "sord/sordmm.hpp"
#include "Action.hpp"
namespace Machina {
void
-Action::write_state(Redland::Model& model)
+Action::write_state(Sord::Model& model)
{
using namespace Raul;
model.add_statement(rdf_id(model.world()),
- Redland::Node(model.world(), Redland::Node::RESOURCE, "rdf:type"),
- Redland::Node(model.world(), Redland::Node::RESOURCE, "machina:Action"));
+ Sord::Curie(model.world(), "rdf:type"),
+ Sord::Curie(model.world(), "machina:Action"));
}
diff --git a/src/engine/Action.hpp b/src/engine/Action.hpp
index ceeea6a..c707fd5 100644
--- a/src/engine/Action.hpp
+++ b/src/engine/Action.hpp
@@ -37,7 +37,7 @@ namespace Machina {
struct Action : public Raul::Deletable, public Stateful {
virtual void execute(SharedPtr<Raul::MIDISink> sink, Raul::TimeStamp time) = 0;
- virtual void write_state(Redland::Model& model);
+ virtual void write_state(Sord::Model& model);
};
diff --git a/src/engine/Edge.cpp b/src/engine/Edge.cpp
index 6af315c..00faaa9 100644
--- a/src/engine/Edge.cpp
+++ b/src/engine/Edge.cpp
@@ -18,8 +18,7 @@
#include "raul/Atom.hpp"
#include "raul/AtomRDF.hpp"
-#include "redlandmm/World.hpp"
-#include "redlandmm/Model.hpp"
+#include "sord/sordmm.hpp"
#include "Edge.hpp"
#include "Node.hpp"
@@ -33,16 +32,16 @@ Edge::set(URIInt key, const Raul::Atom& value)
}
void
-Edge::write_state(Redland::Model& model)
+Edge::write_state(Sord::Model& model)
{
using namespace Raul;
- const Redland::Node& rdf_id = this->rdf_id(model.world());
+ const Sord::Node& rdf_id = this->rdf_id(model.world());
model.add_statement(
rdf_id,
- Redland::Curie(model.world(), "rdf:type"),
- Redland::Node(model.world(), Redland::Node::RESOURCE, "machina:Edge"));
+ Sord::Curie(model.world(), "rdf:type"),
+ Sord::Curie(model.world(), "machina:Edge"));
SharedPtr<Node> tail = _tail.lock();
SharedPtr<Node> head = _head;
@@ -54,16 +53,16 @@ Edge::write_state(Redland::Model& model)
&& head->rdf_id(model.world()).is_valid());
model.add_statement(rdf_id,
- Redland::Curie(model.world(), "machina:tail"),
+ Sord::Curie(model.world(), "machina:tail"),
tail->rdf_id(model.world()));
model.add_statement(rdf_id,
- Redland::Curie(model.world(), "machina:head"),
+ Sord::Curie(model.world(), "machina:head"),
head->rdf_id(model.world()));
model.add_statement(
rdf_id,
- Redland::Curie(model.world(), "machina:probability"),
+ Sord::Curie(model.world(), "machina:probability"),
AtomRDF::atom_to_node(model, Atom(_probability.get())));
}
diff --git a/src/engine/Edge.hpp b/src/engine/Edge.hpp
index 8e34292..999fa2f 100644
--- a/src/engine/Edge.hpp
+++ b/src/engine/Edge.hpp
@@ -43,7 +43,7 @@ public:
{}
void set(URIInt key, const Raul::Atom& value);
- void write_state(Redland::Model& model);
+ void write_state(Sord::Model& model);
WeakPtr<Node> tail() { return _tail; }
SharedPtr<Node> head() { return _head; }
diff --git a/src/engine/Engine.cpp b/src/engine/Engine.cpp
index 03762b6..02533d9 100644
--- a/src/engine/Engine.cpp
+++ b/src/engine/Engine.cpp
@@ -28,7 +28,7 @@
namespace Machina {
-Engine::Engine(SharedPtr<Driver> driver, Redland::World& rdf_world)
+Engine::Engine(SharedPtr<Driver> driver, Sord::World& rdf_world)
: _driver(driver)
, _rdf_world(rdf_world)
, _loader(_rdf_world)
diff --git a/src/engine/Loader.cpp b/src/engine/Loader.cpp
index 3b889f5..2fe161c 100644
--- a/src/engine/Loader.cpp
+++ b/src/engine/Loader.cpp
@@ -38,7 +38,7 @@ using namespace std;
namespace Machina {
-Loader::Loader(Redland::World& rdf_world)
+Loader::Loader(Sord::World& rdf_world)
: _rdf_world(rdf_world)
{
_rdf_world.add_prefix("xsd", "http://www.w3.org/2001/XMLSchema#");
@@ -62,17 +62,7 @@ Loader::load(const Glib::ustring& uri)
// If "URI" doesn't contain a colon, try to resolve as a filename
if (uri.find(":") == ustring::npos) {
- raptor_uri* base_uri = raptor_new_uri((const unsigned char*)"file:.");
- raptor_uri* document_raptor_uri = raptor_new_uri_relative_to_base(
- base_uri, (const unsigned char*)uri.c_str());
- if (document_raptor_uri) {
- document_uri = (char*)raptor_uri_as_string(document_raptor_uri);
- raptor_free_uri(document_raptor_uri);
- raptor_free_uri(base_uri);
- } else {
- raptor_free_uri(base_uri);
- return machine; // NULL
- }
+ document_uri = "file://" + document_uri;
}
const string machine_uri = string("<>");
@@ -81,38 +71,38 @@ Loader::load(const Glib::ustring& uri)
machine = SharedPtr<Machine>(new Machine(TimeUnit::beats(MACHINA_PPQN)));
- typedef std::map<Redland::Node, SharedPtr<Node> > Created;
+ typedef std::map<Sord::Node, SharedPtr<Node> > Created;
Created created;
- Redland::Model model(_rdf_world, document_uri);
+ Sord::Model model(_rdf_world, document_uri);
model.load_file(document_uri);
- Redland::Node nil;
+ Sord::Node nil;
- Redland::Resource rdf_type(_rdf_world, NS_RDF "type");
- Redland::Resource machina_SelectorNode(_rdf_world, NS_MACHINA "initialNode");
- Redland::Resource machina_node(_rdf_world, NS_MACHINA "node");
- Redland::Resource machina_initialNode(_rdf_world, NS_MACHINA "initialNode");
- Redland::Resource machina_duration(_rdf_world, NS_MACHINA "duration");
- Redland::Resource machina_edge(_rdf_world, NS_MACHINA "edge");
- Redland::Resource machina_tail(_rdf_world, NS_MACHINA "tail");
- Redland::Resource machina_head(_rdf_world, NS_MACHINA "head");
- Redland::Resource machina_probability(_rdf_world, NS_MACHINA "probability");
+ Sord::Resource rdf_type(_rdf_world, NS_RDF "type");
+ Sord::Resource machina_SelectorNode(_rdf_world, NS_MACHINA "initialNode");
+ Sord::Resource machina_node(_rdf_world, NS_MACHINA "node");
+ Sord::Resource machina_initialNode(_rdf_world, NS_MACHINA "initialNode");
+ Sord::Resource machina_duration(_rdf_world, NS_MACHINA "duration");
+ Sord::Resource machina_edge(_rdf_world, NS_MACHINA "edge");
+ Sord::Resource machina_tail(_rdf_world, NS_MACHINA "tail");
+ Sord::Resource machina_head(_rdf_world, NS_MACHINA "head");
+ Sord::Resource machina_probability(_rdf_world, NS_MACHINA "probability");
- Redland::Node machine_node = Redland::Resource(_rdf_world, ".");
+ Sord::Node machine_node = Sord::Resource(_rdf_world, ".");
/* Get initial nodes */
- for (Redland::Iter i = model.find(machine_node, machina_initialNode, nil);
+ for (Sord::Iter i = model.find(machine_node, machina_initialNode, nil);
!i.end(); ++i) {
- const Redland::Node& node_id = i.get_object();
- Redland::Iter d = model.find(node_id, machina_duration, nil);
+ const Sord::Node& node_id = i.get_object();
+ Sord::Iter d = model.find(node_id, machina_duration, nil);
SharedPtr<Node> node(
new Node(
TimeStamp(TimeUnit(TimeUnit::BEATS, MACHINA_PPQN),
d.get_object().to_float()),
true));
- Redland::Iter s = model.find(node_id, rdf_type, machina_SelectorNode);
+ Sord::Iter s = model.find(node_id, rdf_type, machina_SelectorNode);
if (!s.end()) {
node->set_selector(true);
}
@@ -122,10 +112,10 @@ Loader::load(const Glib::ustring& uri)
}
/* Get remaining (non-initial) nodes */
- for (Redland::Iter i = model.find(machine_node, machina_node, nil);
+ for (Sord::Iter i = model.find(machine_node, machina_node, nil);
!i.end(); ++i) {
- const Redland::Node& node_id = i.get_object();
- Redland::Iter d = model.find(node_id, machina_duration, nil);
+ const Sord::Node& node_id = i.get_object();
+ Sord::Iter d = model.find(node_id, machina_duration, nil);
if (created.find(node_id) == created.end()) {
SharedPtr<Node> node(new Node(
TimeStamp(TimeUnit(TimeUnit::BEATS, MACHINA_PPQN),
@@ -165,16 +155,16 @@ Loader::load(const Glib::ustring& uri)
#endif
/* Get edges */
- for (Redland::Iter i = model.find(machine_node, machina_edge, nil);
+ for (Sord::Iter i = model.find(machine_node, machina_edge, nil);
!i.end(); ++i) {
- Redland::Node edge = i.get_object();
- Redland::Iter t = model.find(edge, machina_tail, nil);
- Redland::Iter h = model.find(edge, machina_head, nil);
- Redland::Iter p = model.find(edge, machina_probability, nil);
-
- Redland::Node tail = t.get_object();
- Redland::Node head = h.get_object();
- Redland::Node probability = p.get_object();
+ Sord::Node edge = i.get_object();
+ Sord::Iter t = model.find(edge, machina_tail, nil);
+ Sord::Iter h = model.find(edge, machina_head, nil);
+ Sord::Iter p = model.find(edge, machina_probability, nil);
+
+ Sord::Node tail = t.get_object();
+ Sord::Node head = h.get_object();
+ Sord::Node probability = p.get_object();
float prob = probability.to_float();
diff --git a/src/engine/Machine.cpp b/src/engine/Machine.cpp
index 32ac10d..bddc4f9 100644
--- a/src/engine/Machine.cpp
+++ b/src/engine/Machine.cpp
@@ -19,8 +19,8 @@
#include "raul/Atom.hpp"
#include "raul/SharedPtr.hpp"
-#include "redlandmm/Model.hpp"
-#include "redlandmm/World.hpp"
+
+#include "sord/sordmm.hpp"
#include "machina/Machine.hpp"
#include "machina/Updates.hpp"
@@ -389,15 +389,15 @@ Machine::learn(SharedPtr<Raul::Maid> maid, SharedPtr<Node> node)
}
void
-Machine::write_state(Redland::Model& model)
+Machine::write_state(Sord::Model& model)
{
using namespace Raul;
model.world().add_prefix("machina", "http://drobilla.net/ns/machina#");
model.add_statement(model.base_uri(),
- Redland::Node(model.world(), Redland::Node::RESOURCE, "rdf:type"),
- Redland::Node(model.world(), Redland::Node::RESOURCE, "machina:Machine"));
+ Sord::Curie(model.world(), "rdf:type"),
+ Sord::Curie(model.world(), "machina:Machine"));
size_t count = 0;
@@ -407,11 +407,11 @@ Machine::write_state(Redland::Model& model)
if ((*n)->is_initial()) {
model.add_statement(model.base_uri(),
- Redland::Node(model.world(), Redland::Node::RESOURCE, "machina:initialNode"),
+ Sord::Curie(model.world(), "machina:initialNode"),
(*n)->rdf_id(model.world()));
} else {
model.add_statement(model.base_uri(),
- Redland::Node(model.world(), Redland::Node::RESOURCE, "machina:node"),
+ Sord::Curie(model.world(), "machina:node"),
(*n)->rdf_id(model.world()));
}
}
@@ -426,7 +426,7 @@ Machine::write_state(Redland::Model& model)
(*e)->write_state(model);
model.add_statement(model.base_uri(),
- Redland::Node(model.world(), Redland::Node::RESOURCE, "machina:edge"),
+ Sord::Curie(model.world(), "machina:edge"),
(*e)->rdf_id(model.world()));
}
diff --git a/src/engine/MidiAction.cpp b/src/engine/MidiAction.cpp
index 819e63b..a6f161d 100644
--- a/src/engine/MidiAction.cpp
+++ b/src/engine/MidiAction.cpp
@@ -96,19 +96,19 @@ MidiAction::execute(SharedPtr<Raul::MIDISink> sink, Raul::TimeStamp time)
void
-MidiAction::write_state(Redland::Model& model)
+MidiAction::write_state(Sord::Model& model)
{
using namespace Raul;
Action::write_state(model);
model.add_statement(rdf_id(model.world()),
- Redland::Node(model.world(), Redland::Node::RESOURCE, "rdf:type"),
- Redland::Node(model.world(), Redland::Node::RESOURCE, "machina:MidiAction"));
+ Sord::Curie(model.world(), "rdf:type"),
+ Sord::Curie(model.world(), "machina:MidiAction"));
// FIXME: Assumes note on/note off
model.add_statement(rdf_id(model.world()),
- Redland::Node(model.world(), Redland::Node::RESOURCE, "machina:midiNote"),
+ Sord::Curie(model.world(), "machina:midiNote"),
AtomRDF::atom_to_node(model, Atom((int)(_event.get()[1]))));
}
diff --git a/src/engine/MidiAction.hpp b/src/engine/MidiAction.hpp
index f8b3fdc..5c0d825 100644
--- a/src/engine/MidiAction.hpp
+++ b/src/engine/MidiAction.hpp
@@ -44,7 +44,7 @@ public:
void execute(SharedPtr<Raul::MIDISink> driver, Raul::TimeStamp time);
- virtual void write_state(Redland::Model& model);
+ virtual void write_state(Sord::Model& model);
private:
diff --git a/src/engine/Node.cpp b/src/engine/Node.cpp
index 52b3604..a1cd3bc 100644
--- a/src/engine/Node.cpp
+++ b/src/engine/Node.cpp
@@ -17,10 +17,11 @@
#include <cassert>
#include <iostream>
+
#include "raul/Atom.hpp"
#include "raul/AtomRDF.hpp"
-#include "redlandmm/World.hpp"
-#include "redlandmm/Model.hpp"
+
+#include "sord/sordmm.hpp"
#include "machina/URIs.hpp"
@@ -218,33 +219,33 @@ Node::set(URIInt key, const Raul::Atom& value)
void
-Node::write_state(Redland::Model& model)
+Node::write_state(Sord::Model& model)
{
using namespace Raul;
- const Redland::Node& rdf_id = this->rdf_id(model.world());
+ const Sord::Node& rdf_id = this->rdf_id(model.world());
if (_is_selector)
model.add_statement(
rdf_id,
- Redland::Curie(model.world(), "rdf:type"),
- Redland::Node(model.world(), Redland::Node::RESOURCE, "machina:SelectorNode"));
+ Sord::Curie(model.world(), "rdf:type"),
+ Sord::Curie(model.world(), "machina:SelectorNode"));
else
model.add_statement(
rdf_id,
- Redland::Curie(model.world(), "rdf:type"),
- Redland::Node(model.world(), Redland::Node::RESOURCE, "machina:Node"));
+ Sord::Curie(model.world(), "rdf:type"),
+ Sord::Curie(model.world(), "machina:Node"));
model.add_statement(
rdf_id,
- Redland::Curie(model.world(), "machina:duration"),
+ Sord::Curie(model.world(), "machina:duration"),
AtomRDF::atom_to_node(model, Atom((float)_duration.to_double())));
if (_enter_action) {
_enter_action->write_state(model);
model.add_statement(rdf_id,
- Redland::Curie(model.world(), "machina:enterAction"),
+ Sord::Curie(model.world(), "machina:enterAction"),
_enter_action->rdf_id(model.world()));
}
@@ -252,7 +253,7 @@ Node::write_state(Redland::Model& model)
_exit_action->write_state(model);
model.add_statement(rdf_id,
- Redland::Curie(model.world(), "machina:exitAction"),
+ Sord::Curie(model.world(), "machina:exitAction"),
_exit_action->rdf_id(model.world()));
}
}
diff --git a/src/engine/Node.hpp b/src/engine/Node.hpp
index 13f6bb3..cc9d438 100644
--- a/src/engine/Node.hpp
+++ b/src/engine/Node.hpp
@@ -64,7 +64,7 @@ public:
bool connected_to(SharedPtr<Node> node);
void set(URIInt key, const Raul::Atom& value);
- void write_state(Redland::Model& model);
+ void write_state(Sord::Model& model);
bool is_initial() const { return _is_initial; }
void set_initial(bool i) { _is_initial = i; }
diff --git a/src/engine/Stateful.cpp b/src/engine/Stateful.cpp
index 75a1158..61ec7cd 100644
--- a/src/engine/Stateful.cpp
+++ b/src/engine/Stateful.cpp
@@ -27,13 +27,13 @@ Stateful::Stateful()
}
-const Redland::Node&
-Stateful::rdf_id(Redland::World& world) const
+const Sord::Node&
+Stateful::rdf_id(Sord::World& world) const
{
if (!_rdf_id.is_valid()) {
std::ostringstream ss;
ss << "b" << _id;
- _rdf_id = Redland::Node(world, Redland::Node::BLANK, ss.str());
+ _rdf_id = Sord::Node(world, Sord::Node::BLANK, ss.str());
}
return _rdf_id;
diff --git a/src/engine/Stateful.hpp b/src/engine/Stateful.hpp
index 08a1425..76fe284 100644
--- a/src/engine/Stateful.hpp
+++ b/src/engine/Stateful.hpp
@@ -20,8 +20,7 @@
#include <stdint.h>
-#include "redlandmm/World.hpp"
-#include "redlandmm/Model.hpp"
+#include "sord/sordmm.hpp"
#include "machina/types.hpp"
@@ -38,10 +37,10 @@ public:
virtual ~Stateful() {}
virtual void set(URIInt key, const Raul::Atom& value) {}
- virtual void write_state(Redland::Model& model) = 0;
+ virtual void write_state(Sord::Model& model) = 0;
uint64_t id() const { return _id; }
- const Redland::Node& rdf_id(Redland::World& world) const;
+ const Sord::Node& rdf_id(Sord::World& world) const;
static uint64_t next_id() { return _next_id++; }
@@ -52,14 +51,14 @@ private:
static uint64_t _next_id;
uint64_t _id;
- mutable Redland::Node _rdf_id;
+ mutable Sord::Node _rdf_id;
};
class StatefulKey : public Stateful {
public:
StatefulKey(uint64_t id) : Stateful(id) {}
- void write_state(Redland::Model& model) {}
+ void write_state(Sord::Model& model) {}
};
} // namespace Machina
diff --git a/src/engine/machina/Engine.hpp b/src/engine/machina/Engine.hpp
index 022a2ca..48ef64a 100644
--- a/src/engine/machina/Engine.hpp
+++ b/src/engine/machina/Engine.hpp
@@ -34,9 +34,9 @@ class Machine;
class Engine {
public:
- Engine(SharedPtr<Driver> driver, Redland::World& rdf_world);
+ Engine(SharedPtr<Driver> driver, Sord::World& rdf_world);
- Redland::World& rdf_world() { return _rdf_world; }
+ Sord::World& rdf_world() { return _rdf_world; }
static SharedPtr<Driver> new_driver(const std::string& name,
SharedPtr<Machine> machine);
@@ -59,7 +59,7 @@ public:
private:
SharedPtr<Driver> _driver;
- Redland::World& _rdf_world;
+ Sord::World& _rdf_world;
Loader _loader;
};
diff --git a/src/engine/machina/Loader.hpp b/src/engine/machina/Loader.hpp
index 4fdf32b..b3d9282 100644
--- a/src/engine/machina/Loader.hpp
+++ b/src/engine/machina/Loader.hpp
@@ -19,11 +19,13 @@
#define MACHINA_LOADER_HPP
#include <glibmm/ustring.h>
-#include "raul/SharedPtr.hpp"
+
#include "raul/Path.hpp"
-#include "redlandmm/World.hpp"
+#include "raul/SharedPtr.hpp"
+
+#include "sord/sordmm.hpp"
-using Redland::Namespaces;
+using Sord::Namespaces;
namespace Machina {
@@ -32,12 +34,12 @@ class Machine;
class Loader {
public:
- Loader(Redland::World& rdf_world);
+ Loader(Sord::World& rdf_world);
SharedPtr<Machine> load(const Glib::ustring& filename);
private:
- Redland::World& _rdf_world;
+ Sord::World& _rdf_world;
};
diff --git a/src/engine/machina/Machine.hpp b/src/engine/machina/Machine.hpp
index f3469c7..7b763d1 100644
--- a/src/engine/machina/Machine.hpp
+++ b/src/engine/machina/Machine.hpp
@@ -27,7 +27,8 @@
#include "raul/SharedPtr.hpp"
#include "raul/TimeSlice.hpp"
#include "raul/WeakPtr.hpp"
-#include "redlandmm/Model.hpp"
+
+#include "sord/sordmm.hpp"
#include "types.hpp"
#include "Node.hpp"
@@ -61,7 +62,7 @@ public:
void remove_node(SharedPtr<Node> node);
void learn(SharedPtr<Raul::Maid> maid, SharedPtr<Node> node);
- void write_state(Redland::Model& model);
+ void write_state(Sord::Model& model);
// Audio context
void reset(Raul::TimeStamp time);
diff --git a/src/engine/wscript b/src/engine/wscript
index 1566a72..a21b964 100644
--- a/src/engine/wscript
+++ b/src/engine/wscript
@@ -33,7 +33,7 @@ def build(bld):
obj.includes = ['.', '..', '../..']
obj.name = 'libmachina_engine'
obj.target = 'machina_engine'
- core_libs = 'GLIBMM GTHREAD RAUL REDLANDMM JACK'
+ core_libs = 'GLIBMM GTHREAD RAUL SORD JACK'
if bld.env['HAVE_EUGENE']:
core_libs += ' EUGENE '
autowaf.use_lib(bld, obj, core_libs)
diff --git a/src/gui/MachinaGUI.cpp b/src/gui/MachinaGUI.cpp
index 437d5e1..fe7462e 100644
--- a/src/gui/MachinaGUI.cpp
+++ b/src/gui/MachinaGUI.cpp
@@ -24,7 +24,7 @@
#include <pthread.h>
#include <libgnomecanvasmm.h>
#include <libglademm/xml.h>
-#include "redlandmm/Model.hpp"
+#include "sord/sordmm.hpp"
#include "machina/Controller.hpp"
#include "machina/Engine.hpp"
#include "machina/Machine.hpp"
@@ -448,12 +448,12 @@ MachinaGUI::menu_file_save()
if (_save_uri == "" || _save_uri.substr(0, 5) != "file:") {
menu_file_save_as();
} else {
- if (!raptor_uri_uri_string_is_file_uri((const unsigned char*)_save_uri.c_str()))
+ if (_save_uri.substr(0, 5) != "file:")
menu_file_save_as();
- Redland::Model model(_engine->rdf_world(), _save_uri);
+ Sord::Model model(_engine->rdf_world(), _save_uri);
_engine->machine()->write_state(model);
- model.serialise_to_file(_save_uri, "turtle");
+ model.write_to_file(_save_uri, "turtle");
}
}
@@ -503,9 +503,9 @@ MachinaGUI::menu_file_save_as()
if (confirm) {
_save_uri = uri;
- Redland::Model model(_engine->rdf_world(), _save_uri);
+ Sord::Model model(_engine->rdf_world(), _save_uri);
_engine->machine()->write_state(model);
- model.serialise_to_file(_save_uri, "turtle");
+ model.write_to_file(_save_uri, "turtle");
}
}
}
diff --git a/src/gui/main.cpp b/src/gui/main.cpp
index a2fd12a..4f23e18 100644
--- a/src/gui/main.cpp
+++ b/src/gui/main.cpp
@@ -20,7 +20,7 @@
#include <iostream>
#include <string>
#include <libgnomecanvasmm.h>
-#include "redlandmm/World.hpp"
+#include "sord/sordmm.hpp"
#include "machina/Engine.hpp"
#include "machina/Loader.hpp"
#include "machina/Machine.hpp"
@@ -37,7 +37,7 @@ main(int argc, char** argv)
if ( ! Glib::thread_supported())
Glib::thread_init();
- Redland::World rdf_world;
+ Sord::World rdf_world;
Machina::URIs::init();
diff --git a/src/gui/wscript b/src/gui/wscript
index 2e0aa23..8917642 100644
--- a/src/gui/wscript
+++ b/src/gui/wscript
@@ -23,7 +23,7 @@ def build(bld):
GNOMECANVASMM
GTKMM
RAUL
- REDLANDMM
+ SORD
SIGCPP
EUGENE
''')
@@ -39,4 +39,4 @@ def build(bld):
obj.includes = ['.', '../..', '../engine']
obj.defines = 'VERSION="' + bld.env['MACHINA_VERSION'] + '"'
obj.use = 'libmachina_engine libmachina_gui'
- autowaf.use_lib(bld, obj, 'GTHREAD GLIBMM REDLANDMM RAUL MACHINA EUGENE FLOWCANVAS')
+ autowaf.use_lib(bld, obj, 'GTHREAD GLIBMM SORD RAUL MACHINA EUGENE FLOWCANVAS')
diff --git a/src/machina.cpp b/src/machina.cpp
index 4e14992..f4eea66 100644
--- a/src/machina.cpp
+++ b/src/machina.cpp
@@ -62,7 +62,7 @@ main(int argc, char** argv)
SharedPtr<JackDriver> driver(new JackDriver());
- Redland::World rdf_world;
+ Sord::World rdf_world;
Engine engine(driver, rdf_world);
/* FIXME: Would be nice if this could take URIs on the cmd line
diff --git a/src/midi2machina.cpp b/src/midi2machina.cpp
index 1125f13..3e35b99 100644
--- a/src/midi2machina.cpp
+++ b/src/midi2machina.cpp
@@ -17,7 +17,7 @@
#include <iostream>
#include <signal.h>
-#include "redlandmm/Model.hpp"
+#include "sord/sordmm.hpp"
#include "machina/Engine.hpp"
#include "machina/Machine.hpp"
#include "machina/Action.hpp"
@@ -75,8 +75,8 @@ main(int argc, char** argv)
cout << "Writing output to " << out_filename << endl;
*/
- Redland::World world;
- Redland::Model model(world);
+ Sord::World world;
+ Sord::Model model(world);
machine->write_state(model);
model.serialise_to_file_handle(stdout);
diff --git a/wscript b/wscript
index 90a9e9d..aaed96e 100644
--- a/wscript
+++ b/wscript
@@ -35,7 +35,7 @@ def configure(conf):
autowaf.check_pkg(conf, 'libglademm-2.4', uselib_store='GLADEMM',
atleast_version='2.6.0', mandatory=False)
autowaf.check_pkg(conf, 'rasqal', uselib_store='RASQAL', mandatory=False)
- autowaf.check_pkg(conf, 'redlandmm', uselib_store='REDLANDMM',
+ autowaf.check_pkg(conf, 'sord', uselib_store='SORD',
atleast_version='0.1.0', mandatory=False)
#autowaf.check_pkg(conf, 'eugene', uselib_store='EUGENE',
# atleast_version='0.0.0', mandatory=False)
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-22 13:31:54 +0000