comparison core.js @ 496:cb348f6208b2 Dev_main

All interfaces support comment boxes. Comment box identification matches presented tag (for instance, AB will be Comment on fragment A, rather than 1). Tighter buffer loading protocol, audioObjects register with the buffer rather than checking for buffer existence (which can be buggy depending on the buffer state). Buffers now have a state to ensure exact location in loading chain (downloading, decoding, LUFS, ready).

 		this.url = null;
 		this.buffer = null;
 		this.xmlRequest = new XMLHttpRequest();
 		this.xmlRequest.parent = this;
 		this.users = [];
+        this.progress = 0;
+        this.status = 0;
 		this.ready = function()
 		{
+            if (this.status >= 2)
+            {
+                this.status = 3;
+            }
 			for (var i=0; i<this.users.length; i++)
 			{
 				this.users[i].state = 1;
 				if (this.users[i].interfaceDOM != null)
 				{

                         for (var n=0; n<waveObj.num_samples; n++)
                         {
                             buffer_ptr[n] = waveObj.decoded_data[c][n];
                         }
                     }
+                    
                     delete waveObj;
                 } else {
                     audioContext.decodeAudioData(bufferObj.xmlRequest.response, function(decodedData) {
                         bufferObj.buffer = decodedData;
                     }, function(e){

                             {
                                 console.log('FATAL - Fragment '+audioObj.id+' 404 error');
                                 console.log('URL: '+audioObj.url);
                                 errorSessionDump('Fragment '+audioObj.id+' 404 error');
                             }
+                            this.status = -1;
                         }
                     });
                 }
                 if (bufferObj.buffer != undefined)
                 {
+                    bufferObj.status = 2;
                     calculateLoudness(bufferObj,"I");
                 }
 			};
 			this.progress = 0;
 			this.progressCallback = function(event){

 						}
 					}
 				}
 			};
 			this.xmlRequest.addEventListener("progress", this.progressCallback);
+            this.status = 1;
 			this.xmlRequest.send();
 		};
+        
+        this.registerAudioObject = function(audioObject)
+        {
+            // Called by an audioObject to register to the buffer for use
+            // First check if already in the register pool
+            for (var objects of this.users)
+            {
+                if (audioObject.id == objects.id){return 0;}
+            }
+            this.users.push(audioObject);
+            if (this.status == 3)
+            {
+                // The buffer is already ready, trigger bufferLoaded
+                audioObject.bufferLoaded(this);
+            }
+        }
 	};
 	
 	this.play = function(id) {
 		// Start the timer and set the audioEngine state to playing (1)
 		if (this.status == 0 && this.loopPlayback) {

 		}
 		if (buffer == null)
 		{
 			console.log("[WARN]: Buffer was not loaded in pre-test! "+URL);
 			buffer = new this.bufferObj();
+            this.buffers.push(buffer);
 			buffer.getMedia(URL);
-			this.buffers.push(buffer);
 		}
 		this.audioObjects[audioObjectId].specification = element;
 		this.audioObjects[audioObjectId].url = URL;
-		buffer.users.push(this.audioObjects[audioObjectId]);
 		// Obtain store node
 		var aeNodes = this.pageStore.XMLDOM.getElementsByTagName('audioelement');
 		for (var i=0; i<aeNodes.length; i++)
 		{
 			if(aeNodes[i].id == element.id)
 			{
 				this.audioObjects[audioObjectId].storeDOM = aeNodes[i];
 				break;
 			}
 		}
-		if (buffer.buffer.lufs != undefined)
-		{
-			this.audioObjects[audioObjectId].bufferLoaded(buffer);
-		}
+        buffer.registerAudioObject(this.audioObjects[audioObjectId]);
 		return this.audioObjects[audioObjectId];
 	};
 	
 	this.newTestPage = function(store) {
 		this.pageStore = store;

 		this.trackComment = document.createElement('div');
 		this.trackComment.className = 'comment-div';
 		this.trackComment.id = 'comment-div-'+audioObject.id;
 		// Create a string next to each comment asking for a comment
 		this.trackString = document.createElement('span');
-		this.trackString.innerHTML = audioHolderObject.commentBoxPrefix+' '+audioObject.id;
+		this.trackString.innerHTML = audioHolderObject.commentBoxPrefix+' '+audioObject.interfaceDOM.getPresentedId();
 		// Create the HTML5 comment box 'textarea'
 		this.trackCommentBox = document.createElement('textarea');
 		this.trackCommentBox.rows = '4';
 		this.trackCommentBox.cols = '100';
 		this.trackCommentBox.name = 'trackComment'+audioObject.id;