Mercurial > hg > webaudioevaluationtool

diff js/core.js @ 2680:470bbfd78a96

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge branch 'vnext' into Dev_main
author Nicholas Jillings <nicholas.jillings@mail.bcu.ac.uk>
date Wed, 01 Mar 2017 11:56:08 +0000
parents 628f447a021b 7ebeb0bffc5a
children 95f614a82762
line wrap: on
line diff
--- a/js/core.js	Wed Mar 01 11:32:38 2017 +0000
+++ b/js/core.js	Wed Mar 01 11:56:08 2017 +0000
@@ -1916,10 +1916,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 {