# HG changeset patch
# User Nicholas Jillings <nicholas.jillings@mail.bcu.ac.uk>
# Date 1460556882 -3600
# Node ID d87b8419df2813ad916003ebc1a612188221ecb9
# Parent  30bffc455b4dd35ea374b084d8102c57d4d85e6f
Completed cross fading of tracks selectable by user attribute crossFade in <setup> node. Default is 0 seconds (no cross fade).

diff -r 30bffc455b4d -r d87b8419df28 core.js
--- a/core.js	Wed Apr 13 14:21:04 2016 +0100
+++ b/core.js	Wed Apr 13 15:14:42 2016 +0100
@@ -1287,7 +1287,7 @@
                 var setTime = audioContext.currentTime+specification.crossFade;
 				for (var i=0; i<this.audioObjects.length; i++)
 				{
-					this.audioObjects[i].play(setTime);
+					this.audioObjects[i].play(audioContext.currentTime);
 					if (id == i) {
 						this.audioObjects[i].loopStart(setTime);
 					} else {
diff -r 30bffc455b4d -r d87b8419df28 example_eval/radio_example.xml
--- a/example_eval/radio_example.xml	Wed Apr 13 14:21:04 2016 +0100
+++ b/example_eval/radio_example.xml	Wed Apr 13 15:14:42 2016 +0100
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <waet xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="test-schema.xsd">
-	<setup interface="likert" projectReturn="save.php">
+	<setup interface="likert" projectReturn="save.php" crossFade="3.0">
 		<metric>
 			<metricenable>testTimer</metricenable>
 			<metricenable>elementTimer</metricenable>