8 files changed, 37 insertions, 20 deletions
diff --git a/src/engine/JackDriver.cpp b/src/engine/JackDriver.cpp
index 4f08543..d389e2a 100644
--- a/src/engine/JackDriver.cpp
+++ b/src/engine/JackDriver.cpp
@@ -28,7 +28,6 @@ namespace Machina {
 JackDriver::JackDriver(SharedPtr<Machine> machine)
 	: Driver(machine)
 	, _machine_changed(0)
-	, _machine(machine)
 	, _input_port(NULL)
 	, _output_port(NULL)
 	, _cycle_time(1/48000.0, 120.0)
@@ -100,6 +99,7 @@ JackDriver::set_machine(SharedPtr<Machine> machine)
 	_machine = machine;
 	if (is_activated())
 		_machine_changed.wait();
+	assert(_machine == machine);
 }
 
 
diff --git a/src/engine/Loader.cpp b/src/engine/Loader.cpp
index 5c5ccdb..b58d150 100644
--- a/src/engine/Loader.cpp
+++ b/src/engine/Loader.cpp
@@ -26,6 +26,7 @@
 #include "machina/Node.hpp"
 #include "machina/Edge.hpp"
 #include "machina/Machine.hpp"
+#include "machina/ActionFactory.hpp"
 
 using namespace Raul;
 using std::cerr; using std::cout; using std::endl;
@@ -76,6 +77,8 @@ Loader::load(const Glib::ustring& uri)
 
 	const Glib::ustring machine_uri = "<>";
 
+	cout << "USER URI: " << uri << endl;
+
 	cout << "[Loader] Loading " << machine_uri << " from " << document_uri << endl;
 
 	machine = SharedPtr<Machine>(new Machine());
@@ -134,24 +137,34 @@ Loader::load(const Glib::ustring& uri)
 	}
 
 
-	/* Get actions */
+	/* Get note actions */
 
 	query = Raul::RDFQuery(*_namespaces, Glib::ustring(
-			"SELECT DISTINCT ?node ?enter_action ?exit_action FROM <")
+			"SELECT DISTINCT ?node ?note FROM <")
 			+ document_uri + "> WHERE {\n" +
-			"?node :enterAction ?enter_action ;\n"
-			"      :exitAction  ?exit_action .\n"
+			"?node :enterAction [ a :MidiAction; :midiNote ?note ] ;\n"
+			"      :exitAction  [ a :MidiAction; :midiNote ?note ] .\n"
 			"}\n");
 
 	results = query.run(document_uri);
 
 	for (RDFQuery::Results::iterator i = results.begin(); i != results.end(); ++i) {
-		const Glib::ustring& node         = (*i)["node"];
-		const Glib::ustring& enter_action = (*i)["enter_action"];
-		const Glib::ustring& exit_action  = (*i)["exit_action"];
-
-		cout << "Node: " << node << ", Action: " << enter_action << " .. " << exit_action <<endl;
-
+		const Glib::ustring& node_id = (*i)["node"];
+		const Glib::ustring& note    = (*i)["note"];
+
+		Created::iterator node_i = created.find(node_id);
+		if (node_i != created.end()) {
+			SharedPtr<Node> node = node_i->second;
+			const long note_num = strtol(note.c_str(), NULL, 10);
+			if (note_num >= 0 && note_num <= 127) {
+				node->add_enter_action(ActionFactory::note_on((unsigned char)note_num));
+				node->add_exit_action(ActionFactory::note_off((unsigned char)note_num));
+			} else {
+				cerr << "WARNING:  MIDI note number out of range, ignoring." << endl;
+			}
+		} else {
+			cerr << "WARNING:  Found note for unknown states.  Ignoring." << endl;
+		}
 	}
 
 
@@ -190,10 +203,12 @@ Loader::load(const Glib::ustring& uri)
 
 	}
 
-	if (machine)
+	if (machine && machine->nodes().size() > 0) {
 		machine->reset();
-
-	return machine;
+		return machine;
+	} else {
+		return SharedPtr<Machine>();
+	}
 }
 
 
diff --git a/src/engine/Makefile.am b/src/engine/Makefile.am
index 8d41dd6..c526633 100644
--- a/src/engine/Makefile.am
+++ b/src/engine/Makefile.am
@@ -12,6 +12,7 @@ libmachina_la_SOURCES = \
 	Machine.cpp \
 	Loader.cpp \
 	MidiAction.cpp \
+	ActionFactory.cpp \
 	SMFDriver.cpp \
 	Engine.cpp \
 	LearnRequest.cpp
diff --git a/src/engine/machina/Driver.hpp b/src/engine/machina/Driver.hpp
index b900da0..a1a38a2 100644
--- a/src/engine/machina/Driver.hpp
+++ b/src/engine/machina/Driver.hpp
@@ -39,7 +39,7 @@ public:
 	virtual void activate() {}
 	virtual void deactivate() {}
 
-private:
+protected:
 	SharedPtr<Machine> _machine;
 };
 
diff --git a/src/engine/machina/JackDriver.hpp b/src/engine/machina/JackDriver.hpp
index e5d0abb..a048c0c 100644
--- a/src/engine/machina/JackDriver.hpp
+++ b/src/engine/machina/JackDriver.hpp
@@ -67,7 +67,6 @@ private:
 	virtual void on_process(jack_nframes_t nframes);
 
 	Raul::Semaphore    _machine_changed;
-	SharedPtr<Machine> _machine;
 	SharedPtr<Machine> _last_machine;
 
 	jack_port_t* _input_port;
diff --git a/src/engine/machina/Machine.hpp b/src/engine/machina/Machine.hpp
index 12b601d..fb37f4e 100644
--- a/src/engine/machina/Machine.hpp
+++ b/src/engine/machina/Machine.hpp
@@ -18,6 +18,7 @@
 #ifndef MACHINA_MACHINE_HPP
 #define MACHINA_MACHINE_HPP
 
+#include <boost/utility.hpp>
 #include <raul/SharedPtr.h>
 #include <raul/List.h>
 #include <raul/RDFWriter.h> 
@@ -29,7 +30,7 @@
 namespace Machina {
 
 
-class Machine : public Raul::Stateful {
+class Machine : public Raul::Stateful, public boost::noncopyable {
 public:
 	Machine();
 	~Machine();
diff --git a/src/engine/machina/Makefile.am b/src/engine/machina/Makefile.am
index ff8eab5..ce19080 100644
--- a/src/engine/machina/Makefile.am
+++ b/src/engine/machina/Makefile.am
@@ -8,6 +8,7 @@ libmachinainclude_HEADERS = \
 	Machine.hpp \
 	Loader.hpp \
 	MidiAction.hpp \
+	ActionFactory.hpp \
 	Driver.hpp \
 	LearnRequest.hpp \
 	Engine.hpp
diff --git a/src/gui/MachinaGUI.cpp b/src/gui/MachinaGUI.cpp
index 0ab4356..fdd75c6 100644
--- a/src/gui/MachinaGUI.cpp
+++ b/src/gui/MachinaGUI.cpp
@@ -331,11 +331,11 @@ MachinaGUI::menu_file_open()
 	const int result = dialog.run();
 
 	if (result == Gtk::RESPONSE_OK) {
-		_save_uri = dialog.get_uri();
-		SharedPtr<Machina::Machine> new_machine = _engine->load_machine(_save_uri);
+		SharedPtr<Machina::Machine> new_machine = _engine->load_machine(dialog.get_uri());
 		if (new_machine) {
 			_canvas->destroy();
 			_canvas->build(new_machine);
+			_save_uri = dialog.get_uri();
 		}
 	}
 }
@@ -407,7 +407,7 @@ MachinaGUI::menu_file_save_as()
 		if (confirm) {
 			Raul::RDFWriter writer;
 			writer.start_to_filename(filename);
-			machine()->write_state(writer);
+			_engine->machine()->write_state(writer);
 			writer.finish();
 			_save_uri = dialog.get_uri();
 		}