diff options
| author | Max Horn | 2010-11-08 22:53:36 +0000 |
|---|---|---|
| committer | Max Horn | 2010-11-08 22:53:36 +0000 |
| commit | 82e473bc3b1498325bad28d804e4314f0c3a528c (patch) | |
| tree | f186d8b9eeb665a81897deca3a3fadcf74007c16 /engines/testbed | |
| parent | 4242229c91c356bdd90c66ce8c0642488a1b4bf5 (diff) | |
| parent | 74a53df11b51fa4956745c086b2e6351b8383568 (diff) | |
| download | scummvm-rg350-82e473bc3b1498325bad28d804e4314f0c3a528c.tar.gz scummvm-rg350-82e473bc3b1498325bad28d804e4314f0c3a528c.tar.bz2 scummvm-rg350-82e473bc3b1498325bad28d804e4314f0c3a528c.zip | |
BACKENDS: Partial merge of gsoc2010-opengl: Audio CD changes only
This commit contains the AudioCDManager changes from the gsoc2010-opengl
branch. The other changes in that branch are restricted to the backends
directory only (plus configure).
The Nintendo DS and Dreamcast ports still need to be ported over to
the new Audio CD system, but that should be fairly easy to do.
svn-id: r54147
Diffstat (limited to 'engines/testbed')
| -rw-r--r-- | engines/testbed/sound.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/engines/testbed/sound.cpp b/engines/testbed/sound.cpp index 615793da74..b2f61ab714 100644 --- a/engines/testbed/sound.cpp +++ b/engines/testbed/sound.cpp @@ -22,7 +22,6 @@ * $Id$ */ -#include "sound/audiocd.h" #include "sound/softsynth/pcspk.h" #include "testbed/sound.h" @@ -190,8 +189,8 @@ 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::format("Playing Now: track%02d", i), pt); } @@ -200,7 +199,7 @@ TestExitStatus SoundSubsystem::audiocdOutput() { 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; } |