diff ape.js @ 947:c26cfa1c5fc0

Possible fix for Bug #1238. audioObject metric collection now controlled by the audioObjects themselves for timer information. Lastclicked and sliderPlayed functions no longer used.
author Nicholas Jillings <nicholas.jillings@eecs.qmul.ac.uk>
date Sun, 24 May 2015 11:33:04 +0100
parents e50a0ea30326
children 48e05b7a16e0
line wrap: on
line diff
--- a/ape.js	Sun May 24 10:51:41 2015 +0100
+++ b/ape.js	Sun May 24 11:33:04 2015 +0100
@@ -263,6 +263,11 @@
 
 function loadTest(id)
 {
+	
+	// Reset audioEngineContext.Metric globals for new test
+	audioEngineContext.metric.lastClicked = -1;
+	audioEngineContext.metric.data = -1;
+	
 	// Used to load a specific test page
 	var textXML = testXMLSetups[id];
 	
@@ -333,7 +338,7 @@
 		loopPlayback = false;
 	}
 	audioEngineContext.loopPlayback = loopPlayback;
-	
+	loopPlayback = false;
 	// Create AudioEngine bindings for playback
 	if (loopPlayback) {
 		audioEngineContext.play = function() {
@@ -491,7 +496,7 @@
 			audioEngineContext.play();
 			// Get the track ID from the object ID
 			var id = Number(this.id.substr(13,2)); // Maximum theoretical tracks is 99!
-			audioEngineContext.metric.sliderPlayed(id);
+			//audioEngineContext.metric.sliderPlayed(id);
 			audioEngineContext.selectedTrack(id);
             // Currently playing track red, rest green
             document.getElementById('track-slider-'+index).style.backgroundColor = "#FF0000";