# HG changeset patch # User Nicholas Jillings # Date 1432977647 -3600 # Node ID 20823d1467b11f9014cf34e8af2237a404d76bd5 # Parent 1265e2aebf17f54ebf225319b306ee5a9076ccc5# Parent 0dbb90fa6e90c76d70a9d76ac868afb28c6e34b4 Merge from the default branch diff -r 1265e2aebf17 -r 20823d1467b1 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)); });