Mercurial > code > home > repos > light9

changeset 1431:f85cc11b3e8c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
checkpoint show data Ignore-this: 7dc477a7921f92dc9cc8115c6cc2b9cf
author drewp@bigasterisk.com
date Sat, 11 Jun 2016 17:15:30 +0000
parents 16599857ef66
children 185f3e2208c3
files show/dance2016/networking.n3 show/dance2016/playlist.n3 show/dance2016/song1.n3 show/dance2016/vidrefConfig.n3
diffstat 4 files changed, 46 insertions(+), 20 deletions(-) [+]
line wrap: on
line diff
--- a/show/dance2016/networking.n3	Sat Jun 11 17:40:22 2016 +0000
+++ b/show/dance2016/networking.n3	Sat Jun 11 17:15:30 2016 +0000
@@ -4,21 +4,21 @@
 
 show:dance2016 :networking sh:netHome .
 sh:netHome
-  :webServer        <http://dash:8200/>;
-  :patchReceiverUpdateHost "dash";
-  :curveCalc        <http://dash:8201/>;
-  :collector        <http://dash:8202/>;
-  :collectorZmq     <http://dash:8203/>;
-  :effectEval       <http://dash:8204/>;
-  :effectSequencer  <http://dash:8213/>;
-  :keyboardComposer <http://dash:8205/>;
-  :musicPlayer      <http://dash:8206/>;
-  :oscDmxServer     <udp://dash:8207/>;
-  :picamserve       <http://10.1.0.103:8208/>;
-  :rdfdb            <http://dash:8209/>;
-  :subComposer      <http://dash:8210/>;
-  :subServer        <http://dash:8211/>;
-  :vidref           <http://dash:8212/> .
+  :webServer        <http://plus:8200/>;
+  :patchReceiverUpdateHost "plus";
+  :curveCalc        <http://plus:8201/>;
+  :collector        <http://plus:8202/>;
+  :collectorZmq     <http://plus:8203/>;
+  :effectEval       <http://plus:8204/>;
+  :effectSequencer  <http://plus:8213/>;
+  :keyboardComposer <http://plus:8205/>;
+  :musicPlayer      <http://plus:8206/>;
+  :oscDmxServer     <udp://plus:8207/>;
+  :picamserve       <http://10.2.0.5:8208/>;
+  :rdfdb            <http://plus:8209/>;
+  :subComposer      <http://plus:8210/>;
+  :subServer        <http://plus:8211/>;
+  :vidref           <http://plus:8212/> .
 
 :curveCalc        :urlPath "curveCalc" .
 :dmxServer        :urlPath "dmxServer" .
--- a/show/dance2016/playlist.n3	Sat Jun 11 17:40:22 2016 +0000
+++ b/show/dance2016/playlist.n3	Sat Jun 11 17:15:30 2016 +0000
@@ -4,7 +4,7 @@
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
 
-show:dance2016 :musicRoot "show/dance2016/music";
+show:dance2016 :musicRoot "show/dance2016/music/pad";
 :spectrogramUrlRoot "/show/dance2016/spectrogram" .
 
 show:dance2016 :playList (
--- a/show/dance2016/song1.n3	Sat Jun 11 17:40:22 2016 +0000
+++ b/show/dance2016/song1.n3	Sat Jun 11 17:15:30 2016 +0000
@@ -8,7 +8,34 @@
 
 :a01 :effectAttr :chaseOffset; :value 0.12 .
 :ao0 :effectAttr :chaseTempo; :value 100 .
-<http://light9.bigasterisk.com/show/dance2016/song1> :note song:n3 .
+<http://light9.bigasterisk.com/show/dance2016/song1> :note song:n0, song:n1, song:n2, song:n3 .
+
+song:n0 a :Note; :curve song:n0c0; :effectClass effect:Curtain;
+     :originTime 35.653 .
+
+song:n0c0 a :Curve; :attr :strength; :point song:n0c0p0, song:n0c0p1, song:n0c0p2, song:n0c0p3 .
+song:n0c0p0 :time 0.000; :value 0.000 .
+song:n0c0p1 :time 1.000; :value 1.000 .
+song:n0c0p2 :time 2.000; :value 1.000 .
+song:n0c0p3 :time 3.000; :value 0.000 .
+
+song:n1 a :Note; :curve song:n1c0; :effectClass effect:Curtain;
+     :originTime 39.152 .
+
+song:n1c0 a :Curve; :attr :strength; :point song:n1c0p0, song:n1c0p1, song:n1c0p2, song:n1c0p3 .
+song:n1c0p0 :time 0.000; :value 0.000 .
+song:n1c0p1 :time 1.000; :value 1.000 .
+song:n1c0p2 :time 2.000; :value 1.000 .
+song:n1c0p3 :time 3.000; :value 0.000 .
+
+song:n2 a :Note; :curve song:n2c0; :effectClass effect:Curtain;
+     :originTime 43.806 .
+
+song:n2c0 a :Curve; :attr :strength; :point song:n2c0p0, song:n2c0p1, song:n2c0p2, song:n2c0p3 .
+song:n2c0p0 :time 0.000; :value 0.000 .
+song:n2c0p1 :time 1.000; :value 1.000 .
+song:n2c0p2 :time 2.000; :value 1.000 .
+song:n2c0p3 :time 3.000; :value 0.000 .
 
 song:n3 a :Note; :curve song:n3c0; :effectClass effect:Curtain;
      :originTime 32.297 .
@@ -17,4 +44,4 @@
 song:n3c0p0 :time 0.000; :value 0.000 .
 song:n3c0p1 :time 1.000; :value 1.000 .
 song:n3c0p2 :time 2.000; :value 1.000 .
-song:n3c0p3 :time 3.000; :value 0.000 .
+song:n3c0p3 :time 2.928; :value 0.000 .
--- a/show/dance2016/vidrefConfig.n3	Sat Jun 11 17:40:22 2016 +0000
+++ b/show/dance2016/vidrefConfig.n3	Sat Jun 11 17:15:30 2016 +0000
@@ -4,5 +4,4 @@
 @prefix xml: <http://www.w3.org/XML/1998/namespace> .
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
 
-<http://light9.bigasterisk.com/show/dance2016> ns1:vidrefCamRequest <http://10.1.0.103:8208/pic?resize=1080&shutter=25832&exposure_mode=sports&awb_mode=tungsten&brightness=46&redgain=1&bluegain=1&iso=700&exposure_compensation=0&rotation=180&x=0.012037037037037037&y=0.5584255842558425&w=0.3712962962962963&h=0.37761377613776137> .
-
+<http://light9.bigasterisk.com/show/dance2016> ns1:vidrefCamRequest <http://10.2.0.5:8208/pic?resize=1080&shutter=75062&exposure_mode=fixedfps&awb_mode=flash&brightness=51&redgain=1.4&bluegain=1&iso=480&exposure_compensation=-20&rotation=180&x=0&y=0.3025830258302583&w=1&h=0.6> .