# HG changeset patch # User tzara # Date 1370621856 0 # Node ID ab53902406d445d7de80523915b4d72485749c2c # Parent 20758a1074479b0737104ed0b9ba375ebbfdf925 update presussex diff -r 20758a107447 -r ab53902406d4 init.sh --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/init.sh Fri Jun 07 16:17:36 2013 +0000 @@ -0,0 +1,20 @@ +#!/bin/bash + +src="/home/rob/code/nodescore/www/8/svg/" + +cd ../magick/ + +#./create_svg.py --output=emma --sections=1 --instrument=emma + +cp /var/www/magick.kiben.net/m/output/emma/svg/*.svg $src + +cd $src + +for f in *.svg ; do mv $f ${f#???}; done +count=-1 ;for i in [0-7]*.svg ; do count=$((count+1)) ;mv $i $count.svg ; done + +cd /home/rob/code/nodescore + +./svgmods.sh +./musicfilegenerator.sh +./ss2thumb.sh diff -r 20758a107447 -r ab53902406d4 nodescore.js --- a/nodescore.js Thu May 23 22:41:23 2013 +0000 +++ b/nodescore.js Fri Jun 07 16:17:36 2013 +0000 @@ -31,13 +31,20 @@ var httpServer = http.createServer( function(request, response) { request.addListener('end', function () { - clientFiles.serve(request, response); + clientFiles.serve(request, response, function (e, res) { + if (e && (e.status === 404)) { // If the file wasn't found + clientFiles.serveFile('/404.html', 404, {}, request, response); + }} + +); process.setMaxListeners(0); }); }); httpServer.listen(8890); +//////////////////////////////////////////// + var pinging=0 console.log("ping set to 0") @@ -199,8 +206,8 @@ var voice=seq.voice; var tempoms = Math.floor(60000/seq.mm) var timemultiplier=1000 - var outcount=2; var incount=2; - var dur=srcsqr[Math.floor(unit/order)][unit%order] + var outcount=4; var incount=4; + var dur=srcsqr[Math.floor(unit/order)][unit%order] + 4 var time = dur; var ztime=time; var totaltime=time @@ -284,7 +291,7 @@ // console.log(counter) } - var pulse = setInterval(sequenCer, 50); + var pulse = setInterval(sequenCer, tempoms); socket.on('stopSeq', function () { //donaldduck = mickeymouse + 7 diff -r 20758a107447 -r ab53902406d4 scoreB.js --- a/scoreB.js Thu May 23 22:41:23 2013 +0000 +++ b/scoreB.js Fri Jun 07 16:17:36 2013 +0000 @@ -25,11 +25,10 @@ name: "A", transect: 0, nextunit: 0, - counter: 0, mm: 110, beatsinbar: 4, + counter: 0, mm: 60, beatsinbar: 4, units: [[48,49,41,40,30,31,38,39], [0,9,18,27,35,42,49,56], [56,57,58,59,60,61,62,63] - ] }; @@ -40,7 +39,7 @@ transect: 0, nextunit: 0, counter: 0, - mm: 110, beatsinbar: 4, + mm: 60, beatsinbar: 4, units: [[8,9,10,11,12,13,14,15], [27,28,35,36,0,7,63,56], [0,9,18,27,35,42,49,56] @@ -54,7 +53,7 @@ transect: 0, nextunit: 0, counter: 0, - mm: 110, beatsinbar: 4, + mm: 60, beatsinbar: 4, units: [ [16,17,18,19,20,21,22,23], [48,49,41,40,30,31,38,39], @@ -69,15 +68,10 @@ transect: 0, nextunit: 0, counter: 0, - mm: 110, beatsinbar: 4, - //durations: srcsqr[7], + mm: 60, beatsinbar: 4, units: [[0,1,2,3,4,5,6,7], [48,49,41,40,30,31,38,39], [0,1,2,3,4,5,6,7] ] - }; - -//return seqA seqB seqC seqD - -//} \ No newline at end of file + }; \ No newline at end of file diff -r 20758a107447 -r ab53902406d4 www/index.html --- a/www/index.html Thu May 23 22:41:23 2013 +0000 +++ b/www/index.html Fri Jun 07 16:17:36 2013 +0000 @@ -62,7 +62,7 @@ for server client communications.

Browser Compatability:

- Modern Browsers only. No Internet Explorer support. Tested using Chromium. + Modern Browsers only. No Internet Explorer support. Tested using Chrome, Chromium, Firefox, Safari. @@ -77,9 +77,11 @@ depending on your CPU/Browser.. or may not work at all if you are using the WRONG browser. Work in Progress... here be dragons....
+ - http://nodescore.kiben.net:8889/m/score.html
+ overview page (score): http://nodescore.kiben.net:8890/m/
+ performer page (part): http://nodescore.kiben.net:8890/m/score.html

Related Publications

Canning, R. "REALTIME WEB TECHNOLOGIES IN THE NETWORKED PERFORMANCE ENVIRONMENT" diff -r 20758a107447 -r ab53902406d4 www/m/css/nodescore-tablet.css --- a/www/m/css/nodescore-tablet.css Thu May 23 22:41:23 2013 +0000 +++ b/www/m/css/nodescore-tablet.css Fri Jun 07 16:17:36 2013 +0000 @@ -23,10 +23,10 @@ h4{ background-color: black; font: 19px Helvetica, Arial; text-align: center; margin-left:auto; margin-right:auto; color:white} -a:link {color:#666;} -a:visited {color: #666;} -a:hover {color: black; background-color:gray;} -a:active {color: black;background-color:white;} +a:link { color:#666;} +a:visited { color: #666;} +a:hover { color: black; background-color:orange; } +a:active { color: black;background-color:white; } ul, li, h4, h3, h2, h1, p{ padding:0; @@ -34,7 +34,6 @@ list-style:none; } - .outermaster{ margin-top:4px; height: 580px; @@ -133,14 +132,13 @@ width: 30%; margin: 0px; border: 1px solid gray; - padding: 5px 5px 5px 5px ; color: black; - overflow:hidden; + !overflow:hidden; float:right; font-size:1em; } -#preview img{margin-top:15px;} +#preview img{margin-top:15px; width:300px; background:transparent; position: relative; top:-20px;} #timeinfo{ border-radius: 15px; @@ -187,6 +185,16 @@ height: 490px; } +.svgmusic { + padding:0px; + border: 1px solid gray; + display:block; + border-radius: 15px; + margin: 0px; + width: 100%; + height: 445px; +} + svg { background-color: black; width:1000px; height:330px; display:block;} line { stroke: white; } text { fill: white;} @@ -195,15 +203,6 @@ polygon { fill: white; } circle { stroke: white; } -.svgmusic { - padding:0px; - border: 1px solid gray; - display:block; - border-radius: 15px; - margin: 0px; - width: 1000px; - height: 445px; -} #thesquare{ position:absolute; width:700px; } .magicsquare { @@ -322,7 +321,7 @@ display:table-cell; vertical-align:middle; border-radius: 15px; float:right; - background-color: black; + background-color: transparent; color: white; font-size: 3.7em; text-align: center; @@ -334,12 +333,20 @@ z-position: 2; } -#c_chronometer{ +#transport{ position:relative; - bottom:-20px; - right:-35%; - height:40px; - width:200px; + padding: 20px; + bottom:40px; +} + +#ctrlstop{ + position:absolute; + padding: 5px; + border: 1px solid gray; + bottom:120px; + left:1800px; + height:80px; + width:230px; border-radius: 15px; color: gray; font-size: 3.5em; @@ -405,41 +412,39 @@ vertical-align:middle; border-radius: 15px; } -#wide { width:100%; height:70%; border: 1px solid gray; - padding: 6px 6px 6px 6px; + +#wide { width:100%; height:90%; border: 1px solid black; padding: 6px 0px 6px 6px; } +#outer { width: 100%; height: 100%; padding: 0; border: 0px solid white; background-color: black; } +#outerpreview { position:absolute; top: 20px; left: 1100px; float:left; + height:600px; width: 1200px; padding: 0; + border: 1px solid gray; background-color: black; + } + +.pview { border: 1px solid red; height:49%; width:49%; float:left; background:gray; z-index:-100; } +.middle { float: left; width: 10.8%; height: 10.5%; padding: 0; border: 0; margin: 0.33%; + border: 1px solid red; background:gray; border-radius:10px; } /* 100 = 6 * widt\h + 12 * margin */ + +.middle p { font-size:2.5em; position:relative; left: 0px; opacity:0.3; color:blue; display:block;} + +.middle img { padding: 20px 0px 0px 0px; position:relative; top:-30px;} + +.middle:hover img { + z-index:1000; + width:500px; + background-color: orange; + !position: absolute; + border: 0px solid red; + border-radius:20px; + opacity: 1; + box-shadow:4px -4px 10px 3px #888, inset 4px -4px 10px 3px #888; } -#outer { display:block; float:left; width: 100%; height: 100%; padding: 0; border: 0px solid white; background-color: black; } +.middle p.indexnum { font-size:1em; color:black; position:relative; top:-80px; left:90px; opacity:1;} -#outerpreview { display:block; float:right; - height:100%; width: 25%; padding: 0; - border: 1px solid black; background-color: black; - } - -.pview { border: 1px solid gray; height:24%; width:69%; display:block; float:left; } - -.middle { float: left; width: 15.8%; height: 15.5%; padding: 0; border: 0; margin: 0.33%; - border: 1px solid gray; ;} /* 100 = 6 * widt\h + 12 * margin */ - -.middle img { padding: 20px 0px 0px 0px} - -.middle:hover img -{ - width:50%; - background-color: black; - z-axis: 200000000; - position: absolute; - - border: 2px solid white; - top:690px; - left:0px; - !box-shadow:4px -4px 10px 3px #888, inset 4px -4px 10px 3px #888; -} - - - -.inner-0, .inner-1, .inner-2, .inner-3 { font-size:3em; float: left; width: 47%; height: 50%; padding: 0; - border: 1px solid transparent; margin: 0; text-align: center; font-weight: bold; z-index:1000; position:relative; top: -80px;} +.inner-0, .inner-1, .inner-2, .inner-3 { font-size:2.5em; float: left; width: 47%; height: 50%; + padding: 0; border: 1px solid white; margin: 0; + text-align: center; font-weight: bold; + position:relative; top: -110px; } .inner-0 { background-color: transparent; } .inner-1 { background-color: transparent; } @@ -447,5 +452,9 @@ .inner-3 { background-color: transparent; } .musicianprog { display:inline; float:left; - width:33%; background:transparent; height:40px; - padding: 5px 5px 5px 5px; text-align:center; } \ No newline at end of file + width:20%; background:transparent; height:40px; + padding: 5px 5px 5px 5px; text-align:center; } + + +#links {position:absolute; bottom:150px; left: 800px; width:900px;} +#transect {position:absolute; bottom:180px; left: 1300px; width:600px;} \ No newline at end of file diff -r 20758a107447 -r ab53902406d4 www/m/js/controlseq.js --- a/www/m/js/controlseq.js Thu May 23 22:41:23 2013 +0000 +++ b/www/m/js/controlseq.js Fri Jun 07 16:17:36 2013 +0000 @@ -30,7 +30,8 @@ function resetChr() { socket.emit("resetChr"); $("div#client_chronometer").text("00:00:00.0"); } socket.on("chronFromServer", function(chron){ - $("div#c_chronometer").text(chron); }); + $("div#c_chronometer").text(chron); +}); ////////////////////////////////////////////// // SEQUENCER MONITOR @@ -42,6 +43,7 @@ if (group == 3) { turnmeoff = "#sqr"+unitlast+".sqc"} if (group == 4) { turnmeoff = "#sqr"+unitlast+".sqd"} $(turnmeoff).css({'color':'black'}) + } // countdown to change @@ -55,33 +57,37 @@ document.getElementById("count"+groupID).style.color=colour; } -socket.on("counterText", function(group,unit,counter,seq){ +socket.on("counterText", function(group,unit,counter,seq,unitlast,transect){ + + $("div#transect").text("current transect:" + (transect+1)); + + if (group == 1) { $('#inner-'+unit+"-0").text(counter); -// $("#count1").text(currentseconds); - if (counter == 0 ) { $('#inner-'+unit+"-0").css("color","black") } - else { $('#inner-'+unit+"-0").css("color","yellow") } + + if (counter == 0 ) { $('#inner-'+unit+"-0").css("visibility","hidden") + console.log("------------------------- "+ unit) + } + else { $('#inner-'+unit+"-0").css({"color" : "white", "background":"black", "opacity" : "0.7", "border-radius":"20px", "visibility": "visible" }) } } if (group == 2) { $('#inner-'+unit+"-1").text(counter); - - if (counter == 0 ) { $('#inner-'+unit+"-1").css("color","black") } - else { $('#inner-'+unit+"-1").css("color","green") } + if (counter == 0 ) { $('#inner-'+unit+"-1").css("visibility","hidden") } + else { $('#inner-'+unit+"-1").css({"color":"white","background":"green", "opacity" : "0.7", "border-radius":"20px", "visibility": "visible"}) } } if (group == 3) { $('#inner-'+unit+"-2").text(counter); - if (counter == 0 ) { $('#inner-'+unit+"-2").css("color","black") } - else { $('#inner-'+unit+"-2").css("color","aqua") } + if (counter == 0 ) { $('#inner-'+unit+"-2").css("visibility","hidden") } + else { $('#inner-'+unit+"-2").css({"color":"white","background":"blue", "opacity" : "0.7", "border-radius":"20px", "visibility": "visible"}) } } if (group == 4) { $('#inner-'+unit+"-3").text(counter); - if (counter == 0 ) { $('#inner-'+unit+"-3").css("color","black")} - else { $('#inner-'+unit+"-3").css("color","red") } + if (counter == 0 ) { $('#inner-'+unit+"-3").css("visibility","hidden")} + else { $('#inner-'+unit+"-3").css({"color":"white","background":"red", "opacity" : "0.7", "border-radius":"20px", "visibility": "visible"}) } } } ); - /* ////////////////////////////////////////////// // CLient Popup window code @@ -91,3 +97,12 @@ url,'popUpWindow','height=400,width=800,left=10,top=10,resizable=no,scrollbars=no,toolbar=no,menubar=no,location=no,titlebar=no,directories=no,status=yes')} */ + +function pad2(number) { return (number < 10 ? '0' : '') + number } +socket.on("pageFlipfromserver", pageTurn); +function pageTurn (group,unit,time,mm) { + var g= pad2(group); + var groupPage=document.getElementById('group').value; + $("#previewbox-"+group).html("") + } + diff -r 20758a107447 -r ab53902406d4 www/m/js/nodescore-slides.js --- a/www/m/js/nodescore-slides.js Thu May 23 22:41:23 2013 +0000 +++ b/www/m/js/nodescore-slides.js Fri Jun 07 16:17:36 2013 +0000 @@ -67,37 +67,35 @@ }} /////////////////////////////////////// -function pageFlip(unit) { $('#sections').trigger('goto', [parseFloat(unit)]); } +//function pageFlip(unit) { $('#sections').trigger('goto', [parseFloat(unit)]); } ///////////////////////////////////////////////// // call the fancy jquery functions -//function slideTo (target) { $('#sections').trigger('goto', [target]); } +function slideTo (target) { $('#sections').trigger('goto', [target]); } function pad2(number) { return (number < 10 ? '0' : '') + number } ///////////////////////////////////////////////// //var testSound = new buzz.sound( 'audio/testfile', { formats: [ 'ogg', 'mp3' ] } ); socket.on("pageFlipfromserver", pageTurn); -function pageTurn (group,unit,time,mm) { +function pageTurn (group,unit,time,mm,seqcounter,nextunit) { var groupPage=document.getElementById('group').value; if (group == groupPage) { + console.log(unit + " ---> " + nextunit) var g= pad2(group); var p= pad2(unit); -// pageFlip(unit); - pageTurnB(unit) + var units=8; + var next=(((unit+1)%units)+units)%units + //$("#live").load("music.html #"+unit +" *"); + $("#live").load("music.html #"+unit); - } + //$("#live").html("") + $("#preview").html("

n e x t :

") + } else { //console.log("not for this group... ignoring... for group:" + group ); } } -function pageTurnB(unit) { - var units=6; - var next=(((unit+1)%units)+units)%units - $("#live").load("music.html #"+unit +" *"); - $("#preview").html("

n e x t :

") -} - //////////////////////////////////////////////// /* commented out for now as interferes with chat diff -r 20758a107447 -r ab53902406d4 www/m/music.html --- a/www/m/music.html Thu May 23 22:41:23 2013 +0000 +++ b/www/m/music.html Fri Jun 07 16:17:36 2013 +0000 @@ -1,129 +1,78 @@ -
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ + + + + +> + + + + +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff -r 20758a107447 -r ab53902406d4 www/m/temp.html --- a/www/m/temp.html Thu May 23 22:41:23 2013 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,38 +0,0 @@ -
-
...
-
...
-
- -
- next in: -
...
-
- -
-
-
- -
-
-
00:00:00.0
-
Latency: 0ms
-
- -
- -
- -
-
- diff -r 20758a107447 -r ab53902406d4 www/m/thumbs/1.png Binary file www/m/thumbs/1.png has changed diff -r 20758a107447 -r ab53902406d4 www/m/thumbs/10.png Binary file www/m/thumbs/10.png has changed diff -r 20758a107447 -r ab53902406d4 www/m/thumbs/11.png Binary file www/m/thumbs/11.png has changed diff -r 20758a107447 -r ab53902406d4 www/m/thumbs/12.png Binary file www/m/thumbs/12.png has changed diff -r 20758a107447 -r ab53902406d4 www/m/thumbs/13.png Binary file www/m/thumbs/13.png has changed diff -r 20758a107447 -r ab53902406d4 www/m/thumbs/14.png Binary file www/m/thumbs/14.png has changed diff -r 20758a107447 -r ab53902406d4 www/m/thumbs/15.png Binary file www/m/thumbs/15.png has changed diff -r 20758a107447 -r ab53902406d4 www/m/thumbs/16.png Binary file www/m/thumbs/16.png has changed diff -r 20758a107447 -r ab53902406d4 www/m/thumbs/17.png Binary file www/m/thumbs/17.png has changed diff -r 20758a107447 -r ab53902406d4 www/m/thumbs/18.png Binary file www/m/thumbs/18.png has changed diff -r 20758a107447 -r ab53902406d4 www/m/thumbs/19.png Binary file www/m/thumbs/19.png has changed diff -r 20758a107447 -r ab53902406d4 www/m/thumbs/2.png Binary file www/m/thumbs/2.png has changed diff -r 20758a107447 -r ab53902406d4 www/m/thumbs/20.png Binary file www/m/thumbs/20.png has changed diff -r 20758a107447 -r ab53902406d4 www/m/thumbs/21.png Binary file www/m/thumbs/21.png has changed diff -r 20758a107447 -r ab53902406d4 www/m/thumbs/22.png Binary file www/m/thumbs/22.png has changed diff -r 20758a107447 -r ab53902406d4 www/m/thumbs/23.png Binary file www/m/thumbs/23.png has changed diff -r 20758a107447 -r ab53902406d4 www/m/thumbs/24.png Binary file www/m/thumbs/24.png has changed diff -r 20758a107447 -r ab53902406d4 www/m/thumbs/25.png Binary file www/m/thumbs/25.png has changed diff -r 20758a107447 -r ab53902406d4 www/m/thumbs/26.png Binary file www/m/thumbs/26.png has changed diff -r 20758a107447 -r ab53902406d4 www/m/thumbs/27.png Binary file www/m/thumbs/27.png has changed diff -r 20758a107447 -r ab53902406d4 www/m/thumbs/28.png Binary file www/m/thumbs/28.png has changed diff -r 20758a107447 -r ab53902406d4 www/m/thumbs/29.png Binary file www/m/thumbs/29.png has changed diff -r 20758a107447 -r ab53902406d4 www/m/thumbs/3.png Binary file www/m/thumbs/3.png has changed diff -r 20758a107447 -r ab53902406d4 www/m/thumbs/30.png Binary file www/m/thumbs/30.png has changed diff -r 20758a107447 -r ab53902406d4 www/m/thumbs/31.png Binary file www/m/thumbs/31.png has changed diff -r 20758a107447 -r ab53902406d4 www/m/thumbs/32.png Binary file www/m/thumbs/32.png has changed diff -r 20758a107447 -r ab53902406d4 www/m/thumbs/33.png Binary file www/m/thumbs/33.png has changed diff -r 20758a107447 -r ab53902406d4 www/m/thumbs/34.png Binary file www/m/thumbs/34.png has changed diff -r 20758a107447 -r ab53902406d4 www/m/thumbs/35.png Binary file www/m/thumbs/35.png has changed diff -r 20758a107447 -r ab53902406d4 www/m/thumbs/36.png Binary file www/m/thumbs/36.png has changed diff -r 20758a107447 -r ab53902406d4 www/m/thumbs/4.png Binary file www/m/thumbs/4.png has changed diff -r 20758a107447 -r ab53902406d4 www/m/thumbs/5.png Binary file www/m/thumbs/5.png has changed diff -r 20758a107447 -r ab53902406d4 www/m/thumbs/6.png Binary file www/m/thumbs/6.png has changed diff -r 20758a107447 -r ab53902406d4 www/m/thumbs/7.png Binary file www/m/thumbs/7.png has changed diff -r 20758a107447 -r ab53902406d4 www/m/thumbs/8.png Binary file www/m/thumbs/8.png has changed diff -r 20758a107447 -r ab53902406d4 www/m/thumbs/9.png Binary file www/m/thumbs/9.png has changed