diff --git a/light9/networking.py b/light9/networking.py --- a/light9/networking.py +++ b/light9/networking.py @@ -20,7 +20,7 @@ def musicPort(): def mpdServer(): """servername, port""" - return os.getenv('LIGHT9_MPD_SERVER', 'score'),6600 + return os.getenv('LIGHT9_MPD_SERVER', 'django'),6600 def kcPort(): return 8050 diff --git a/show/dance2010/patch-source.n3 b/show/dance2010/patch-source.n3 --- a/show/dance2010/patch-source.n3 +++ b/show/dance2010/patch-source.n3 @@ -24,24 +24,24 @@ [ :name "upcenter"; :output dmx:c38 ] . # 35 blue has a white in it too -[ :name "b11"; :output dmx:c54 ] . -[ :name "b12-r"; :output dmx:c53 ] . -[ :name "b13-b"; :output dmx:c52 ] . -[ :name "b14"; :output dmx:c51 ] . -[ :name "b15-p"; :output dmx:c50 ] . -[ :name "b16"; :output dmx:c49 ] . -[ :name "b21-p"; :output dmx:c55 ] . -[ :name "b22-b"; :output dmx:c56 ] . -[ :name "b23-b"; :output dmx:c57 ] . -[ :name "b24-b"; :output dmx:c58 ] . -[ :name "b25-r"; :output dmx:c59 ] . -[ :name "b26"; :output dmx:c60 ] . -[ :name "b31"; :output dmx:c61 ] . -[ :name "b32"; :output dmx:c62 ] . -[ :name "b33-r"; :output dmx:c63 ] . -[ :name "b34-b"; :output dmx:c64 ] . -[ :name "b35-p"; :output dmx:c65 ] . -[ :name "b36"; :output dmx:c66 ] . +[ :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 "post-l"; :output dmx:c45 ] . [ :name "post-r"; :output dmx:c46 ] . diff --git a/show/dance2010/patch.n3 b/show/dance2010/patch.n3 --- a/show/dance2010/patch.n3 +++ b/show/dance2010/patch.n3 @@ -10,77 +10,77 @@ @prefix dmx: . @prefix rdfs: . - ch:b11 a :Channel; + ch:b11-C-b a :Channel; :output dmx:c54; - rdfs:label "b11" . + rdfs:label "b11-C-b" . - ch:b12-r a :Channel; + ch:b12-L-p a :Channel; :output dmx:c53; - rdfs:label "b12-r" . + rdfs:label "b12-L-p" . - ch:b13-b a :Channel; + ch:b13-C-r a :Channel; :output dmx:c52; - rdfs:label "b13-b" . + rdfs:label "b13-C-r" . - ch:b14 a :Channel; + a :Channel; :output dmx:c51; - rdfs:label "b14" . + rdfs:label "b14-L-#" . - ch:b15-p a :Channel; + ch:b15-R a :Channel; :output dmx:c50; - rdfs:label "b15-p" . + rdfs:label "b15-R" . - ch:b16 a :Channel; + ch:b16-R-r a :Channel; :output dmx:c49; - rdfs:label "b16" . + rdfs:label "b16-R-r" . - ch:b21-p a :Channel; + ch:b21-R-c a :Channel; :output dmx:c55; - rdfs:label "b21-p" . + rdfs:label "b21-R-c" . - ch:b22-b a :Channel; + ch:b22-L-w a :Channel; :output dmx:c56; - rdfs:label "b22-b" . + rdfs:label "b22-L-w" . - ch:b23-b a :Channel; + ch:b23-L-b a :Channel; :output dmx:c57; - rdfs:label "b23-b" . + rdfs:label "b23-L-b" . - ch:b24-b a :Channel; + ch:b24-R-b a :Channel; :output dmx:c58; - rdfs:label "b24-b" . + rdfs:label "b24-R-b" . - ch:b25-r a :Channel; + ch:b25-R-w a :Channel; :output dmx:c59; - rdfs:label "b25-r" . + rdfs:label "b25-R-w" . - ch:b26 a :Channel; + ch:b26-L-c a :Channel; :output dmx:c60; - rdfs:label "b26" . + rdfs:label "b26-L-c" . - ch:b31 a :Channel; + ch:b31-L-r a :Channel; :output dmx:c61; - rdfs:label "b31" . + rdfs:label "b31-L-r" . - ch:b32 a :Channel; + ch:b32-L a :Channel; :output dmx:c62; - rdfs:label "b32" . + rdfs:label "b32-L" . - ch:b33-r a :Channel; + a :Channel; :output dmx:c63; - rdfs:label "b33-r" . + rdfs:label "b33-R-#" . - ch:b34-b a :Channel; + ch:b34-C-r a :Channel; :output dmx:c64; - rdfs:label "b34-b" . + rdfs:label "b34-C-r" . - ch:b35-p a :Channel; + ch:b35-L-p a :Channel; :output dmx:c65; - rdfs:label "b35-p" . + rdfs:label "b35-L-p" . - ch:b36 a :Channel; + ch:b36-C-b a :Channel; :output dmx:c66; - rdfs:label "b36" . + rdfs:label "b36-C-b" . ch:blacklight a :Channel; :output dmx:c15;