comparison core.js @ 1620:da84079192c6

Fix Bug #1241 and #1213: Added checks each time new test page is loaded that all audioObjects have decoded. Writes to browser console WAIT and does not issue any play command if any audioObjects not ready.

 	this.fooGain = audioContext.createGain();
 	this.fooGain.gain = 0;
 	
 	// Use this to detect playback state: 0 - stopped, 1 - playing
 	this.status = 0;
+	this.audioObjectsReady = false;
 	
 	// Connect both gains to output
 	this.outputGain.connect(audioContext.destination);
 	this.fooGain.connect(audioContext.destination);
 	

 	this.loopPlayback = false;
 	
 	// Create store for new audioObjects
 	this.audioObjects = [];
 	
-	this.play = function(){};
-	
-	this.stop = function(){};
+	this.play = function() {
+		// Start the timer and set the audioEngine state to playing (1)
+		if (this.status == 0) {
+			// Check if all audioObjects are ready
+			if (this.audioObjectsReady == false) {
+				this.audioObjectsReady = this.checkAllReady();
+			}
+			if (this.audioObjectsReady == true) {
+				this.timer.startTest();
+				this.status = 1;
+			}
+		}
+	};
+	
+	this.stop = function() {
+		// Send stop and reset command to all playback buffers and set audioEngine state to stopped (1)
+		if (this.status == 1) {
+			for (var i=0; i<this.audioObjects.length; i++)
+			{
+				this.audioObjects[i].stop();
+			}
+			this.status = 0;
+		}
+	};
 	
 	
 	this.newTrack = function(url) {
 		// Pull data from given URL into new audio buffer
 		// URLs must either be from the same source OR be setup to 'Access-Control-Allow-Origin'

 		audioObjectId = this.audioObjects.length;
 		this.audioObjects[audioObjectId] = new audioObject(audioObjectId);
 
 		// AudioObject will get track itself.
 		this.audioObjects[audioObjectId].constructTrack(url);
+	};
+	
+	this.newTestPage = function() {
+		this.state = 0;
+		this.audioObjectsReady = false;
+		this.metric.reset();
+		this.audioObjects = [];
 	};
 	
 	this.checkAllPlayed = function() {
 		arr = [];
 		for (var id=0; id<this.audioObjects.length; id++) {
 			if (this.audioObjects[id].played == false) {
 				arr.push(this.audioObjects[id].id);
 			}
 		}
 		return arr;
+	};
+	
+	this.checkAllReady = function() {
+		var ready = true;
+		for (var i=0; i<this.audioObjects.length; i++) {
+			if (this.audioObjects[i].state == 0) {
+				// Track not ready
+				console.log('WAIT -- audioObject '+i+' not ready yet!');
+				ready = false;
+			};
+		}
+		return ready;
 	};
 	
 }
 
 function audioObject(id) {

 		this.bufferNode.buffer = this.buffer;
 		this.bufferNode.loop = audioEngineContext.loopPlayback;
 		if (this.bufferNode.loop == false) {
 			this.bufferNode.onended = function() {
 				this.owner.metric.listening(audioEngineContext.timer.getTestTime());
-			}
+			};
 		}
 		this.metric.listening(audioEngineContext.timer.getTestTime());
 		this.bufferNode.start(startTime);
 		this.played = true;
 	};

 	/* Used by audioEngine to link to audioObjects to minimise the timer call timers;
 	 */
 	this.engine = engine;
 	this.lastClicked = -1;
 	this.data = -1;
+	this.reset = function() {
+		this.lastClicked = -1;
+		this.data = -1;
+	};
 	this.initialiseTest = function(){};
 }
 
 function metricTracker()
 {