comparison ape.js @ 110:94b91d63e286

Possible fix for Bug #1238. audioObject metric collection now controlled by the audioObjects themselves for timer information. Lastclicked and sliderPlayed functions no longer used.

 	
 }
 
 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];
 	
 	var feedbackHolder = document.getElementById('feedbackHolder');
 	var canvas = document.getElementById('slider');

 		}
 	} else {
 		loopPlayback = false;
 	}
 	audioEngineContext.loopPlayback = loopPlayback;
-	
+	loopPlayback = false;
 	// Create AudioEngine bindings for playback
 	if (loopPlayback) {
 		audioEngineContext.play = function() {
 			// Send play command to all playback buffers for synchronised start
 			// Also start timer callbacks to detect if playback has finished

 		trackSliderObj.onclick = function() {
 			// Start the test on first click, that way timings are more accurate.
 			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";
             for (var i = 0; i<$(currentTrackOrder).length; i++)
             {