# HG changeset patch
# User Nicholas Jillings <nicholas.jillings@eecs.qmul.ac.uk>
# Date 1450369789 0
# Node ID 801e1977ab55dd8049c8f8f44ebceb6afe1e61cd
# Parent  57a3cbf90e01170d75f82e5cced66d34bf9a5d00
MUSHRA: Loading progress feedback

diff -r 57a3cbf90e01 -r 801e1977ab55 core.js
--- a/core.js	Thu Dec 17 16:10:58 2015 +0000
+++ b/core.js	Thu Dec 17 16:29:49 2015 +0000
@@ -767,6 +767,7 @@
 		this.url = null;
 		this.buffer = null;
 		this.xmlRequest = new XMLHttpRequest();
+		this.xmlRequest.parent = this;
 		this.users = [];
 		this.getMedia = function(url) {
 			this.url = url;
@@ -807,7 +808,17 @@
 			this.progressCallback = function(event){
 				if (event.lengthComputable)
 				{
-					this.progress = event.loaded / event.total;
+					this.parent.progress = event.loaded / event.total;
+					for (var i=0; i<this.parent.users.length; i++)
+					{
+						if(this.parent.users[i].interfaceDOM != null)
+						{
+							if (typeof this.parent.users[i].interfaceDOM.updateLoading === "function")
+							{
+								this.parent.users[i].interfaceDOM.updateLoading(this.parent.progress*100);
+							}
+						}
+					}
 				}
 			};
 			this.xmlRequest.addEventListener("progress", this.progressCallback);
diff -r 57a3cbf90e01 -r 801e1977ab55 mushra.css
--- a/mushra.css	Thu Dec 17 16:10:58 2015 +0000
+++ b/mushra.css	Thu Dec 17 16:29:49 2015 +0000
@@ -50,11 +50,8 @@
 }
 
 input.track-slider-range {
-	width: 100%;
 	margin-left: 0px;
 	margin-right: 0px;
-	padding-left: 0px;
-	padding-top: 0px;
 }
 
 input[type=range][orient=vertical]
@@ -63,4 +60,5 @@
     -webkit-appearance: slider-vertical; /* WebKit */
     width: 8px;
     padding: 0 5px;
+    color: rgb(255, 144, 144);
 }
\ No newline at end of file
diff -r 57a3cbf90e01 -r 801e1977ab55 mushra.js
--- a/mushra.js	Thu Dec 17 16:10:58 2015 +0000
+++ b/mushra.js	Thu Dec 17 16:29:49 2015 +0000
@@ -195,7 +195,7 @@
 		console.log('slider '+id+' moved to '+this.value+' ('+time+')');
 	};
 	
-	this.play.textContent = "Play";
+	this.play.textContent = "Loading...";
 	this.play.value = audioObject.id;
 	this.play.style.float = "left";
 	this.play.style.width = "100%";
@@ -211,6 +211,7 @@
 	
 	this.enable = function() {
 		this.play.disabled = false;
+		this.play.textContent = "Play";
 		$(this.slider).removeClass('track-slider-disabled');
 	};
 	
@@ -229,6 +230,12 @@
 		this.holder.style.height = window.innerHeight-200 + 'px';
 		this.slider.style.height = window.innerHeight-250 + 'px';
 	}
+	this.updateLoading = function(progress)
+	{
+		progress = String(progress);
+		progress = progress.substr(0,5);
+		this.play.textContent = "Loading: "+progress+"%";
+	}
 	
 	if (this.parent.state == 1)
 	{