comparison core.js @ 795:a75a4e0af44f

Specification document handles optional loudness control.

 			this.buffers.push(buffer);
 		}
 		this.audioObjects[audioObjectId].specification = element;
 		this.audioObjects[audioObjectId].url = URL;
 		this.audioObjects[audioObjectId].buffer = buffer;
+		var targetLUFS = this.audioObjects[audioObjectId].specification.parent.loudness;
+		if (typeof targetLUFS === "number")
+		{
+			buffer.buffer.gain = decibelToLinear(targetLUFS - buffer.buffer.lufs);
+		} else {
+			buffer.buffer.gain = 1.0;
+		}
 		if (buffer.buffer != null)
 		{
 			this.audioObjects[audioObjectId].state = 1;
 		}
 		buffer.users.push(this.audioObjects[audioObjectId]);

 	this.randomiseOrder = null;
 	this.collectMetrics = null;
 	this.testPages = null;
 	this.audioHolders = [];
 	this.metrics = [];
+	this.loudness = null;
 	
 	this.decode = function(projectXML) {
 		// projectXML - DOM Parsed document
 		this.projectXML = projectXML.childNodes[0];
 		var setupNode = projectXML.getElementsByTagName('setup')[0];

 		{
 			this.testPages = null;
 		} else {
 			this.testPages = Number(this.testPages);
 			if (this.testPages == 0) {this.testPages = null;}
+		}
+		if (setupNode.getAttribute('loudness') != null)
+		{
+			var XMLloudness = setupNode.getAttribute('loudness');
+			if (isNaN(Number(XMLloudness)) == false)
+			{
+				this.loudness = Number(XMLloudness);
+			}
 		}
 		var metricCollection = setupNode.getElementsByTagName('Metric');
 		
 		var setupPreTestNode = setupNode.getElementsByTagName('PreTest');
 		if (setupPreTestNode.length != 0)

 		setupNode.setAttribute('interface',this.interfaceType);
 		setupNode.setAttribute('projectReturn',this.projectReturn);
 		setupNode.setAttribute('randomiseOrder',this.randomiseOrder);
 		setupNode.setAttribute('collectMetrics',this.collectMetrics);
 		setupNode.setAttribute('testPages',this.testPages);
+		if(this.loudness != null) {AHNode.setAttribute("loudness",this.loudness);}
 		
 		var setupPreTest = root.createElement("PreTest");
 		for (var i=0; i<this.preTest.options.length; i++)
 		{
 			setupPreTest.appendChild(this.preTest.options[i].exportXML(root));

 		this.sampleRate = undefined;
 		this.randomiseOrder = undefined;
 		this.loop = undefined;
 		this.elementComments = undefined;
 		this.outsideReference = null;
+		this.loudness = null;
 		this.preTest = new parent.prepostNode("pretest");
 		this.postTest = new parent.prepostNode("pretest");
 		this.interfaces = [];
 		this.commentBoxPrefix = "Comment on track";
 		this.audioElements = [];

 			this.repeatCount = xml.getAttribute('repeatCount');
 			if (xml.getAttribute('loop') == 'true') {this.loop = true;}
 			else {this.loop == false;}
 			if (xml.getAttribute('elementComments') == "true") {this.elementComments = true;}
 			else {this.elementComments = false;}
-			
+			if (typeof parent.loudness === "number")
+			{
+				this.loudness = parent.loudness;
+			}
+			if (xml.getAttribute('loudness') != null)
+			{
+				var XMLloudness = xml.getAttribute('loudness');
+				if (isNaN(Number(XMLloudness)) == false)
+				{
+					this.loudness = Number(XMLloudness);
+				}
+			}
 			var setupPreTestNode = xml.getElementsByTagName('PreTest');
 			if (setupPreTestNode.length != 0)
 			{
 				setupPreTestNode = setupPreTestNode[0];
 				this.preTest.construct(setupPreTestNode);

 			AHNode.setAttribute("sampleRate",this.sampleRate);
 			AHNode.setAttribute("randomiseOrder",this.randomiseOrder);
 			AHNode.setAttribute("repeatCount",this.repeatCount);
 			AHNode.setAttribute("loop",this.loop);
 			AHNode.setAttribute("elementComments",this.elementComments);
+			if(this.loudness != null) {AHNode.setAttribute("loudness",this.loudness);}
 			
 			for (var i=0; i<this.interfaces.length; i++)
 			{
 				AHNode.appendChild(this.interfaces[i].encode(root));
 			}