Mercurial > hg > webaudioevaluationtool

changeset 15:94e080247b11

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Updated ape.js to match new audioHolder and audioElements tags.
author Nicholas Jillings <n.g.r.jillings@se14.qmul.ac.uk>
date Tue, 07 Apr 2015 10:33:02 +0100
parents 27bd02956128
children f2dad7c64e1e
files ape.js example_eval/project.xml
diffstat 2 files changed, 12 insertions(+), 17 deletions(-) [+]
line wrap: on
line diff
--- a/ape.js	Tue Apr 07 10:25:14 2015 +0100
+++ b/ape.js	Tue Apr 07 10:33:02 2015 +0100
@@ -67,6 +67,7 @@
 	var submit = document.createElement("button");
 	submit.innerText = 'Submit';
 	submit.onclick = function() {
+		// TODO: Update this for postTest tags
 		createProjectSave(projectReturn)
 	}
 	
@@ -92,7 +93,7 @@
 
 	var feedbackHolder = document.createElement('div');
 	
-	var tracks = xmlDoc.find('tracks');
+	var tracks = xmlDoc.find('audioHolder');
 	tracks = tracks[0];
 	var hostURL = tracks.attributes['hostURL'];
 	if (hostURL == undefined) {
@@ -102,18 +103,12 @@
 	}
 	
 	var hostFs = tracks.attributes['sampleRate'];
-	var hostFsExplicit = tracks.attributes['sampleRateExplicit'];
-	if (hostFs == undefined) {
-		hostFsExplicit = false;
-	} else {
-		hostFs = hostFs.value;
-		if (hostFsExplicit != undefined) {
-			hostFsExplicit = hostFsExplicit.value;
-		}
+	if (hostFs != undefined) {
+		hostFs = Number(hostFs.value);
 	}
 	
 	/// CHECK FOR SAMPLE RATE COMPATIBILITY
-	if (hostFsExplicit == true) {
+	if (hostFs != undefined) {
 		if (Number(hostFs) != audioContext.sampleRate) {
 			var errStr = 'Sample rates do not match! Requested '+Number(hostFs)+', got '+audioContext.sampleRate+'. Please set the sample rate to match before completing this test.';
 			alert(errStr);
@@ -121,7 +116,7 @@
 		}
 	}
 	
-	var tracksXML = xmlDoc.find('track');
+	var tracksXML = xmlDoc.find('audioElements');
 	tracksXML.each(function(index,element){
 		// Find URL of track
 		var trackURL = hostURL + this.attributes['url'].value;
@@ -135,8 +130,8 @@
 		trackComment.cols = '100';
 		trackComment.name = 'trackComment'+index;
 		trackComment.className = 'trackComment';
-		feedbackHolder.appendChild(trackTitle);
-		feedbackHolder.appendChild(trackComment);
+		trackObj.appendChild(trackTitle);
+		trackObj.appendChild(trackComment);
 		feedbackHolder.appendChild(trackObj);
 		// Create a slider per track
 		
@@ -161,10 +156,10 @@
 			// Get the track ID from the object ID
 			var id = Number(this.id.substr(13,2)); // Maximum theoretical tracks is 99!
 			audioEngineContext.selectedTrack(id);
-		}
+		};
 		
 		canvas.appendChild(trackSliderObj);
-	})
+	});
 	
 	
 	// Inject into HTML
--- a/example_eval/project.xml	Tue Apr 07 10:25:14 2015 +0100
+++ b/example_eval/project.xml	Tue Apr 07 10:33:02 2015 +0100
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <BrowserEvalProjectDocument>
 	<setup interface="APE" projectReturn="null" />
-	<AudioHolder hostURL="example_eval/" sampleRate="44100" sampleRateExplicit="true">
+	<audioHolder hostURL="example_eval/" sampleRate="44100" sampleRateExplicit="true">
 		<audioElements url="0.wav" ID="0"/>
 		<audioElements url="1.wav"/>
 		<audioElements url="2.wav"/>
@@ -13,7 +13,7 @@
 		<audioElements url="8.wav"/>
 		<audioElements url="9.wav"/>
 		<audioElements url="10.wav"/>
-	</AudioHolder>
+	</audioHolder>
 	<CommentQuestion>What is your mixing experiance</CommentQuestion>
 	<PreTest>
 		<statement>Please listen to all mixes</statement>