Merge branch 'master' of eclectronics.org@eclectronics.org:TRSS

Conflicts:
	04_playobjects/src/testApp.h

4 files changed, 91 insertions, 0 deletions

diff --git a/06_performance/bin/data/TRSS_nesbitt_recordings.xml b/06_performance/bin/data/TRSS_nesbitt_recordings.xml
new file mode 100644
index 0000000..550aae0
--- /dev/null
+++ b/06_performance/bin/data/TRSS_nesbitt_recordings.xml
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<TRSS description="James Nesbitt">
+
+	<rec audio="audio/00.wav" left="recs/kinectRecord_0_15201313204.oni" right="recs/kinectRecord_1_15201313204.oni" description="2040 or 2004 BIG"/>
+	<rec audio="audio/01.wav" left="recs/kinectRecord_0_152013132358.oni" right="recs/kinectRecord_1_152013132358.oni"/>
+	<rec audio="audio/02.wav" left="recs/kinectRecord_0_15201313246.oni" right="recs/kinectRecord_1_15201313246.oni" description="2406"/>
+	<rec audio="audio/03.wav" left="recs/kinectRecord_0_152013132416.oni" right="recs/kinectRecord_1_152013132416.oni"/>
+	
+	
+	<rec audio="audio/04.wav" left="recs/kinectRecord_0_152013132447.oni" right="recs/kinectRecord_1_152013132447.oni"/>
+	<rec audio="audio/05.wav" left="recs/kinectRecord_0_15201313252.oni" right="recs/kinectRecord_1_15201313252.oni" description="2502 or 2052"/>
+	<rec audio="audio/06.wav" left="recs/kinectRecord_0_152013132455.oni" right="recs/kinectRecord_1_152013132455.oni"/>
+	<rec audio="audio/07.wav" left="recs/kinectRecord_0_15201313259.oni" right="recs/kinectRecord_1_15201313259.oni" description="2509 or 2059"/>
+	
+	<rec audio="audio/08.wav" left="recs/kinectRecord_0_152013132524.oni" right="recs/kinectRecord_1_152013132524.oni"/>
+	<rec audio="audio/09.wav" left="recs/kinectRecord_0_152013132532.oni" right="recs/kinectRecord_1_152013132532.oni"/>
+	<rec audio="audio/10.wav" left="recs/kinectRecord_0_152013132542.oni" right="recs/kinectRecord_1_152013132542.oni"/>
+	<rec audio="audio/11.wav" left="recs/kinectRecord_0_152013132550.oni" right="recs/kinectRecord_1_152013132550.oni"/>
+	
+	<rec audio="audio/101.wav" left="recs/kinectRecord_0_152013132915.oni" right="recs/kinectRecord_1_152013132915.oni"/>
+	<rec audio="audio/102.wav" left="recs/kinectRecord_0_152013132923.oni" right="recs/kinectRecord_1_152013132923.oni"/>
+	<rec audio="audio/103.wav" left="recs/kinectRecord_0_152013132931.oni" right="recs/kinectRecord_1_152013132931.oni"/>
+	<rec audio="audio/104.wav" left="recs/kinectRecord_0_152013132940.oni" right="recs/kinectRecord_1_152013132940.oni"/>
+	<rec audio="audio/105.wav" left="recs/kinectRecord_0_152013132947.oni" right="recs/kinectRecord_1_152013132947.oni"/>
+	<rec audio="audio/106.wav" left="recs/kinectRecord_0_152013132954.oni" right="recs/kinectRecord_1_152013132954.oni"/>
+	
+	<rec audio="audio/107.wav" left="recs/kinectRecord_0_15201313304.oni" right="recs/kinectRecord_1_15201313304.oni" description="3004"/>
+	<rec audio="audio/108.wav" left="recs/kinectRecord_0_152013133011.oni" right="recs/kinectRecord_1_152013133011.oni"/>
+	<rec audio="audio/109.wav" left="recs/kinectRecord_0_152013133020.oni" right="recs/kinectRecord_1_152013133020.oni"/>
+	<rec audio="audio/110.wav" left="recs/kinectRecord_0_152013133029.oni" right="recs/kinectRecord_1_152013133029.oni"/>
+	<rec audio="audio/111.wav" left="recs/kinectRecord_0_152013133037.oni" right="recs/kinectRecord_1_152013133037.oni" description="BIG"/>
+	
+	<rec audio="audio/201.wav" left="recs/kinectRecord_0_152013133137.oni" right="recs/kinectRecord_1_152013133137.oni" description="BIG"/>	
+	<rec audio="audio/301.wav" left="recs/kinectRecord_0_152013133530.oni" right="recs/kinectRecord_1_152013133530.oni"/>
+	<rec audio="audio/302.wav" left="recs/kinectRecord_0_152013133539.oni" right="recs/kinectRecord_1_152013133539.oni"/>
+	<rec audio="audio/303.wav" left="recs/kinectRecord_0_152013133548.oni" right="recs/kinectRecord_1_152013133548.oni"/>
+	
+	<rec audio="audio/304.wav" left="recs/kinectRecord_0_152013133618.oni" right="recs/kinectRecord_1_152013133618.oni"/>
+	<rec audio="audio/305.wav" left="recs/kinectRecord_0_152013133627.oni" right="recs/kinectRecord_1_152013133627.oni"/>
+	<rec audio="audio/306.wav" left="recs/kinectRecord_0_152013133634.oni" right="recs/kinectRecord_1_152013133634.oni"/>
+	<rec  left="recs/kinectRecord_0_152013133641.oni" right="recs/kinectRecord_1_152013133641.oni"/>
+	<rec  left="recs/kinectRecord_0_152013133648.oni" right="recs/kinectRecord_1_152013133648.oni"/>
+	<rec  left="recs/kinectRecord_0_152013133656.oni" right="recs/kinectRecord_1_152013133656.oni"/>
+	<rec  left="recs/kinectRecord_0_15201313377.oni" right="recs/kinectRecord_1_15201313377.oni" description="3707"/>
+	<rec  left="recs/kinectRecord_0_152013133714.oni" right="recs/kinectRecord_1_152013133714.oni"/>
+	<rec left="recs/kinectRecord_0_152013133744.oni" right="recs/kinectRecord_1_152013133744.oni" description="BIG"/>
+	<rec left="recs/kinectRecord_0_152013133848.oni" right="recs/kinectRecord_1_152013133848.oni" description="BIG"/>
+	<rec left="recs/kinectRecord_0_152013134138.oni" right="recs/kinectRecord_1_152013134138.oni" description="BIG"/>
+</TRSS>
+<TRSS>
+	<rec left="recs/kinectRecord_0_15201313189.oni" right="recs/kinectRecord_1_15201313189.oni" description="1809 box shot 1"/>
+
+	<rec left="recs/kinectRecord_0_15201313326.oni" right="recs/kinectRecord_1_15201313326.oni" description="3206"/>
+
+	<rec audio="audio/04.wav" left="recs/kinectRecord_0_152013132426.oni" right="recs/kinectRecord_1_152013132426.oni"/>
+	<rec audio="audio/04.wav" left="recs/kinectRecord_0_152013132439.oni" right="recs/kinectRecord_1_152013132439.oni"/>
+
+	<rec audio="audio/08.wav" left="recs/kinectRecord_0_152013132517.oni" right="recs/kinectRecord_1_152013132517.oni"/>
+
+	<rec audio="audio/101.wav" left="recs/kinectRecord_0_15201313295.oni" right="recs/kinectRecord_1_15201313295.oni" description="2905"/>
+
+	<rec audio="audio/107.wav" left="recs/kinectRecord_0_15201313300.oni" right="recs/kinectRecord_1_15201313300.oni" description="3000"/>
+
+	<rec audio="audio/201.wav" left="recs/kinectRecord_0_152013133128.oni" right="recs/kinectRecord_1_152013133128.oni" />
+
+	<rec audio="audio/304.wav" left="recs/kinectRecord_0_152013133557.oni" right="recs/kinectRecord_1_152013133557.oni"/>
+	<rec audio="audio/304.wav" left="recs/kinectRecord_0_15201313364.oni" right="recs/kinectRecord_1_15201313364.oni" description="3604"/>
+		
+	<rec left="recs/kinectRecord_0_152013105138.oni" right="recs/kinectRecord_1_152013105138.oni"/>
+	<rec left="recs/kinectRecord_0_152013105352.oni" right="recs/kinectRecord_1_152013105352.oni"/>
+	<rec left="recs/kinectRecord_0_15201312253.oni" right="recs/kinectRecord_1_15201312253.oni"/>
+	<rec left="recs/kinectRecord_0_152013131850.oni" right="recs/kinectRecord_1_152013131850.oni"/>
+
+	<rec left="recs/kinectRecord_0_3042013212620.oni" right="recs/kinectRecord_1_3042013212620.oni"/>
+	<rec left="recs/kinectRecord_0_3042013213029.oni" right="recs/kinectRecord_1_3042013213029.oni"/>
+	<rec left="recs/kinectRecord_0_304201321304.oni" right="recs/kinectRecord_1_304201321304.oni"/>
+	<rec left="recs/kinectRecord_0_3042013213141.oni" right="recs/kinectRecord_1_3042013213141.oni"/>
+	<rec left="recs/kinectRecord_0_304201321326.oni" right="recs/kinectRecord_1_304201321326.oni"/>
+	<rec left="recs/kinectRecord_0_3042013213625.oni" right="recs/kinectRecord_1_3042013213625.oni"/>
+	<rec left="recs/kinectRecord_0_3042013214949.oni" right="recs/kinectRecord_1_3042013214949.oni"/>
+	<rec left="recs/kinectRecord_0_3042013215132.oni" right="recs/kinectRecord_1_3042013215132.oni"/>
+	<rec left="recs/kinectRecord_0_3042013215311.oni" right="recs/kinectRecord_1_3042013215311.oni"/>
+	<rec left="recs/kinectRecord_0_304201322041.oni" right="recs/kinectRecord_1_304201322041.oni"/>
+	<rec left="recs/kinectRecord_0_3042013221151.oni" right="recs/kinectRecord_1_3042013221151.oni"/>
+</TRSS>
+
+#48 tracks
+#36 audio, long ones 1,24,36
+#11 segments in poem
+# long + take + take + long + take + long seems correct!
+# how wrong we can be
\ No newline at end of file
diff --git a/06_performance/bin/data/black.mp4 b/06_performance/bin/data/black.mp4
new file mode 100644
index 0000000..0da6796
--- /dev/null
+++ b/06_performance/bin/data/black.mp4
diff --git a/06_performance/bin/data/black.png b/06_performance/bin/data/black.png
new file mode 100644
index 0000000..3437bb5
--- /dev/null
+++ b/06_performance/bin/data/black.png
diff --git a/06_performance/bin/data/verdana.ttf b/06_performance/bin/data/verdana.ttf
new file mode 100755
index 0000000..8f25a64
--- /dev/null
+++ b/06_performance/bin/data/verdana.ttf