Fix Eugene and Machine compilation.

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

7 files changed, 8 insertions, 7 deletions

diff --git a/src/engine/Edge.cpp b/src/engine/Edge.cpp
index 2c8d9a2..e177897 100644
--- a/src/engine/Edge.cpp
+++ b/src/engine/Edge.cpp
@@ -55,7 +55,7 @@ Edge::write_state(Redland::Model& model)
 
 	model.add_statement(_id,
 			"machina:probability",
-			AtomRDF::atom_to_node(model.world(), Atom(_probability.get())));
+			AtomRDF::atom_to_node(model, Atom(_probability.get())));
 }
 
 
diff --git a/src/engine/MidiAction.cpp b/src/engine/MidiAction.cpp
index 2678b54..65a1bc0 100644
--- a/src/engine/MidiAction.cpp
+++ b/src/engine/MidiAction.cpp
@@ -105,7 +105,7 @@ MidiAction::write_state(Redland::Model& model)
 	// FIXME: Assumes note on/note off
 	model.add_statement(_id,
 			Redland::Node(model.world(), Redland::Node::RESOURCE, "machina:midiNote"),
-			AtomRDF::atom_to_node(model.world(), Atom((int)(_event.get()[1]))));
+			AtomRDF::atom_to_node(model, Atom((int)(_event.get()[1]))));
 }
 
 
diff --git a/src/engine/Node.cpp b/src/engine/Node.cpp
index 1282bda..99d35d5 100644
--- a/src/engine/Node.cpp
+++ b/src/engine/Node.cpp
@@ -227,7 +227,7 @@ Node::write_state(Redland::Model& model)
 
 	model.add_statement(_id,
 			"machina:duration",
-			AtomRDF::atom_to_node(model.world(), Atom((float)_duration.to_double())));
+			AtomRDF::atom_to_node(model, Atom((float)_duration.to_double())));
 
 	if (_enter_action) {
 		_enter_action->write_state(model);
diff --git a/src/engine/RaulJackDriver.cpp b/src/engine/RaulJackDriver.cpp
index 83cf7bb..83a7c1c 100644
--- a/src/engine/RaulJackDriver.cpp
+++ b/src/engine/RaulJackDriver.cpp
@@ -22,7 +22,7 @@
 #include <jack/jack.h>
 #include <jack/statistics.h>
 #include <jack/thread.h>
-#include "raul/JackDriver.hpp"
+#include "RaulJackDriver.hpp"
 
 using std::cerr; using std::endl;
 using std::string;
diff --git a/src/engine/machina/JackDriver.hpp b/src/engine/machina/JackDriver.hpp
index 4ec0472..8279cda 100644
--- a/src/engine/machina/JackDriver.hpp
+++ b/src/engine/machina/JackDriver.hpp
@@ -20,12 +20,12 @@
 
 #include <boost/enable_shared_from_this.hpp>
 #include <jack/midiport.h>
-#include "raul/JackDriver.hpp"
 #include "raul/SharedPtr.hpp"
 #include "raul/DoubleBuffer.hpp"
 #include "raul/EventRingBuffer.hpp"
 #include "raul/Semaphore.hpp"
 #include "raul/Command.hpp"
+#include "RaulJackDriver.hpp"
 #include "Machine.hpp"
 #include "Driver.hpp"
 #include "Recorder.hpp"
diff --git a/src/engine/machina/Mutation.hpp b/src/engine/machina/Mutation.hpp
index 632cfbc..e3bbca1 100644
--- a/src/engine/machina/Mutation.hpp
+++ b/src/engine/machina/Mutation.hpp
@@ -24,7 +24,7 @@
 	#include "eugene/Mutation.hpp"
 	#define SUPER : public Eugene::Mutation<Machine>
 #else
-	#define SUPER
+	#define SUPER : public Mutation
 #endif
 
 namespace Machina {
@@ -33,7 +33,7 @@ class Machine;
 
 namespace Mutation {
 
-struct Mutation { virtual void mutate(Machine& machine) = 0; };
+struct Mutation { virtual ~Mutation() {}; virtual void mutate(Machine& machine) = 0; };
 
 struct Compress   SUPER { void mutate(Machine& machine); };
 struct AddNode    SUPER { void mutate(Machine& machine); };
diff --git a/src/engine/machina/Problem.hpp b/src/engine/machina/Problem.hpp
index fcb7874..e25c5a1 100644
--- a/src/engine/machina/Problem.hpp
+++ b/src/engine/machina/Problem.hpp
@@ -29,6 +29,7 @@ namespace Machina {
 class Problem : public Eugene::Problem<Machine> {
 public:
 	Problem(TimeUnit unit, const std::string& target_midi, SharedPtr<Machine> seed = SharedPtr<Machine>());
+	virtual ~Problem() {}
 
 	void seed(SharedPtr<Machine> parent) { _seed = parent; }