From dbaf3eaff06b05fe8901bfe800c76435fc024e3c Mon Sep 17 00:00:00 2001 From: David Robillard Date: Fri, 30 Nov 2007 07:38:42 +0000 Subject: Split redland C++ wrappers out from Raul. git-svn-id: http://svn.drobilla.net/lad/machina@927 a436a847-0d15-0410-975c-d299462d15a1 --- src/engine/machina/Action.hpp | 2 +- src/engine/machina/Edge.hpp | 2 +- src/engine/machina/Engine.hpp | 6 +++--- src/engine/machina/Loader.hpp | 4 ++-- src/engine/machina/Machine.hpp | 2 +- src/engine/machina/MidiAction.hpp | 2 +- src/engine/machina/Node.hpp | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) (limited to 'src/engine/machina') diff --git a/src/engine/machina/Action.hpp b/src/engine/machina/Action.hpp index cf6bf58..3cab3ee 100644 --- a/src/engine/machina/Action.hpp +++ b/src/engine/machina/Action.hpp @@ -34,7 +34,7 @@ namespace Machina { struct Action : public Raul::Deletable, public Raul::Stateful { virtual void execute(SharedPtr sink, Raul::BeatTime time) = 0; - virtual void write_state(Raul::RDF::Model& model); + virtual void write_state(Redland::Model& model); }; diff --git a/src/engine/machina/Edge.hpp b/src/engine/machina/Edge.hpp index f82f1ae..3f564ef 100644 --- a/src/engine/machina/Edge.hpp +++ b/src/engine/machina/Edge.hpp @@ -40,7 +40,7 @@ public: , _head(head) {} - void write_state(Raul::RDF::Model& model); + void write_state(Redland::Model& model); WeakPtr tail() { return _tail; } SharedPtr head() { return _head; } diff --git a/src/engine/machina/Engine.hpp b/src/engine/machina/Engine.hpp index d429df2..d8d16d9 100644 --- a/src/engine/machina/Engine.hpp +++ b/src/engine/machina/Engine.hpp @@ -31,13 +31,13 @@ class Machine; class Engine { public: - Engine(SharedPtr driver, Raul::RDF::World& rdf_world) + Engine(SharedPtr driver, Redland::World& rdf_world) : _driver(driver) , _rdf_world(rdf_world) , _loader(_rdf_world) { } - Raul::RDF::World& rdf_world() { return _rdf_world; } + Redland::World& rdf_world() { return _rdf_world; } SharedPtr driver() { return _driver; } SharedPtr machine() { return _driver->machine(); } @@ -51,7 +51,7 @@ public: private: SharedPtr _driver; - Raul::RDF::World& _rdf_world; + Redland::World& _rdf_world; Loader _loader; }; diff --git a/src/engine/machina/Loader.hpp b/src/engine/machina/Loader.hpp index 9c351a0..914df24 100644 --- a/src/engine/machina/Loader.hpp +++ b/src/engine/machina/Loader.hpp @@ -32,12 +32,12 @@ class Machine; class Loader { public: - Loader(Raul::RDF::World& rdf_world); + Loader(Redland::World& rdf_world); SharedPtr load(const Glib::ustring& filename); private: - Raul::RDF::World& _rdf_world; + Redland::World& _rdf_world; }; diff --git a/src/engine/machina/Machine.hpp b/src/engine/machina/Machine.hpp index 946eaca..c6f8796 100644 --- a/src/engine/machina/Machine.hpp +++ b/src/engine/machina/Machine.hpp @@ -47,7 +47,7 @@ public: void remove_node(SharedPtr node); void learn(SharedPtr learn); - void write_state(Raul::RDF::Model& model); + void write_state(Redland::Model& model); // Audio context void reset(); diff --git a/src/engine/machina/MidiAction.hpp b/src/engine/machina/MidiAction.hpp index 09986fd..5639532 100644 --- a/src/engine/machina/MidiAction.hpp +++ b/src/engine/machina/MidiAction.hpp @@ -53,7 +53,7 @@ public: void execute(SharedPtr driver, Raul::BeatTime time); - virtual void write_state(Raul::RDF::Model& model); + virtual void write_state(Redland::Model& model); private: diff --git a/src/engine/machina/Node.hpp b/src/engine/machina/Node.hpp index 1834207..2e26f0a 100644 --- a/src/engine/machina/Node.hpp +++ b/src/engine/machina/Node.hpp @@ -62,7 +62,7 @@ public: void remove_outgoing_edge(SharedPtr edge); void remove_outgoing_edges_to(SharedPtr node); - void write_state(Raul::RDF::Model& model); + void write_state(Redland::Model& model); bool is_initial() const { return _is_initial; } void set_initial(bool i) { _is_initial = i; } -- cgit v1.2.1