comparison core.js @ 1342:397e96ee781a

Better loudness calculation. Buffer ready not called until after loudness calculation to avoid NaNs on gain. <survey> nodes do not need to be present, no survey then no node. Added example boilerplate interface with all required functions and brief descriptions.

 	this.advanceState = function(){
 		if (this.stateIndex == null) {
 			this.initialise();
 		}
 		if (this.stateIndex == -1) {
+			this.stateIndex++;
 			console.log('Starting test...');
 			if (this.preTestSurvey != null)
 			{
 				popup.initState(this.preTestSurvey,storage.globalPreTest);
-			}
-			this.stateIndex++;
+			} else {
+				this.advanceState();
+			}
 		} else if (this.stateIndex == this.stateMap.length)
 		{
 			// All test pages complete, post test
 			console.log('Ending test ...');
 			this.stateIndex++;

 		this.url = null;
 		this.buffer = null;
 		this.xmlRequest = new XMLHttpRequest();
 		this.xmlRequest.parent = this;
 		this.users = [];
+		this.ready = function()
+		{
+			for (var i=0; i<this.users.length; i++)
+			{
+				this.users[i].state = 1;
+				if (this.users[i].interfaceDOM != null)
+				{
+					this.users[i].bufferLoaded(this);
+				}
+			}
+		};
 		this.getMedia = function(url) {
 			this.url = url;
 			this.xmlRequest.open('GET',this.url,true);
 			this.xmlRequest.responseType = 'arraybuffer';
 			

 			
 			// Create callback to decode the data asynchronously
 			this.xmlRequest.onloadend = function() {
 				audioContext.decodeAudioData(bufferObj.xmlRequest.response, function(decodedData) {
 					bufferObj.buffer = decodedData;
-					for (var i=0; i<bufferObj.users.length; i++)
-					{
-						bufferObj.users[i].state = 1;
-						if (bufferObj.users[i].interfaceDOM != null)
-						{
-							bufferObj.users[i].bufferLoaded(bufferObj);
-						}
-					}
-					calculateLoudness(bufferObj.buffer,"I");
+					calculateLoudness(bufferObj,"I");
+					
 				}, function(){
 					// Should only be called if there was an error, but sometimes gets called continuously
 					// Check here if the error is genuine
 					if (bufferObj.buffer == undefined) {
 						// Genuine error

 	this.root = this.document.children[0];
 	this.state = 0;
 	
 	this.initialise = function()
 	{
-		this.globalPreTest = new this.surveyNode(this,this.root,specification.preTest);
-		this.globalPostTest = new this.surveyNode(this,this.root,specification.postTest);
+		if (specification.preTest != undefined){this.globalPreTest = new this.surveyNode(this,this.root,specification.preTest);}
+		if (specification.postTest != undefined){this.globalPostTest = new this.surveyNode(this,this.root,specification.postTest);}
 	};
 	
 	this.createTestPageStore = function(specification)
 	{
 		var store = new this.pageNode(this,specification);

 		this.specification = specification;
 		this.parent = parent;
 		this.XMLDOM = this.parent.document.createElement('page');
 		this.XMLDOM.setAttribute('id',specification.id);
 		this.XMLDOM.setAttribute('presentedId',specification.presentedId);
-		this.preTest = new this.parent.surveyNode(parent,this.XMLDOM,specification.preTest);
-		this.postTest = new this.parent.surveyNode(parent,this.XMLDOM,specification.postTest);
+		if (specification.preTest != undefined){this.preTest = new this.surveyNode(this,this.root,this.specification.preTest);}
+		if (specification.postTest != undefined){this.postTest = new this.surveyNode(this,this.root,this.specification.postTest);}
 		
 		// Add any page metrics
 		var page_metric = this.parent.document.createElement('metric');
 		this.XMLDOM.appendChild(page_metric);