From efe8e2311ee2fed881f95cc1e72825906d21c7c1 Mon Sep 17 00:00:00 2001
From: David Robillard <d@drobilla.net>
Date: Sun, 12 Aug 2012 23:42:17 +0000
Subject: Use ingen:root as the path for the root patch, opening up path space
 for engine/driver/etc. Strict conversion between Path and URI (Path no longer
 is-a URI).

git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@4672 a436a847-0d15-0410-975c-d299462d15a1
---
 tests/connect_disconnect_node_node.ttl   | 14 +++++++-------
 tests/connect_disconnect_node_patch.ttl  | 14 +++++++-------
 tests/connect_disconnect_patch_patch.ttl | 14 +++++++-------
 tests/create_delete_node.ttl             |  4 ++--
 tests/create_delete_patch.ttl            |  4 ++--
 tests/create_delete_port.ttl             |  4 ++--
 tests/disconnect_all_node.ttl            | 20 ++++++++++----------
 tests/get_node.ttl                       |  4 ++--
 tests/get_patch.ttl                      | 14 +++++++-------
 tests/get_port.ttl                       |  4 ++--
 tests/ingen_test.cpp                     |  4 ++--
 tests/move_node.ttl                      |  6 +++---
 tests/move_port.ttl                      |  6 +++---
 tests/poly.ttl                           |  6 +++---
 tests/put_audio_in.ttl                   |  2 +-
 tests/set_patch_port_value.ttl           |  4 ++--
 16 files changed, 62 insertions(+), 62 deletions(-)

(limited to 'tests')

diff --git a/tests/connect_disconnect_node_node.ttl b/tests/connect_disconnect_node_node.ttl
index 0f84dcaa..dba10924 100644
--- a/tests/connect_disconnect_node_node.ttl
+++ b/tests/connect_disconnect_node_node.ttl
@@ -4,7 +4,7 @@
 
 <msg0>
 	a patch:Put ;
-	patch:subject <path:/node1> ;
+	patch:subject <ingen:root/node1> ;
 	patch:body [
 		a ingen:Node ;
 		ingen:prototype <http://drobilla.net/plugins/mda/Shepard>
@@ -12,7 +12,7 @@
 
 <msg1>
 	a patch:Put ;
-	patch:subject <path:/node2> ;
+	patch:subject <ingen:root/node2> ;
 	patch:body [
 		a ingen:Node ;
 		ingen:prototype <http://drobilla.net/plugins/mda/Shepard>
@@ -20,17 +20,17 @@
 
 <msg2>
 	a patch:Put ;
-	patch:subject <path:/> ;
+	patch:subject <ingen:root/> ;
 	patch:body [
 		a ingen:Edge ;
-		ingen:tail <path:/node1/left_out> ;
-		ingen:head <path:/node2/left_in>
+		ingen:tail <ingen:root/node1/left_out> ;
+		ingen:head <ingen:root/node2/left_in>
 	] .
 
 <msg3>
 	a patch:Delete ;
 	patch:body [
 		a ingen:Edge ;
-		ingen:tail <path:/node1/left_out> ;
-		ingen:head <path:/node2/left_in>
+		ingen:tail <ingen:root/node1/left_out> ;
+		ingen:head <ingen:root/node2/left_in>
 	] .
diff --git a/tests/connect_disconnect_node_patch.ttl b/tests/connect_disconnect_node_patch.ttl
index 2f7fd0df..038e1dba 100644
--- a/tests/connect_disconnect_node_patch.ttl
+++ b/tests/connect_disconnect_node_patch.ttl
@@ -4,7 +4,7 @@
 
 <msg0>
 	a patch:Put ;
-	patch:subject <path:/node> ;
+	patch:subject <ingen:root/node> ;
 	patch:body [
 		a ingen:Node ;
 		ingen:prototype <http://drobilla.net/plugins/mda/Shepard>
@@ -12,7 +12,7 @@
 
 <msg1>
 	a patch:Put ;
-	patch:subject <path:/out> ;
+	patch:subject <ingen:root/out> ;
 	patch:body [
 		a lv2:OutputPort ,
 			lv2:AudioPort
@@ -20,17 +20,17 @@
 
 <msg2>
 	a patch:Put ;
-	patch:subject <path:/> ;
+	patch:subject <ingen:root/> ;
 	patch:body [
 		a ingen:Edge ;
-		ingen:tail <path:/node/left_out> ;
-		ingen:head <path:/out>
+		ingen:tail <ingen:root/node/left_out> ;
+		ingen:head <ingen:root/out>
 	] .
 
 <msg3>
 	a patch:Delete ;
 	patch:body [
 		a ingen:Edge ;
-		ingen:tail <path:/node/left_out> ;
-		ingen:head <path:/out>
+		ingen:tail <ingen:root/node/left_out> ;
+		ingen:head <ingen:root/out>
 	] .
diff --git a/tests/connect_disconnect_patch_patch.ttl b/tests/connect_disconnect_patch_patch.ttl
index ba31a8ec..8df85a2b 100644
--- a/tests/connect_disconnect_patch_patch.ttl
+++ b/tests/connect_disconnect_patch_patch.ttl
@@ -4,7 +4,7 @@
 
 <msg0>
 	a patch:Put ;
-	patch:subject <path:/in> ;
+	patch:subject <ingen:root/in> ;
 	patch:body [
 		a lv2:InputPort ,
 			lv2:AudioPort
@@ -12,7 +12,7 @@
 
 <msg1>
 	a patch:Put ;
-	patch:subject <path:/out> ;
+	patch:subject <ingen:root/out> ;
 	patch:body [
 		a lv2:InputPort ,
 			lv2:AudioPort
@@ -20,17 +20,17 @@
 
 <msg2>
 	a patch:Put ;
-	patch:subject <path:/> ;
+	patch:subject <ingen:root/> ;
 	patch:body [
 		a ingen:Edge ;
-		ingen:tail <path:/in> ;
-		ingen:head <path:/out>
+		ingen:tail <ingen:root/in> ;
+		ingen:head <ingen:root/out>
 	] .
 
 <msg3>
 	a patch:Delete ;
 	patch:body [
 		a ingen:Edge ;
-		ingen:tail <path:/in> ;
-		ingen:head <path:/out>
+		ingen:tail <ingen:root/in> ;
+		ingen:head <ingen:root/out>
 	] .
diff --git a/tests/create_delete_node.ttl b/tests/create_delete_node.ttl
index 3494abe1..1d43bbce 100644
--- a/tests/create_delete_node.ttl
+++ b/tests/create_delete_node.ttl
@@ -4,7 +4,7 @@
 
 <msg0>
 	a patch:Put ;
-	patch:subject <path:/node> ;
+	patch:subject <ingen:root/node> ;
 	patch:body [
 		a ingen:Node ;
 		ingen:prototype <http://drobilla.net/plugins/mda/Shepard>
@@ -12,4 +12,4 @@
 
 <msg1>
 	a patch:Delete ;
-	patch:subject <path:/node> .
+	patch:subject <ingen:root/node> .
diff --git a/tests/create_delete_patch.ttl b/tests/create_delete_patch.ttl
index 8dc5e09a..b0439dca 100644
--- a/tests/create_delete_patch.ttl
+++ b/tests/create_delete_patch.ttl
@@ -4,11 +4,11 @@
 
 <msg0>
 	a patch:Put ;
-	patch:subject <path:/sub> ;
+	patch:subject <ingen:root/sub> ;
 	patch:body [
 		a ingen:Patch ;
 	] .
 
 <msg1>
 	a patch:Delete ;
-	patch:subject <path:/sub> .
+	patch:subject <ingen:root/sub> .
diff --git a/tests/create_delete_port.ttl b/tests/create_delete_port.ttl
index 6a92f0cc..cd01b9b4 100644
--- a/tests/create_delete_port.ttl
+++ b/tests/create_delete_port.ttl
@@ -4,7 +4,7 @@
 
 <msg0>
 	a patch:Put ;
-	patch:subject <path:/in> ;
+	patch:subject <ingen:root/in> ;
 	patch:body [
 		a lv2:InputPort ,
 			lv2:AudioPort
@@ -12,4 +12,4 @@
 
 <msg1>
 	a patch:Delete ;
-	patch:subject <path:/in> .
+	patch:subject <ingen:root/in> .
diff --git a/tests/disconnect_all_node.ttl b/tests/disconnect_all_node.ttl
index b4fc2747..9c1d425c 100644
--- a/tests/disconnect_all_node.ttl
+++ b/tests/disconnect_all_node.ttl
@@ -4,7 +4,7 @@
 
 <msg0>
 	a patch:Put ;
-	patch:subject <path:/node1> ;
+	patch:subject <ingen:root/node1> ;
 	patch:body [
 		a ingen:Node ;
 		ingen:prototype <http://drobilla.net/plugins/mda/Shepard>
@@ -12,7 +12,7 @@
 
 <msg1>
 	a patch:Put ;
-	patch:subject <path:/node2> ;
+	patch:subject <ingen:root/node2> ;
 	patch:body [
 		a ingen:Node ;
 		ingen:prototype <http://drobilla.net/plugins/mda/Shepard>
@@ -20,26 +20,26 @@
 
 <msg2>
 	a patch:Put ;
-	patch:subject <path:/> ;
+	patch:subject <ingen:root/> ;
 	patch:body [
 		a ingen:Edge ;
-		ingen:tail <path:/node1/left_out> ;
-		ingen:head <path:/node2/left_in>
+		ingen:tail <ingen:root/node1/left_out> ;
+		ingen:head <ingen:root/node2/left_in>
 	] .
 
 <msg3>
 	a patch:Put ;
-	patch:subject <path:/> ;
+	patch:subject <ingen:root/> ;
 	patch:body [
 		a ingen:Edge ;
-		ingen:tail <path:/node1/right_out> ;
-		ingen:head <path:/node2/right_in>
+		ingen:tail <ingen:root/node1/right_out> ;
+		ingen:head <ingen:root/node2/right_in>
 	] .
 
 <msg4>
 	a patch:Delete ;
-    patch:subject <path:/> ;
+    patch:subject <ingen:root/> ;
 	patch:body [
 		a ingen:Edge ;
-		ingen:incidentTo <path:/node1>
+		ingen:incidentTo <ingen:root/node1>
 	] .
diff --git a/tests/get_node.ttl b/tests/get_node.ttl
index 10ac10fb..b1e0468c 100644
--- a/tests/get_node.ttl
+++ b/tests/get_node.ttl
@@ -4,7 +4,7 @@
 
 <msg0>
 	a patch:Put ;
-	patch:subject <path:/node> ;
+	patch:subject <ingen:root/node> ;
 	patch:body [
 		a ingen:Node ;
 		ingen:prototype <http://drobilla.net/plugins/mda/Shepard>
@@ -12,4 +12,4 @@
 
 <msg1>
 	a patch:Get ;
-	patch:subject <path:/node> .
+	patch:subject <ingen:root/node> .
diff --git a/tests/get_patch.ttl b/tests/get_patch.ttl
index 843316dc..158408ff 100644
--- a/tests/get_patch.ttl
+++ b/tests/get_patch.ttl
@@ -4,14 +4,14 @@
 
 <msg0>
 	a patch:Put ;
-	patch:subject <path:/sub> ;
+	patch:subject <ingen:root/sub> ;
 	patch:body [
 		a ingen:Patch
 	] .
 
 <msg1>
 	a patch:Put ;
-	patch:subject <path:/sub/node1> ;
+	patch:subject <ingen:root/sub/node1> ;
 	patch:body [
 		a ingen:Node ;
 		ingen:prototype <http://drobilla.net/plugins/mda/Shepard>
@@ -19,7 +19,7 @@
 
 <msg2>
 	a patch:Put ;
-	patch:subject <path:/sub/node2> ;
+	patch:subject <ingen:root/sub/node2> ;
 	patch:body [
 		a ingen:Node ;
 		ingen:prototype <http://drobilla.net/plugins/mda/Combo>
@@ -27,13 +27,13 @@
 
 <msg3>
 	a patch:Put ;
-	patch:subject <path:/> ;
+	patch:subject <ingen:root/> ;
 	patch:body [
 		a ingen:Edge ;
-		ingen:tail <path:/sub/node1/left_out> ;
-		ingen:head <path:/sub/node2/left_in>
+		ingen:tail <ingen:root/sub/node1/left_out> ;
+		ingen:head <ingen:root/sub/node2/left_in>
 	] .
 
 <msg4>
 	a patch:Get ;
-	patch:subject <path:/> .
+	patch:subject <ingen:root/> .
diff --git a/tests/get_port.ttl b/tests/get_port.ttl
index 3e522af8..da371f0b 100644
--- a/tests/get_port.ttl
+++ b/tests/get_port.ttl
@@ -4,7 +4,7 @@
 
 <msg0>
 	a patch:Put ;
-	patch:subject <path:/in> ;
+	patch:subject <ingen:root/in> ;
 	patch:body [
 		a lv2:InputPort ,
 			lv2:AudioPort
@@ -12,4 +12,4 @@
 
 <msg1>
 	a patch:Get ;
-	patch:subject <path:/in> .
+	patch:subject <ingen:root/in> .
diff --git a/tests/ingen_test.cpp b/tests/ingen_test.cpp
index f3b37391..ce3f3c30 100644
--- a/tests/ingen_test.cpp
+++ b/tests/ingen_test.cpp
@@ -108,7 +108,7 @@ 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")
+			Raul::error(Raul::fmt("error on message %1%: %2% (%3%)\n")
 			            % id % ingen_status_string(status) % subject);
 			exit(EXIT_FAILURE);
 		}
@@ -121,7 +121,7 @@ public:
 };
 
 
-void
+static void
 ingen_try(bool cond, const char* msg)
 {
 	if (!cond) {
diff --git a/tests/move_node.ttl b/tests/move_node.ttl
index f24c14c2..077069cb 100644
--- a/tests/move_node.ttl
+++ b/tests/move_node.ttl
@@ -4,7 +4,7 @@
 
 <msg0>
 	a patch:Put ;
-	patch:subject <path:/node> ;
+	patch:subject <ingen:root/node> ;
 	patch:body [
 		a ingen:Node ;
 		ingen:prototype <http://drobilla.net/plugins/mda/Shepard>
@@ -12,5 +12,5 @@
 
 <msg1>
 	a patch:Move ;
-	patch:subject <path:/node> ;
-	patch:destination <path:/tone> .
+	patch:subject <ingen:root/node> ;
+	patch:destination <ingen:root/tone> .
diff --git a/tests/move_port.ttl b/tests/move_port.ttl
index b6c9ab83..f8f96120 100644
--- a/tests/move_port.ttl
+++ b/tests/move_port.ttl
@@ -4,7 +4,7 @@
 
 <msg0>
 	a patch:Put ;
-	patch:subject <path:/in> ;
+	patch:subject <ingen:root/in> ;
 	patch:body [
 		a lv2:InputPort ,
 			lv2:AudioPort
@@ -12,5 +12,5 @@
 
 <msg1>
 	a patch:Move ;
-	patch:subject <path:/in> ;
-	patch:destination <path:/input> .
+	patch:subject <ingen:root/in> ;
+	patch:destination <ingen:root/input> .
diff --git a/tests/poly.ttl b/tests/poly.ttl
index e5b43c43..b5a8b3c5 100644
--- a/tests/poly.ttl
+++ b/tests/poly.ttl
@@ -4,7 +4,7 @@
 
 <msg0>
 	a patch:Put ;
-	patch:subject <path:/node> ;
+	patch:subject <ingen:root/node> ;
 	patch:body [
 		a ingen:Node ;
 		ingen:prototype <http://drobilla.net/plugins/mda/Shepard>
@@ -12,14 +12,14 @@
 
 <msg1>
 	a patch:Set ;
-	patch:subject <path:/> ;
+	patch:subject <ingen:root/> ;
 	patch:body [
         ingen:polyphony 4
 	] .
 
 <msg2>
 	a patch:Set ;
-	patch:subject <path:/node> ;
+	patch:subject <ingen:root/node> ;
 	patch:body [
         ingen:polyphonic true
 	] .
diff --git a/tests/put_audio_in.ttl b/tests/put_audio_in.ttl
index 2f724ab9..432aa859 100644
--- a/tests/put_audio_in.ttl
+++ b/tests/put_audio_in.ttl
@@ -3,7 +3,7 @@
 
 <msg0>
 	a patch:Put ;
-	patch:subject <path:/in> ;
+	patch:subject <ingen:root/in> ;
 	patch:body [
 		a lv2:InputPort ,
 			lv2:AudioPort
diff --git a/tests/set_patch_port_value.ttl b/tests/set_patch_port_value.ttl
index 226d4811..a5b40258 100644
--- a/tests/set_patch_port_value.ttl
+++ b/tests/set_patch_port_value.ttl
@@ -4,7 +4,7 @@
 
 <msg0>
 	a patch:Put ;
-	patch:subject <path:/in> ;
+	patch:subject <ingen:root/in> ;
 	patch:body [
 		a lv2:InputPort ,
 			lv2:ControlPort
@@ -12,7 +12,7 @@
 
 <msg1>
 	a patch:Set ;
-	patch:subject <path:/in> ;
+	patch:subject <ingen:root/in> ;
 	patch:body [
 		ingen:value 0.5
 	] .
-- 
cgit v1.2.1