# HG changeset patch
# User Nicholas Jillings <n.g.r.jillings@se14.qmul.ac.uk>
# Date 1464341975 -3600
# Node ID d44b5e04acbc2c757d0f34bdc8c6c4382b2e6d04
# Parent  18f88a726ccdae019578bb658f8e1da28837ab5a# Parent  52aed03f5db9346aa8d02993a779e57d78a83325
Merge branch 'master' into Dev_main

diff -r 18f88a726ccd -r d44b5e04acbc js/core.js
--- a/js/core.js	Fri May 27 10:39:23 2016 +0100
+++ b/js/core.js	Fri May 27 10:39:35 2016 +0100
@@ -1270,45 +1270,32 @@
                 // Use inbuilt WAVE decoder first
                 if (this.status == -1) {return;}
                 var waveObj = new WAVE();
-                if (waveObj.open(bufferObj.xmlRequest.response) == 0)
-                {
-                    bufferObj.buffer = audioContext.createBuffer(waveObj.num_channels,waveObj.num_samples,waveObj.sample_rate);
-                    for (var c=0; c<waveObj.num_channels; c++)
-                    {
-                        var buffer_ptr = bufferObj.buffer.getChannelData(c);
-                        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) {
+                audioContext.decodeAudioData(bufferObj.xmlRequest.response, function(decodedData) {
                         bufferObj.buffer = decodedData;
                         bufferObj.status = 2;
                         calculateLoudness(bufferObj,"I");
-                    }, function(e){
-                        // Should only be called if there was an error, but sometimes gets called continuously
-                        // Check here if the error is genuine
-                        if (bufferObj.xmlRequest.response == undefined) {
-                            // Genuine error
-                            console.log('FATAL - Error loading buffer on '+audioObj.id);
-                            if (request.status == 404)
+                }, function(e) {
+                    var waveObj = new WAVE();
+                    if (waveObj.open(bufferObj.xmlRequest.response) == 0)
+                    {
+                        bufferObj.buffer = audioContext.createBuffer(waveObj.num_channels,waveObj.num_samples,waveObj.sample_rate);
+                        for (var c=0; c<waveObj.num_channels; c++)
+                        {
+                            var buffer_ptr = bufferObj.buffer.getChannelData(c);
+                            for (var n=0; n<waveObj.num_samples; n++)
                             {
-                                console.log('FATAL - Fragment '+audioObj.id+' 404 error');
-                                console.log('URL: '+audioObj.url);
-                                errorSessionDump('Fragment '+audioObj.id+' 404 error');
+                                buffer_ptr[n] = waveObj.decoded_data[c][n];
                             }
-                            this.parent.status = -1;
                         }
-                    });
-                }
-                if (bufferObj.buffer != undefined)
-                {
-                    bufferObj.status = 2;
-                    calculateLoudness(bufferObj,"I");
-                }
+
+                        delete waveObj;
+                    }
+                    if (bufferObj.buffer != undefined)
+                    {
+                        bufferObj.status = 2;
+                        calculateLoudness(bufferObj,"I");
+                    }
+                });
 			};
             
             // Create callback for any error in loading