diff options
Diffstat (limited to 'engines/testbed/sound.cpp')
| -rw-r--r-- | engines/testbed/sound.cpp | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/engines/testbed/sound.cpp b/engines/testbed/sound.cpp index e256621553..8354e7bad0 100644 --- a/engines/testbed/sound.cpp +++ b/engines/testbed/sound.cpp @@ -22,9 +22,10 @@ * $Id$ */ -#include "sound/audiocd.h" #include "sound/softsynth/pcspk.h" +#include "backends/audiocd/audiocd.h" + #include "testbed/sound.h" namespace Testbed { @@ -190,17 +191,17 @@ TestExitStatus SoundSubsystem::audiocdOutput() { // Play all tracks for (int i = 1; i < 5; i++) { - AudioCD.play(i, 1, 0, 0); - while (AudioCD.isPlaying()) { + g_system->getAudioCDManager()->play(i, 1, 0, 0); + while (g_system->getAudioCDManager()->isPlaying()) { g_system->delayMillis(500); - Testsuite::writeOnScreen(Common::String::printf("Playing Now: track%02d", i), pt); + Testsuite::writeOnScreen(Common::String::format("Playing Now: track%02d", i), pt); } g_system->delayMillis(500); } Testsuite::clearScreen(); if (Testsuite::handleInteractiveInput("Were all the tracks played in order i.e 1-2-3-last ?", "Yes", "No", kOptionRight)) { - Testsuite::logPrintf("Error! Error in AudioCD.play() or probably sound files were not detected, try -d1 (debuglevel 1)\n"); + Testsuite::logPrintf("Error! Error in _system->getAudioCDManager()->play() or probably sound files were not detected, try -d1 (debuglevel 1)\n"); passed = kTestFailed; } @@ -234,19 +235,19 @@ TestExitStatus SoundSubsystem::sampleRates() { Common::Point pt(0, 100); mixer->playStream(Audio::Mixer::kPlainSoundType, &handle, s1); - Testsuite::writeOnScreen(Common::String::printf("Playing at smaple rate: %d", s1->getRate()), pt); + Testsuite::writeOnScreen(Common::String::format("Playing at smaple rate: %d", s1->getRate()), pt); g_system->delayMillis(1000); mixer->stopHandle(handle); g_system->delayMillis(1000); mixer->playStream(Audio::Mixer::kSpeechSoundType, &handle, s2); - Testsuite::writeOnScreen(Common::String::printf("Playing at sample rate : %d", s2->getRate()), pt); + Testsuite::writeOnScreen(Common::String::format("Playing at sample rate : %d", s2->getRate()), pt); g_system->delayMillis(1000); mixer->stopHandle(handle); g_system->delayMillis(1000); mixer->playStream(Audio::Mixer::kSFXSoundType, &handle, s3); - Testsuite::writeOnScreen(Common::String::printf("Playing at sample rate : %d", s3->getRate()), pt); + Testsuite::writeOnScreen(Common::String::format("Playing at sample rate : %d", s3->getRate()), pt); g_system->delayMillis(1000); mixer->stopHandle(handle); g_system->delayMillis(1000); |