aboutsummaryrefslogtreecommitdiffstats
path: root/src/engine/machina
diff options
context:
space:
mode:
Diffstat (limited to 'src/engine/machina')
-rw-r--r--src/engine/machina/Engine.hpp6
-rw-r--r--src/engine/machina/Loader.hpp12
-rw-r--r--src/engine/machina/Machine.hpp5
3 files changed, 13 insertions, 10 deletions
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);