Mercurial > hg > webaudioevaluationtool

changeset 2662:e52cdf24e817

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge branch 'master' of https://github.com/BrechtDeMan/WebAudioEvaluationTool
author www-data <www-data@sucuk.dcs.qmul.ac.uk>
date Wed, 01 Mar 2017 12:20:49 +0000
parents 1662f4df5de6 (current diff) 7ebeb0bffc5a (diff)
children 93a7318fc2c5
files
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/js/core.js	Wed Mar 01 10:22:02 2017 +0000
+++ b/js/core.js	Wed Mar 01 12:20:49 2017 +0000
@@ -1879,10 +1879,10 @@
             copybuffer.buffer = copybuffer.copyBuffer(preSilenceTime, postSilenceTime);
         }
 
-        copybuffer.lufs = callee.buffer.lufs;
+        copybuffer.buffer.lufs = callee.buffer.lufs;
         this.buffer = copybuffer;
 
-        var targetLUFS = this.specification.parent.loudness || specification.loudness;
+        var targetLUFS = this.specification.loudness || this.specification.parent.loudness || specification.loudness;
         if (typeof targetLUFS === "number" && isFinite(targetLUFS)) {
             this.buffer.buffer.playbackGain = decibelToLinear(targetLUFS - this.buffer.buffer.lufs);
         } else {