# HG changeset patch
# User drewp@bigasterisk.com
# Date 2011-06-18 21:06:22
# Node ID 4787d81686f9e886f64f983611c54d480bc7908f
# Parent 394146952d5bae02a61cc8c65e45cd455b7da063
cp
Ignore-this: be4e52d61e9a01850333baf62fe49b3
diff --git a/show/dance2011/.light9-window-geometry-subcomposer b/show/dance2011/.light9-window-geometry-subcomposer
new file mode 100644
--- /dev/null
+++ b/show/dance2011/.light9-window-geometry-subcomposer
@@ -0,0 +1,1 @@
+297x613+1912+221
\ No newline at end of file
diff --git a/show/dance2011/config.n3 b/show/dance2011/config.n3
--- a/show/dance2011/config.n3
+++ b/show/dance2011/config.n3
@@ -19,8 +19,8 @@ show:dance2011 :playList (
show:dance2011 :networking sh:netHome .
sh:netHome
- :musicPlayer ;
- :dmxServer ;
+ :musicPlayer ;
+ :dmxServer ;
:keyboardComposer .
:Song is rdf:type of sh:song1, sh:song2, sh:song3, sh:song4,
@@ -28,7 +28,7 @@ sh:netHome
sh:song11, sh:song12, sh:song13, sh:song14, sh:song15, sh:song16,
sh:song17 .
-show:dance2011 :musicRoot "/my/music/projects/sharlyn2011/final/norm/pad" .
+show:dance2011 :musicRoot "/home/drewp/projects/light9/show/dance2011/music/final/norm/pad" .
sh:song1 rdfs:label "1 opening"; :songFilename "01-opening.wav" .
sh:song2 rdfs:label "2 "; :songFilename "02-mix.wav" .
diff --git a/show/dance2011/curves/song1-cyc b/show/dance2011/curves/song1-cyc
--- a/show/dance2011/curves/song1-cyc
+++ b/show/dance2011/curves/song1-cyc
@@ -1,2 +1,2 @@
-0 0
-228.482585034 0
+0.0 0.0
+228.482585034 0.0
diff --git a/show/dance2011/curves/song1-other1 b/show/dance2011/curves/song1-other1
--- a/show/dance2011/curves/song1-other1
+++ b/show/dance2011/curves/song1-other1
@@ -1,2 +1,2 @@
-0 0
-228.482585034 0
+0.0 0.0
+228.482585034 0.0
diff --git a/show/dance2011/curves/song1-song01 b/show/dance2011/curves/song1-song01
--- a/show/dance2011/curves/song1-song01
+++ b/show/dance2011/curves/song1-song01
@@ -1,5 +1,6 @@
0.0 0.0
37.902661925 0.0106382978723
40.3573082659 0.659574468085
-90.9867096873 0.755319148936
+87.5193222147 0.755319148936
+144.71780346 0
228.482585034 0.0
diff --git a/show/dance2011/makefile b/show/dance2011/makefile
--- a/show/dance2011/makefile
+++ b/show/dance2011/makefile
@@ -1,2 +1,2 @@
patch.n3: patch-source.n3 patch-rules.n3
- python2.5 `which cwm` patch-source.n3 --filter=patch-rules.n3 --n3=/ > patch.n3
\ No newline at end of file
+ python2.6 /usr/local/bin/cwm patch-source.n3 --filter=patch-rules.n3 --n3=/ > patch.n3
diff --git a/show/dance2011/patch-source.n3 b/show/dance2011/patch-source.n3
--- a/show/dance2011/patch-source.n3
+++ b/show/dance2011/patch-source.n3
@@ -21,52 +21,54 @@
[ :name "red3"; :output dmx:c32 ] .
[ :name "red4"; :output dmx:c36 ] .
[ :name "upright"; :output dmx:c37 ] .
-[ :name "upcenter"; :output dmx:c38 ] .
+[ :name "upleft"; :output dmx:c38 ] .
# 35 blue has a white in it too
+# nice rhyme, drew
-[ :name "b11-C-b"; :output dmx:c54 ] .
-[ :name "b12-L-p"; :output dmx:c53 ] .
-[ :name "b13-C-r"; :output dmx:c52 ] .
-[ :name "b14-L-#"; :output dmx:c51 ] .
-[ :name "b15-R"; :output dmx:c50 ] .
-[ :name "b16-R-r"; :output dmx:c49 ] .
-[ :name "b21-R-c"; :output dmx:c55 ] .
-[ :name "b22-L-w"; :output dmx:c56 ] .
-[ :name "b23-L-b"; :output dmx:c57 ] .
-[ :name "b24-R-b"; :output dmx:c58 ] .
-[ :name "b25-R-w"; :output dmx:c59 ] .
-[ :name "b26-L-c"; :output dmx:c60 ] .
-[ :name "b31-L-r"; :output dmx:c61 ] .
-[ :name "b32-L"; :output dmx:c62 ] .
-[ :name "b33-R-#"; :output dmx:c63 ] .
-[ :name "b34-C-r"; :output dmx:c64 ] .
-[ :name "b35-L-p"; :output dmx:c65 ] .
-[ :name "b36-C-b"; :output dmx:c66 ] .
+[ :name "b11-#-c"; :output dmx:c54 ] .
+[ :name "b12-p-r"; :output dmx:c53 ] .
+[ :name "b13-fos-l"; :output dmx:c52 ] .
+[ :name "b14-b-c"; :output dmx:c51 ] .
+[ :name "b15-c-r"; :output dmx:c50 ] .
+[ :name "b16-r-r"; :output dmx:c49 ] .
+[ :name "b21-c-l"; :output dmx:c55 ] .
+[ :name "b22-fos-c"; :output dmx:c56 ] .
+[ :name "b23x"; :output dmx:c57 ] .
+[ :name "b24-w-l"; :output dmx:c58 ] .
+[ :name "b25-w-r"; :output dmx:c59 ] .
+[ :name "b26-c-r"; :output dmx:c60 ] .
+[ :name "b31-r-l"; :output dmx:c61 ] .
+[ :name "b32-c-l"; :output dmx:c62 ] .
+[ :name "b33-b-c"; :output dmx:c63 ] .
+[ :name "b34-fos-r"; :output dmx:c64 ] .
+[ :name "b35-p-l"; :output dmx:c65 ] .
+[ :name "b36-#-c"; :output dmx:c66 ] .
[ :name "post-l"; :output dmx:c45 ] .
[ :name "post-r"; :output dmx:c46 ] .
[ :name "s40x"; :output dmx:c40 ] .
-[ :name "front1"; :output dmx:c1 ] .
-[ :name "front2x"; :output dmx:c2 ] .
-[ :name "front3"; :output dmx:c3 ] .
-[ :name "front4"; :output dmx:c4 ] .
-[ :name "front5"; :output dmx:c5 ] .
-[ :name "front6"; :output dmx:c6 ] .
+
+[ :name "front1-l"; :output dmx:c1 ] .
+[ :name "front2-l"; :output dmx:c2 ] .
+[ :name "front3-l3"; :output dmx:c3 ] .
+[ :name "front4-r"; :output dmx:c4 ] .
+[ :name "front5-l"; :output dmx:c5 ] .
+[ :name "front6-pool"; :output dmx:c6 ] .
[ :name "sharlyn"; :output dmx:c7 ] .
-[ :name "front8"; :output dmx:c8 ] .
-[ :name "front9"; :output dmx:c9 ] .
-[ :name "front10"; :output dmx:c10 ] .
-[ :name "front11"; :output dmx:c11 ] .
-[ :name "front12"; :output dmx:c12 ] .
+[ :name "front8-r"; :output dmx:c8 ] .
+[ :name "front9-l"; :output dmx:c9 ] .
+[ :name "front10-r3"; :output dmx:c10 ] .
+[ :name "front11-c"; :output dmx:c11 ] .
+[ :name "front12-crap"; :output dmx:c12 ] .
[ :name "strobe"; :output dmx:c14 ] .
[ :name "blacklight"; :output dmx:c15 ] .
-[ :name "down-r"; :output dmx:c16 ] .
-[ :name "down-l"; :output dmx:c17 ] .
-[ :name "fr18x"; :output dmx:c18 ] .
-[ :name "down-c"; :output dmx:c19 ] .
-[ :name "fr20x"; :output dmx:c20 ] .
+[ :name "down-l"; :output dmx:c16 ] .
+[ :name "down-l-P"; :output dmx:c17 ] .
+[ :name "down-c"; :output dmx:c18 ] .
+[ :name "down-r-P"; :output dmx:c19 ] .
+[ :name "down-r"; :output dmx:c20 ] .
[ :name "cyc-right"; :output dmx:c41 ] .
[ :name "cyc-mid"; :output dmx:c43 ] .
diff --git a/show/dance2011/patch.n3 b/show/dance2011/patch.n3
--- a/show/dance2011/patch.n3
+++ b/show/dance2011/patch.n3
@@ -1,86 +1,86 @@
#Processed by Id: cwm.py,v 1.197 2007/12/13 15:38:39 syosi Exp
- # using base file:///home/dmcc/rev/light9/show/dance2010/patch-source.n3
+ # using base file:///home/drewp/projects/light9/show/dance2011/patch-source.n3
# Notation3 generation by
# notation3.py,v 1.200 2007/12/11 21:18:08 syosi Exp
-# Base was: file:///home/dmcc/rev/light9/show/dance2010/patch-source.n3
+# Base was: file:///home/drewp/projects/light9/show/dance2011/patch-source.n3
@prefix : .
@prefix ch: .
@prefix dmx: .
@prefix rdfs: .
- ch:b11-C-b a :Channel;
+ a :Channel;
:output dmx:c54;
- rdfs:label "b11-C-b" .
+ rdfs:label "b11-#-c" .
- ch:b12-L-p a :Channel;
+ ch:b12-p-r a :Channel;
:output dmx:c53;
- rdfs:label "b12-L-p" .
+ rdfs:label "b12-p-r" .
- ch:b13-C-r a :Channel;
+ ch:b13-fos-l a :Channel;
:output dmx:c52;
- rdfs:label "b13-C-r" .
+ rdfs:label "b13-fos-l" .
- a :Channel;
+ ch:b14-b-c a :Channel;
:output dmx:c51;
- rdfs:label "b14-L-#" .
+ rdfs:label "b14-b-c" .
- ch:b15-R a :Channel;
+ ch:b15-c-r a :Channel;
:output dmx:c50;
- rdfs:label "b15-R" .
+ rdfs:label "b15-c-r" .
- ch:b16-R-r a :Channel;
+ ch:b16-r-r a :Channel;
:output dmx:c49;
- rdfs:label "b16-R-r" .
+ rdfs:label "b16-r-r" .
- ch:b21-R-c a :Channel;
+ ch:b21-c-l a :Channel;
:output dmx:c55;
- rdfs:label "b21-R-c" .
+ rdfs:label "b21-c-l" .
- ch:b22-L-w a :Channel;
+ ch:b22-fos-c a :Channel;
:output dmx:c56;
- rdfs:label "b22-L-w" .
+ rdfs:label "b22-fos-c" .
- ch:b23-L-b a :Channel;
+ ch:b23x a :Channel;
:output dmx:c57;
- rdfs:label "b23-L-b" .
+ rdfs:label "b23x" .
- ch:b24-R-b a :Channel;
+ ch:b24-w-l a :Channel;
:output dmx:c58;
- rdfs:label "b24-R-b" .
+ rdfs:label "b24-w-l" .
- ch:b25-R-w a :Channel;
+ ch:b25-w-r a :Channel;
:output dmx:c59;
- rdfs:label "b25-R-w" .
+ rdfs:label "b25-w-r" .
- ch:b26-L-c a :Channel;
+ ch:b26-c-r a :Channel;
:output dmx:c60;
- rdfs:label "b26-L-c" .
+ rdfs:label "b26-c-r" .
- ch:b31-L-r a :Channel;
+ ch:b31-r-l a :Channel;
:output dmx:c61;
- rdfs:label "b31-L-r" .
+ rdfs:label "b31-r-l" .
- ch:b32-L a :Channel;
+ ch:b32-c-l a :Channel;
:output dmx:c62;
- rdfs:label "b32-L" .
+ rdfs:label "b32-c-l" .
- a :Channel;
+ ch:b33-b-c a :Channel;
:output dmx:c63;
- rdfs:label "b33-R-#" .
+ rdfs:label "b33-b-c" .
- ch:b34-C-r a :Channel;
+ ch:b34-fos-r a :Channel;
:output dmx:c64;
- rdfs:label "b34-C-r" .
+ rdfs:label "b34-fos-r" .
- ch:b35-L-p a :Channel;
+ ch:b35-p-l a :Channel;
:output dmx:c65;
- rdfs:label "b35-L-p" .
+ rdfs:label "b35-p-l" .
- ch:b36-C-b a :Channel;
+ a :Channel;
:output dmx:c66;
- rdfs:label "b36-C-b" .
+ rdfs:label "b36-#-c" .
ch:blacklight a :Channel;
:output dmx:c15;
@@ -115,68 +115,68 @@
rdfs:label "cyc-right" .
ch:down-c a :Channel;
- :output dmx:c19;
+ :output dmx:c18;
rdfs:label "down-c" .
ch:down-l a :Channel;
- :output dmx:c17;
+ :output dmx:c16;
rdfs:label "down-l" .
+ ch:down-l-P a :Channel;
+ :output dmx:c17;
+ rdfs:label "down-l-P" .
+
ch:down-r a :Channel;
- :output dmx:c16;
+ :output dmx:c20;
rdfs:label "down-r" .
- ch:fr18x a :Channel;
- :output dmx:c18;
- rdfs:label "fr18x" .
+ ch:down-r-P a :Channel;
+ :output dmx:c19;
+ rdfs:label "down-r-P" .
- ch:fr20x a :Channel;
- :output dmx:c20;
- rdfs:label "fr20x" .
-
- ch:front1 a :Channel;
+ ch:front1-l a :Channel;
:output dmx:c1;
- rdfs:label "front1" .
+ rdfs:label "front1-l" .
- ch:front10 a :Channel;
+ ch:front10-r3 a :Channel;
:output dmx:c10;
- rdfs:label "front10" .
+ rdfs:label "front10-r3" .
- ch:front11 a :Channel;
+ ch:front11-c a :Channel;
:output dmx:c11;
- rdfs:label "front11" .
+ rdfs:label "front11-c" .
- ch:front12 a :Channel;
+ ch:front12-crap a :Channel;
:output dmx:c12;
- rdfs:label "front12" .
+ rdfs:label "front12-crap" .
- ch:front2x a :Channel;
+ ch:front2-l a :Channel;
:output dmx:c2;
- rdfs:label "front2x" .
+ rdfs:label "front2-l" .
- ch:front3 a :Channel;
+ ch:front3-l3 a :Channel;
:output dmx:c3;
- rdfs:label "front3" .
+ rdfs:label "front3-l3" .
- ch:front4 a :Channel;
+ ch:front4-r a :Channel;
:output dmx:c4;
- rdfs:label "front4" .
+ rdfs:label "front4-r" .
- ch:front5 a :Channel;
+ ch:front5-l a :Channel;
:output dmx:c5;
- rdfs:label "front5" .
+ rdfs:label "front5-l" .
- ch:front6 a :Channel;
+ ch:front6-pool a :Channel;
:output dmx:c6;
- rdfs:label "front6" .
+ rdfs:label "front6-pool" .
- ch:front8 a :Channel;
+ ch:front8-r a :Channel;
:output dmx:c8;
- rdfs:label "front8" .
+ rdfs:label "front8-r" .
- ch:front9 a :Channel;
+ ch:front9-l a :Channel;
:output dmx:c9;
- rdfs:label "front9" .
+ rdfs:label "front9-l" .
ch:gree1 a :Channel;
:output dmx:c22;
@@ -266,9 +266,9 @@
:output dmx:c14;
rdfs:label "strobe" .
- ch:upcenter a :Channel;
+ ch:upleft a :Channel;
:output dmx:c38;
- rdfs:label "upcenter" .
+ rdfs:label "upleft" .
ch:upright a :Channel;
:output dmx:c37;
diff --git a/show/dance2011/readme b/show/dance2011/readme
--- a/show/dance2011/readme
+++ b/show/dance2011/readme
@@ -16,4 +16,18 @@ OK factor out music dir so it can be dif
- vidref's replay 'enabled' button should be completely sticky across sessions
- audio process pipeline; RDF graph should track versions of songs (padded, normalized)
+- subcomposter needs refresh
+
+bring:
+500W bulbs
+gels
+blackwrap
+flashlight
+
+shopping:
+500W bulbs
+AA batts
+
+todo:
+vidref raise for musicScale race condition
\ No newline at end of file
diff --git a/show/dance2011/subs/b-all b/show/dance2011/subs/b-all
new file mode 100644
--- /dev/null
+++ b/show/dance2011/subs/b-all
@@ -0,0 +1,43 @@
+_:ctBVxUFA256 "1"^^.
+_:ctBVxUFA256 .
+_:ctBVxUFA255 "1"^^.
+_:ctBVxUFA255 .
+_:ctBVxUFA250 "1"^^.
+_:ctBVxUFA250 .
+ "b-all".
+ _:ctBVxUFA256.
+ _:ctBVxUFA255.
+ _:ctBVxUFA250.
+ _:ctBVxUFA246.
+ _:ctBVxUFA247.
+ _:ctBVxUFA254.
+ _:ctBVxUFA251.
+ _:ctBVxUFA252.
+ _:ctBVxUFA249.
+ _:ctBVxUFA253.
+ _:ctBVxUFA248.
+ _:ctBVxUFA257.
+ _:ctBVxUFA258.
+ _:ctBVxUFA259.
+_:ctBVxUFA246 "1"^^.
+_:ctBVxUFA246 .
+_:ctBVxUFA247 "1"^^.
+_:ctBVxUFA247 .
+_:ctBVxUFA254 "1"^^.
+_:ctBVxUFA254 .
+_:ctBVxUFA251 "1"^^.
+_:ctBVxUFA251 .
+_:ctBVxUFA252 "1"^^.
+_:ctBVxUFA252 .
+_:ctBVxUFA249 "1"^^.
+_:ctBVxUFA249 .
+_:ctBVxUFA253 "1"^^.
+_:ctBVxUFA253 .
+_:ctBVxUFA248 "1"^^.
+_:ctBVxUFA248 .
+_:ctBVxUFA257 "1"^^.
+_:ctBVxUFA257 .
+_:ctBVxUFA258 "1"^^.
+_:ctBVxUFA258 .
+_:ctBVxUFA259 "1"^^.
+_:ctBVxUFA259 .
diff --git a/show/dance2011/subs/b-cool b/show/dance2011/subs/b-cool
new file mode 100644
--- /dev/null
+++ b/show/dance2011/subs/b-cool
@@ -0,0 +1,13 @@
+_:WakxhKmO107 .
+_:WakxhKmO107 "1"^^.
+_:WakxhKmO110 .
+_:WakxhKmO110 "1"^^.
+ _:WakxhKmO109.
+ _:WakxhKmO107.
+ _:WakxhKmO108.
+ _:WakxhKmO110.
+ "b-cool".
+_:WakxhKmO108 .
+_:WakxhKmO108 "1"^^.
+_:WakxhKmO109 .
+_:WakxhKmO109 "1"^^.
diff --git a/show/dance2011/subs/b-red b/show/dance2011/subs/b-red
new file mode 100644
--- /dev/null
+++ b/show/dance2011/subs/b-red
@@ -0,0 +1,7 @@
+ "b-red".
+ _:WakxhKmO118.
+ _:WakxhKmO117.
+_:WakxhKmO118 "1"^^.
+_:WakxhKmO118 .
+_:WakxhKmO117 "1"^^.
+_:WakxhKmO117 .
diff --git a/show/dance2011/subs/b-warm b/show/dance2011/subs/b-warm
new file mode 100644
--- /dev/null
+++ b/show/dance2011/subs/b-warm
@@ -0,0 +1,7 @@
+_:WakxhKmO113 "1"^^.
+_:WakxhKmO113 .
+ "b-warm".
+ _:WakxhKmO113.
+ _:WakxhKmO114.
+_:WakxhKmO114 "1"^^.
+_:WakxhKmO114 .
diff --git a/show/dance2011/subs/blacklight b/show/dance2011/subs/blacklight
new file mode 100644
--- /dev/null
+++ b/show/dance2011/subs/blacklight
@@ -0,0 +1,4 @@
+ _:RLmhMUpk86.
+ "blacklight".
+_:RLmhMUpk86 .
+_:RLmhMUpk86 "1"^^.
diff --git a/show/dance2011/subs/blue b/show/dance2011/subs/blue
new file mode 100644
--- /dev/null
+++ b/show/dance2011/subs/blue
@@ -0,0 +1,13 @@
+_:amWXRCkA38 .
+_:amWXRCkA38 "1"^^.
+ _:amWXRCkA38.
+ _:amWXRCkA37.
+ _:amWXRCkA39.
+ _:amWXRCkA40.
+ "blue".
+_:amWXRCkA37 .
+_:amWXRCkA37 "1"^^.
+_:amWXRCkA39 .
+_:amWXRCkA39 "1"^^.
+_:amWXRCkA40 .
+_:amWXRCkA40 "1"^^.
diff --git a/show/dance2011/subs/crap b/show/dance2011/subs/crap
new file mode 100644
--- /dev/null
+++ b/show/dance2011/subs/crap
@@ -0,0 +1,64 @@
+_:XrNmWuMQ110 .
+_:XrNmWuMQ110 "1"^^.
+_:XrNmWuMQ109 .
+_:XrNmWuMQ109 "1"^^.
+_:XrNmWuMQ115 .
+_:XrNmWuMQ115 "1"^^.
+_:XrNmWuMQ121 .
+_:XrNmWuMQ121 "1"^^.
+_:XrNmWuMQ122 .
+_:XrNmWuMQ122 "1"^^.
+_:XrNmWuMQ108 .
+_:XrNmWuMQ108 "1"^^.
+_:XrNmWuMQ116 .
+_:XrNmWuMQ116 "1"^^.
+_:XrNmWuMQ107 .
+_:XrNmWuMQ107 "1"^^.
+_:XrNmWuMQ125 .
+_:XrNmWuMQ125 "1"^^.
+_:XrNmWuMQ119 .
+_:XrNmWuMQ119 "1"^^.
+_:XrNmWuMQ114 .
+_:XrNmWuMQ114 "1"^^.
+_:XrNmWuMQ123 .
+_:XrNmWuMQ123 "1"^^.
+ _:XrNmWuMQ119.
+ _:XrNmWuMQ126.
+ _:XrNmWuMQ110.
+ _:XrNmWuMQ113.
+ _:XrNmWuMQ115.
+ _:XrNmWuMQ122.
+ _:XrNmWuMQ112.
+ _:XrNmWuMQ127.
+ _:XrNmWuMQ109.
+ _:XrNmWuMQ114.
+ _:XrNmWuMQ108.
+ _:XrNmWuMQ116.
+ _:XrNmWuMQ117.
+