Mercurial > hg > webaudioevaluationtool
changeset 1001:20823d1467b1
Merge from the default branch
| author | Nicholas Jillings <n.g.r.jillings@se14.qmul.ac.uk> |
|---|---|
| date | Sat, 30 May 2015 10:20:47 +0100 |
| parents | 1265e2aebf17 (current diff) 0dbb90fa6e90 (diff) |
| children | 897b73057397 |
| files | ape.js core.js example_eval/project.xml |
| diffstat | 1 files changed, 4 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- 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 = '<span>'+index+'</span>'; trackSliderObj.draggable = true; trackSliderObj.ondragend = dragEnd; @@ -473,6 +474,7 @@ }; canvas.appendChild(trackSliderObj); + audioEngineContext.audioObjects[index].metric.initialised(convSliderPosToRate(index)); });