# HG changeset patch
# User Brecht De Man <b.deman@qmul.ac.uk>
# Date 1431884456 -3600
# Node ID 6d5701b775c2d6bd4e61d6a1748c350ad19947dd
# Parent  e4436132dbd95d37376867f5c5480b6539ee07bc# Parent  1c869162371b3861e83458f3d84b384a98da20aa
Merge 'default' and 'Dev_main' branch

diff -r e4436132dbd9 -r 6d5701b775c2 ape.css
--- a/ape.css	Sun May 17 16:45:09 2015 +0100
+++ b/ape.css	Sun May 17 18:40:56 2015 +0100
@@ -43,7 +43,11 @@
 
 div.sliderScale {
 	width: 100%;
-	min-height: 20px;
+	min-height: 30px;
+}
+
+div.sliderScale span{
+	font-size: 1.2em;
 }
 
 div.sliderScale span {
diff -r e4436132dbd9 -r 6d5701b775c2 ape.js
--- a/ape.js	Sun May 17 16:45:09 2015 +0100
+++ b/ape.js	Sun May 17 18:40:56 2015 +0100
@@ -389,11 +389,9 @@
 		audioEngineContext.stop = function() {
 			// Send stop and reset command to all playback buffers
 			if (this.status == 1) {
-				if (this.loopPlayback) {
-					for (var i=0; i<this.audioObjects.length; i++)
-					{
-						this.audioObjects[i].stop();
-					}
+				for (var i=0; i<this.audioObjects.length; i++)
+				{
+					this.audioObjects[i].stop();
 				}
 				this.status = 0;
 			}
@@ -402,13 +400,12 @@
 		audioEngineContext.selectedTrack = function(id) {
 			for (var i=0; i<this.audioObjects.length; i++)
 			{
-				if (id == i) {
-					this.audioObjects[i].outputGain.gain.value = 1.0;
-					this.audioObjects[i].play(audioContext.currentTime+0.01);
-				} else {
-					this.audioObjects[i].outputGain.gain.value = 0.0;
-					this.audioObjects[i].stop();
-				}
+				this.audioObjects[i].outputGain.gain.value = 0.0;
+				this.audioObjects[i].stop();
+			}
+			if (this.status == 1) {
+				this.audioObjects[id].outputGain.gain.value = 1.0;
+				this.audioObjects[id].play(audioContext.currentTime+0.01);
 			}
 		};
 	}
diff -r e4436132dbd9 -r 6d5701b775c2 core.js
--- a/core.js	Sun May 17 16:45:09 2015 +0100
+++ b/core.js	Sun May 17 18:40:56 2015 +0100
@@ -170,8 +170,11 @@
 	};
 	
 	this.stop = function() {
-		this.bufferNode.stop(0);
-		this.bufferNode = undefined;
+		if (this.bufferNode != undefined)
+		{
+			this.bufferNode.stop(0);
+			this.bufferNode = undefined;
+		}
 	};
 
 	this.constructTrack = function(url) {
diff -r e4436132dbd9 -r 6d5701b775c2 example_eval/project.xml
--- a/example_eval/project.xml	Sun May 17 16:45:09 2015 +0100
+++ b/example_eval/project.xml	Sun May 17 18:40:56 2015 +0100
@@ -18,7 +18,7 @@
 			<metricEnable>elementFlagMoved</metricEnable>
 		</Metric>
 	</setup>
-	<audioHolder id='0' hostURL="example_eval/" sampleRate="44100" randomiseOrder='true' repeatCount='1' loop='true' elementComments='true'>
+	<audioHolder id='0' hostURL="example_eval/" sampleRate="44100" randomiseOrder='true' repeatCount='1' loop='false' elementComments='true'>
 		<interface>
 			<title>Example Test Question</title>
 			<scale position="0">Min</scale>