Converted Raul (and thus Ingen and Machina) to use Redland over Raptor/Rasqal independently.

Fixed patch loading for Ingen (local only, still something wrong with remote...).


git-svn-id: http://svn.drobilla.net/lad/machina@486 a436a847-0d15-0410-975c-d299462d15a1

1 files changed, 9 insertions, 2 deletions

diff --git a/src/engine/machina/Engine.hpp b/src/engine/machina/Engine.hpp
index 4263ef3..2cae36d 100644
--- a/src/engine/machina/Engine.hpp
+++ b/src/engine/machina/Engine.hpp
@@ -21,7 +21,8 @@
 #include <glibmm/ustring.h>
 #include <raul/SharedPtr.h>
 #include <raul/types.h>
-#include "machina/Driver.hpp" 
+#include "machina/Driver.hpp"
+#include "machina/Loader.hpp"
 
 namespace Machina {
 
@@ -30,10 +31,14 @@ class Machine;
 
 class Engine {
 public:
-	Engine(SharedPtr<Driver> driver)
+	Engine(SharedPtr<Driver> driver, Raul::RDF::World& rdf_world)
 		: _driver(driver)
+		, _rdf_world(rdf_world)
+		, _loader(_rdf_world)
 	{ }
 	
+	Raul::RDF::World& rdf_world() { return _rdf_world; }
+
 	SharedPtr<Driver>  driver()  { return _driver; }
 	SharedPtr<Machine> machine() { return _driver->machine(); }
 
@@ -46,6 +51,8 @@ public:
 
 private:
 	SharedPtr<Driver> _driver;
+	Raul::RDF::World& _rdf_world;
+	Loader            _loader;
 };