comparison ape.js @ 265:ec693ceb2444 Dev_main

Update dev_main
author Nicholas Jillings <nicholas.jillings@eecs.qmul.ac.uk>
date Wed, 22 Jul 2015 12:41:22 +0100
parents 2e19ac736876
children 99faf6d80c8d
comparison
equal deleted inserted replaced
243:b4ca52c105ba 265:ec693ceb2444
31 { 31 {
32 }; 32 };
33 33
34 audioEngineContext.metric.sliderMoved = function() 34 audioEngineContext.metric.sliderMoved = function()
35 { 35 {
36
37 var id = this.data; 36 var id = this.data;
38 this.data = -1; 37 this.data = -1;
39 var position = convSliderPosToRate(id); 38 var position = convSliderPosToRate(id);
40 console.log('slider ' + id + ': '+ position + ' (' + time + ')'); // DEBUG/SAFETY: show position and slider id 39 console.log('slider ' + id + ': '+ position + ' (' + time + ')'); // DEBUG/SAFETY: show position and slider id
41 if (audioEngineContext.timer.testStarted) 40 if (audioEngineContext.timer.testStarted)
296 var feedbackHolder = document.getElementById('feedbackHolder'); 295 var feedbackHolder = document.getElementById('feedbackHolder');
297 var canvas = document.getElementById('slider'); 296 var canvas = document.getElementById('slider');
298 feedbackHolder.innerHTML = null; 297 feedbackHolder.innerHTML = null;
299 canvas.innerHTML = null; 298 canvas.innerHTML = null;
300 299
301 var playbackHolder = document.createElement('div'); 300 var interfaceObj = audioHolderObject.interfaces;
302 playbackHolder.style.width = "100%"; 301 for (var k=0; k<interfaceObj.length; k++) {
303 playbackHolder.align = 'center'; 302 for (var i=0; i<interfaceObj[k].options.length; i++)
304 playbackHolder.appendChild(interfaceContext.playhead.object); 303 {
305 feedbackHolder.appendChild(playbackHolder); 304 if (interfaceObj[k].options[i].type == 'option' && interfaceObj[k].options[i].name == 'playhead')
305 {
306 var playbackHolder = document.getElementById('playback-holder');
307 if (playbackHolder == null)
308 {
309 playbackHolder = document.createElement('div');
310 playbackHolder.style.width = "100%";
311 playbackHolder.align = 'center';
312 playbackHolder.appendChild(interfaceContext.playhead.object);
313 feedbackHolder.appendChild(playbackHolder);
314 }
315 break;
316 }
317 }
318 }
306 // Setup question title 319 // Setup question title
307 var interfaceObj = audioHolderObject.interfaces; 320
308 var commentBoxPrefix = "Comment on track"; 321 var commentBoxPrefix = "Comment on track";
309 if (interfaceObj.length != 0) { 322 if (interfaceObj.length != 0) {
310 interfaceObj = interfaceObj[0]; 323 interfaceObj = interfaceObj[0];
311 var titleNode = interfaceObj.title; 324 var titleNode = interfaceObj.title;
312 if (titleNode != undefined) 325 if (titleNode != undefined)
493 } 506 }
494 } 507 }
495 var time = audioEngineContext.timer.getTestTime(); 508 var time = audioEngineContext.timer.getTestTime();
496 var id = Number(ev.srcElement.getAttribute('trackindex')); 509 var id = Number(ev.srcElement.getAttribute('trackindex'));
497 audioEngineContext.audioObjects[id].metric.moved(time,convSliderPosToRate(ev.srcElement)); 510 audioEngineContext.audioObjects[id].metric.moved(time,convSliderPosToRate(ev.srcElement));
511 console.log('slider '+id+' moved to '+convSliderPosToRate(ev.srcElement)+' ('+time+')');
498 } 512 }
499 513
500 function buttonSubmitClick() // TODO: Only when all songs have been played! 514 function buttonSubmitClick() // TODO: Only when all songs have been played!
501 { 515 {
502 var checks = testState.currentStateMap[testState.currentIndex].interfaces[0].options; 516 var checks = testState.currentStateMap[testState.currentIndex].interfaces[0].options;