# HG changeset patch # User Nicholas Jillings # Date 1432977647 -3600 # Node ID 007cee4ea8586b91e5c6f118704dee512828c6d8 # Parent 5cfa9b3e8d03f64fa7dad6bc3b138ce8c576d916# Parent a1fa52e656cc1f3612273d005e43a85e99c1684a Merge from the default branch diff -r 5cfa9b3e8d03 -r 007cee4ea858 ape.js --- a/ape.js Fri May 29 16:33:50 2015 +0100 +++ b/ape.js Sat May 30 10:20:47 2015 +0100 @@ -437,9 +437,10 @@ trackSliderObj.className = 'track-slider'; trackSliderObj.id = 'track-slider-'+index; // Distribute it randomnly - var w = window.innerWidth - 100; + var w = window.innerWidth - (offset+8)*2; w = Math.random()*w; - trackSliderObj.style.left = Math.floor(w)+50+'px'; + w = Math.floor(w+(offset+8)); + trackSliderObj.style.left = w+'px'; trackSliderObj.innerHTML = ''+index+''; trackSliderObj.draggable = true; trackSliderObj.ondragend = dragEnd; @@ -473,6 +474,7 @@ }; canvas.appendChild(trackSliderObj); + audioEngineContext.audioObjects[index].metric.initialised(convSliderPosToRate(index)); });