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, 5 insertions, 2 deletions

diff --git a/src/gui/main.cpp b/src/gui/main.cpp
index 25b2aa9..791aa2d 100644
--- a/src/gui/main.cpp
+++ b/src/gui/main.cpp
@@ -19,6 +19,7 @@
 #include <iostream>
 #include <string>
 #include <libgnomecanvasmm.h>
+#include <raul/RDFWorld.h>
 #include "../config.h"
 #include "machina/Loader.hpp"
 #include "machina/SMFDriver.hpp"
@@ -35,6 +36,8 @@ using namespace Machina;
 int
 main(int argc, char** argv)
 {
+	Raul::RDF::World rdf_world;
+
 	SharedPtr<Machina::Machine> machine;
 
 	// Load machine, if given
@@ -54,7 +57,7 @@ main(int argc, char** argv)
 
 		if (!machine) {
 			cout << "Not a MIDI file.  Attempting to load as Machina file." << endl;
-			machine = Loader().load(filename);
+			machine = Loader(rdf_world).load(filename);
 		}
 	}
 
@@ -70,7 +73,7 @@ main(int argc, char** argv)
 	if (!driver)
 		driver = SharedPtr<Driver>(new SMFDriver(machine));
 
-	SharedPtr<Engine> engine(new Engine(driver));
+	SharedPtr<Engine> engine(new Engine(driver, rdf_world));
 
 	Gnome::Canvas::init();
 	Gtk::Main app(argc, argv);