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 /base/main.cpp | |
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 'base/main.cpp')
-rw-r--r-- | base/main.cpp | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/base/main.cpp b/base/main.cpp index a32589e701..3e4af53065 100644 --- a/base/main.cpp +++ b/base/main.cpp @@ -53,7 +53,6 @@ #include "gui/message.h" #include "gui/error.h" -#include "sound/audiocd.h" #include "sound/mididrv.h" #include "backends/keymapper/keymapper.h" @@ -444,15 +443,6 @@ extern "C" int scummvm_main(int argc, const char * const argv[]) { GUI::displayErrorDialog(_("Could not find any engine capable of running the selected game")); } - // We will destroy the AudioCDManager singleton here to save some memory. - // This will not make the CD audio stop, one would have to enable this: - //AudioCD.stop(); - // but the engine is responsible for stopping CD playback anyway and - // this way we catch engines not doing it properly. For some more - // information about why AudioCDManager::destroy does not stop the CD - // playback read the FIXME in sound/audiocd.h - Audio::AudioCDManager::destroy(); - // reset the graphics to default setupGraphics(system); launcherDialog(); |