Patch => Graph

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

10 files changed, 27 insertions, 22 deletions

diff --git a/tests/connect_disconnect_node_node.ttl b/tests/connect_disconnect_node_node.ttl
index dba10924..7ea9c3c8 100644
--- a/tests/connect_disconnect_node_node.ttl
+++ b/tests/connect_disconnect_node_node.ttl
@@ -6,7 +6,7 @@
 	a patch:Put ;
 	patch:subject <ingen:root/node1> ;
 	patch:body [
-		a ingen:Node ;
+		a ingen:Block ;
 		ingen:prototype <http://drobilla.net/plugins/mda/Shepard>
 	] .
 
@@ -14,7 +14,7 @@
 	a patch:Put ;
 	patch:subject <ingen:root/node2> ;
 	patch:body [
-		a ingen:Node ;
+		a ingen:Block ;
 		ingen:prototype <http://drobilla.net/plugins/mda/Shepard>
 	] .
 
diff --git a/tests/connect_disconnect_node_patch.ttl b/tests/connect_disconnect_node_patch.ttl
index 038e1dba..e6403354 100644
--- a/tests/connect_disconnect_node_patch.ttl
+++ b/tests/connect_disconnect_node_patch.ttl
@@ -6,7 +6,7 @@
 	a patch:Put ;
 	patch:subject <ingen:root/node> ;
 	patch:body [
-		a ingen:Node ;
+		a ingen:Block ;
 		ingen:prototype <http://drobilla.net/plugins/mda/Shepard>
 	] .
 
diff --git a/tests/create_delete_node.ttl b/tests/create_delete_node.ttl
index 1d43bbce..8993e44b 100644
--- a/tests/create_delete_node.ttl
+++ b/tests/create_delete_node.ttl
@@ -6,7 +6,7 @@
 	a patch:Put ;
 	patch:subject <ingen:root/node> ;
 	patch:body [
-		a ingen:Node ;
+		a ingen:Block ;
 		ingen:prototype <http://drobilla.net/plugins/mda/Shepard>
 	] .
 
diff --git a/tests/create_delete_patch.ttl b/tests/create_delete_patch.ttl
index b0439dca..a3ef906c 100644
--- a/tests/create_delete_patch.ttl
+++ b/tests/create_delete_patch.ttl
@@ -6,7 +6,7 @@
 	a patch:Put ;
 	patch:subject <ingen:root/sub> ;
 	patch:body [
-		a ingen:Patch ;
+		a ingen:Graph ;
 	] .
 
 <msg1>
diff --git a/tests/disconnect_all_node.ttl b/tests/disconnect_all_node.ttl
index 9c1d425c..7d71705c 100644
--- a/tests/disconnect_all_node.ttl
+++ b/tests/disconnect_all_node.ttl
@@ -6,7 +6,7 @@
 	a patch:Put ;
 	patch:subject <ingen:root/node1> ;
 	patch:body [
-		a ingen:Node ;
+		a ingen:Block ;
 		ingen:prototype <http://drobilla.net/plugins/mda/Shepard>
 	] .
 
@@ -14,7 +14,7 @@
 	a patch:Put ;
 	patch:subject <ingen:root/node2> ;
 	patch:body [
-		a ingen:Node ;
+		a ingen:Block ;
 		ingen:prototype <http://drobilla.net/plugins/mda/Shepard>
 	] .
 
diff --git a/tests/get_node.ttl b/tests/get_node.ttl
index b1e0468c..44ca1641 100644
--- a/tests/get_node.ttl
+++ b/tests/get_node.ttl
@@ -6,7 +6,7 @@
 	a patch:Put ;
 	patch:subject <ingen:root/node> ;
 	patch:body [
-		a ingen:Node ;
+		a ingen:Block ;
 		ingen:prototype <http://drobilla.net/plugins/mda/Shepard>
 	] .
 
diff --git a/tests/get_patch.ttl b/tests/get_patch.ttl
index 158408ff..5d2eb737 100644
--- a/tests/get_patch.ttl
+++ b/tests/get_patch.ttl
@@ -6,14 +6,14 @@
 	a patch:Put ;
 	patch:subject <ingen:root/sub> ;
 	patch:body [
-		a ingen:Patch
+		a ingen:Graph
 	] .
 
 <msg1>
 	a patch:Put ;
 	patch:subject <ingen:root/sub/node1> ;
 	patch:body [
-		a ingen:Node ;
+		a ingen:Block ;
 		ingen:prototype <http://drobilla.net/plugins/mda/Shepard>
 	] .
 
@@ -21,7 +21,7 @@
 	a patch:Put ;
 	patch:subject <ingen:root/sub/node2> ;
 	patch:body [
-		a ingen:Node ;
+		a ingen:Block ;
 		ingen:prototype <http://drobilla.net/plugins/mda/Combo>
 	] .
 
diff --git a/tests/ingen_test.cpp b/tests/ingen_test.cpp
index 68981078..62ee502a 100644
--- a/tests/ingen_test.cpp
+++ b/tests/ingen_test.cpp
@@ -31,7 +31,6 @@
 #include "raul/Path.hpp"
 #include "raul/SharedPtr.hpp"
 #include "raul/Thread.hpp"
-#include "raul/log.hpp"
 
 #include "serd/serd.h"
 #include "sord/sordmm.hpp"
@@ -67,7 +66,7 @@ class TestClient : public AtomSink {
 class TestClient : public Interface
 {
 public:
-	TestClient() {}
+	TestClient(Log& log) : _log(log) {}
 	~TestClient() {}
 
 	Raul::URI uri() const { return Raul::URI("ingen:testClient"); }
@@ -108,16 +107,19 @@ public:
 
 	void response(int32_t id, Status status, const std::string& subject) {
 		if (status) {
-			Raul::error(Raul::fmt("error on message %1%: %2% (%3%)\n")
-			            % id % ingen_status_string(status) % subject);
+			_log.error(Raul::fmt("error on message %1%: %2% (%3%)\n")
+			           % id % ingen_status_string(status) % subject);
 			exit(EXIT_FAILURE);
 		}
 	}
 
 	void error(const std::string& msg) {
-		Raul::error(Raul::fmt("error: %1%\n") % msg);
+		_log.error(Raul::fmt("error: %1%\n") % msg);
 		exit(EXIT_FAILURE);
 	}
+
+private:
+	Log& _log;
 };
 
 
@@ -144,7 +146,7 @@ main(int argc, char** argv)
 
 	// Create world
 	try {
-		world = new World(argc, argv, NULL, NULL);
+		world = new World(argc, argv, NULL, NULL, NULL);
 	} catch (std::exception& e) {
 		cout << "ingen: " << e.what() << endl;
 		return EXIT_FAILURE;
@@ -186,8 +188,11 @@ main(int argc, char** argv)
 	const std::string cmds_file_path = argv[2];
 
 	// AtomReader to read commands from a file and send them to engine
-	AtomReader atom_reader(
-		world->uri_map(), world->uris(), world->forge(), *world->interface().get());
+	AtomReader atom_reader(world->uri_map(),
+	                       world->uris(),
+	                       world->log(),
+	                       world->forge(),
+	                       *world->interface().get());
 
 	// AtomWriter to serialise responses from the engine
 	/*
@@ -195,7 +200,7 @@ main(int argc, char** argv)
 	SharedPtr<AtomWriter> atom_writer(
 		new AtomWriter(world->uri_map(), world->uris(), client));
 	*/
-	SharedPtr<Interface> client(new TestClient());
+	SharedPtr<Interface> client(new TestClient(world->log()));
 
 	world->interface()->set_respondee(client);
 	world->engine()->register_client(Raul::URI("ingen:testClient"),
diff --git a/tests/move_node.ttl b/tests/move_node.ttl
index 077069cb..8135b4a5 100644
--- a/tests/move_node.ttl
+++ b/tests/move_node.ttl
@@ -6,7 +6,7 @@
 	a patch:Put ;
 	patch:subject <ingen:root/node> ;
 	patch:body [
-		a ingen:Node ;
+		a ingen:Block ;
 		ingen:prototype <http://drobilla.net/plugins/mda/Shepard>
 	] .
 
diff --git a/tests/poly.ttl b/tests/poly.ttl
index b5a8b3c5..fc40bbc9 100644
--- a/tests/poly.ttl
+++ b/tests/poly.ttl
@@ -6,7 +6,7 @@
 	a patch:Put ;
 	patch:subject <ingen:root/node> ;
 	patch:body [
-		a ingen:Node ;
+		a ingen:Block ;
 		ingen:prototype <http://drobilla.net/plugins/mda/Shepard>
 	] .