diff 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
line wrap: on
line diff
--- a/ape.js	Sun Jun 28 09:52:47 2015 +0100
+++ b/ape.js	Wed Jul 22 12:41:22 2015 +0100
@@ -33,7 +33,6 @@
 	
 	audioEngineContext.metric.sliderMoved = function()
 	{
-		
 		var id = this.data;
 		this.data = -1;
 		var position = convSliderPosToRate(id);
@@ -298,13 +297,27 @@
 	feedbackHolder.innerHTML = null;
 	canvas.innerHTML = null;
 	
-	var playbackHolder = document.createElement('div');
-	playbackHolder.style.width = "100%";
-	playbackHolder.align = 'center';
-	playbackHolder.appendChild(interfaceContext.playhead.object);
-	feedbackHolder.appendChild(playbackHolder);
+	var interfaceObj = audioHolderObject.interfaces;
+	for (var k=0; k<interfaceObj.length; k++) {
+		for (var i=0; i<interfaceObj[k].options.length; i++)
+		{
+			if (interfaceObj[k].options[i].type == 'option' && interfaceObj[k].options[i].name == 'playhead')
+			{
+				var playbackHolder = document.getElementById('playback-holder');
+				if (playbackHolder == null)
+				{
+					playbackHolder = document.createElement('div');
+					playbackHolder.style.width = "100%";
+					playbackHolder.align = 'center';
+					playbackHolder.appendChild(interfaceContext.playhead.object);
+					feedbackHolder.appendChild(playbackHolder);
+				}
+				break;
+			}
+		}
+	}
 	// Setup question title
-	var interfaceObj = audioHolderObject.interfaces;
+	
 	var commentBoxPrefix = "Comment on track";
 	if (interfaceObj.length != 0) {
 		interfaceObj = interfaceObj[0];
@@ -495,6 +508,7 @@
 	var time = audioEngineContext.timer.getTestTime();
 	var id = Number(ev.srcElement.getAttribute('trackindex'));
 	audioEngineContext.audioObjects[id].metric.moved(time,convSliderPosToRate(ev.srcElement));
+	console.log('slider '+id+' moved to '+convSliderPosToRate(ev.srcElement)+' ('+time+')');
 }
 
 function buttonSubmitClick() // TODO: Only when all songs have been played!