# HG changeset patch
# User Daniele Barchiesi <daniele.barchiesi@eecs.qmul.ac.uk>
# Date 1364219226 0
# Node ID c74245e413874b5bd2c9c1ab090688a91a39b0d9
# Parent  a647bd7dd38dda6c5c9fb8a111e07ff00aa89daf
• Converted audio files to MP3
• Added disclaimer on welcome page
• Changed code to handle mp3 files

diff -r a647bd7dd38d -r c74245e41387 cherryFxTest.py
--- a/cherryFxTest.py	Tue Mar 19 16:50:54 2013 +0000
+++ b/cherryFxTest.py	Mon Mar 25 13:47:06 2013 +0000
@@ -62,7 +62,7 @@
 		for cherrypy.session['cat'] in cherrypy.session['cats']:
 			cherrypy.session['dirlist'] = os.listdir('./AASPAudio/%s/'%cherrypy.session['cat'])
 			for cherrypy.session['item'] in cherrypy.session['dirlist']:
-				if cherrypy.session['item'].split('.')[-1] == 'wav':
+				if cherrypy.session['item'].split('.')[-1] == 'mp3':
 					cherrypy.session['audio'].append(cherrypy.session['cat'] + '/' + cherrypy.session['item'].split('.')[0])
 
 		random.shuffle(cherrypy.session['audio'])
diff -r a647bd7dd38d -r c74245e41387 templates.py
--- a/templates.py	Tue Mar 19 16:50:54 2013 +0000
+++ b/templates.py	Mon Mar 25 13:47:06 2013 +0000
@@ -42,8 +42,8 @@
    
 <form name="attributes" action="doAttrib" method="POST">
    <audio id="audio player 1" controls>
-     <source src="../AASPAudio/%s.wav" type="audio/wav">
-   <object class="playerpreview" type="application/x-shockwave-flash" data="player_mp3_mini.swf" width="200" height="20"><param name="movie" value="player_mp3_mini.swf" /><param name="bgcolor" value="#085c68" /><param name="FlashVars" value="mp3=../AASPAudio/%s.wav" /><embed href="player_mp3_mini.swf" bgcolor="#085c68" width="200" height="20" name="movie" align="" type="application/x-shockwave-flash" flashvars="mp3=../AASPAudio/%s.wav" /></object>
+     <source src="../AASPAudio/%s.mp3" type="audio/mp3">
+   <object class="playerpreview" type="application/x-shockwave-flash" data="player_mp3_mini.swf" width="200" height="20"><param name="movie" value="player_mp3_mini.swf" /><param name="bgcolor" value="#085c68" /><param name="FlashVars" value="mp3=../AASPAudio/%s.mp3" /><embed href="player_mp3_mini.swf" bgcolor="#085c68" width="200" height="20" name="movie" align="" type="application/x-shockwave-flash" flashvars="mp3=../AASPAudio/%s.mp3" /></object>
    </audio>
 <br>
 
@@ -179,7 +179,11 @@
 </div>
 	<br />
 <h3>Thank you for participating in this project!</h3><br />
-
+	<br/>
+	<br/>
+	Disclaimer:
+	
+	Please note that the test is NOT intended to test your hearing ability or to assess your skills as an individual. The test is anonymous and participants will be only identified by their username and by a unique code that is generated by the system. Nonetheless, if you wish that your test should not be included in the analysis and publication of this study, please send an email to daniele.barchiesi@eecs.qmul.ac.uk quoting your username and the date when you took the test.
 	</div>
 </body>