changeset 294:df7263170715 Dev_main

Bug #1370: Fragments marked as outside reference are no longer checked for movement parameters in APE.
author Nicholas Jillings <n.g.r.jillings@se14.qmul.ac.uk>
date Thu, 10 Sep 2015 12:32:56 +0100
parents 522b0b0da26e
children 2d64fec077a5
files ape.js example_eval/project.xml
diffstat 2 files changed, 5 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/ape.js	Wed Sep 09 10:35:04 2015 +0100
+++ b/ape.js	Thu Sep 10 12:32:56 2015 +0100
@@ -83,7 +83,7 @@
 		var strNums = [];
 		for (var i=0; i<audioObjs.length; i++)
 		{
-			if (audioObjs[i].metric.wasMoved == false) {
+			if (audioObjs[i].metric.wasMoved == false && audioObjs[i].specification.type != 'outsidereference') {
 				state = false;
 				strNums.push(i);
 			}
--- a/example_eval/project.xml	Wed Sep 09 10:35:04 2015 +0100
+++ b/example_eval/project.xml	Thu Sep 10 12:32:56 2015 +0100
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <BrowserEvalProjectDocument>
-	<setup interface="MUSHRA" projectReturn="save.php" randomiseOrder='true' collectMetrics='true'>
+	<setup interface="APE" projectReturn="save.php" randomiseOrder='true' collectMetrics='true'>
 		<PreTest>
 			<question id="Location" mandatory="true" boxsize="large">Please enter your location.</question>
 			<checkbox id="experience">
@@ -37,8 +37,8 @@
 		<interface>
 			<!--<check name="fragmentPlayed"/>
 			<check name="fragmentFullPlayback"/>
+			<check name="fragmentComments"/>-->
 			<check name="fragmentMoved"/>
-			<check name="fragmentComments"/>-->
 			<check name="scalerange" min="25" max="75"/>
 			<option name='playhead'/>
 			<option name="page-count"/>
@@ -58,7 +58,7 @@
 		<audioElements url="1.wav" id="1"/>
 		<audioElements url="2.wav" id="2"/>
 		<audioElements url="3.wav" id="3"/>
-		<audioElements url="4.wav" id="4" type="outsidereference"/>
+		<audioElements url="4.wav" id="4"/>
 		<!--<audioElements url="5.wav" id="5"/>
 		<audioElements url="6.wav" id="6"/>
 		<audioElements url="7.wav" id="7"/>
@@ -103,7 +103,7 @@
         <audioElements url="3.wav" id="3"/>
         <audioElements url="4.wav" id="4"/>
         <audioElements url="5.wav" id="5"/>
-        <audioElements url="6.wav" id="6"/>
+        <audioElements url="6.wav" id="6" type="outsidereference"/>
         <!-- <audioElements url="7.wav" id="7"/>
          <audioElements url="8.wav" id="8"/>
          <audioElements url="9.wav" id="9"/>