[Scummvm-cvs-logs] SF.net SVN: scummvm:[51713] scummvm/branches/gsoc2010-testbed

[sud03r at users.sourceforge.net]

Revision: 51713
          http://scummvm.svn.sourceforge.net/scummvm/?rev=51713&view=rev
Author:   sud03r
Date:     2010-08-03 20:26:28 +0000 (Tue, 03 Aug 2010)

Log Message:
-----------
TESTBED: added audiocd test sound tracks as the testbed engine data

Modified Paths:
--------------
    scummvm/branches/gsoc2010-testbed/dists/engine-data/create-testbed-data.sh
    scummvm/branches/gsoc2010-testbed/engines/testbed/sound.cpp

Added Paths:
-----------
    scummvm/branches/gsoc2010-testbed/dists/engine-data/testbed-audiocd-files/
    scummvm/branches/gsoc2010-testbed/dists/engine-data/testbed-audiocd-files/track01.mp3
    scummvm/branches/gsoc2010-testbed/dists/engine-data/testbed-audiocd-files/track02.mp3
    scummvm/branches/gsoc2010-testbed/dists/engine-data/testbed-audiocd-files/track03.mp3
    scummvm/branches/gsoc2010-testbed/dists/engine-data/testbed-audiocd-files/track04.mp3

Modified: scummvm/branches/gsoc2010-testbed/dists/engine-data/create-testbed-data.sh
===================================================================
--- scummvm/branches/gsoc2010-testbed/dists/engine-data/create-testbed-data.sh	2010-08-03 19:43:16 UTC (rev 51712)
+++ scummvm/branches/gsoc2010-testbed/dists/engine-data/create-testbed-data.sh	2010-08-03 20:26:28 UTC (rev 51713)
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # Create the directory structure
-# Avoided bash shortcuts/ file-seperators in interest of portability
+# Avoided bash shortcuts / file-seperators in interest of portability
 
 if [ -e testbed ]; then
 	echo "Game-data already present as testbed/"
@@ -45,4 +45,8 @@
 
 # back to the top
 cd ..
+
+# move the audiocd data to newly created directory
+cp -r testbed-audiocd-files testbed/audiocd-files
+
 echo "Game data created"

Added: scummvm/branches/gsoc2010-testbed/dists/engine-data/testbed-audiocd-files/track01.mp3
===================================================================
(Binary files differ)


Property changes on: scummvm/branches/gsoc2010-testbed/dists/engine-data/testbed-audiocd-files/track01.mp3
___________________________________________________________________
Added: svn:executable
   + *
Added: svn:mime-type
   + application/octet-stream

Added: scummvm/branches/gsoc2010-testbed/dists/engine-data/testbed-audiocd-files/track02.mp3
===================================================================
(Binary files differ)


Property changes on: scummvm/branches/gsoc2010-testbed/dists/engine-data/testbed-audiocd-files/track02.mp3
___________________________________________________________________
Added: svn:executable
   + *
Added: svn:mime-type
   + application/octet-stream

Added: scummvm/branches/gsoc2010-testbed/dists/engine-data/testbed-audiocd-files/track03.mp3
===================================================================
(Binary files differ)


Property changes on: scummvm/branches/gsoc2010-testbed/dists/engine-data/testbed-audiocd-files/track03.mp3
___________________________________________________________________
Added: svn:executable
   + *
Added: svn:mime-type
   + application/octet-stream

Added: scummvm/branches/gsoc2010-testbed/dists/engine-data/testbed-audiocd-files/track04.mp3
===================================================================
(Binary files differ)


Property changes on: scummvm/branches/gsoc2010-testbed/dists/engine-data/testbed-audiocd-files/track04.mp3
___________________________________________________________________
Added: svn:executable
   + *
Added: svn:mime-type
   + application/octet-stream

Modified: scummvm/branches/gsoc2010-testbed/engines/testbed/sound.cpp
===================================================================
--- scummvm/branches/gsoc2010-testbed/engines/testbed/sound.cpp	2010-08-03 19:43:16 UTC (rev 51712)
+++ scummvm/branches/gsoc2010-testbed/engines/testbed/sound.cpp	2010-08-03 20:26:28 UTC (rev 51713)
@@ -187,6 +187,10 @@
 	Common::Point pt(0, 100);
 	Testsuite::writeOnScreen("Playing the tracks of testCD in order i.e 1-2-3-last", pt);
 
+	// Make audio-files discoverable
+	Common::FSNode gameRoot(ConfMan.get("path"));
+	SearchMan.addSubDirectoryMatching(gameRoot, "audiocd-files");
+
 	// Play all tracks
 	for (int i = 1; i < 5; i++) { 
 		AudioCD.play(i, 1, 0, 0);
@@ -199,7 +203,7 @@
 
 	Testsuite::clearScreen();
 	if (Testsuite::handleInteractiveInput("Were all the tracks played in order i.e 1-2-3-last ?", "Yes", "No", kOptionRight)) {
-		Testsuite::logDetailedPrintf("Error! Error in AudioCD.play()\n");
+		Testsuite::logPrintf("Error! Error in AudioCD.play() or probably sound files were not detected, try -d1 (debuglevel 1)\n");
 		passed = false;
 	}
 	
@@ -209,7 +213,7 @@
 SoundSubsystemTestSuite::SoundSubsystemTestSuite() {
 	addTest("SimpleBeeps", &SoundSubsystem::playBeeps, true);
 	addTest("MixSounds", &SoundSubsystem::mixSounds, true);
-	addTest("AudioCD outputs", &SoundSubsystem::audiocdOutput, true);
+	addTest("AudiocdOutput", &SoundSubsystem::audiocdOutput, true);
 }
 
 }	// End of namespace Testbed


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.