diff options
| author | Alejandro Marzini | 2010-06-09 20:09:57 +0000 |
|---|---|---|
| committer | Alejandro Marzini | 2010-06-09 20:09:57 +0000 |
| commit | e991cd8c53ad21af037df1e0a16816aeea2d0fe2 (patch) | |
| tree | f647f636fc3898c150db61de50c3522056a65d17 /engines/agos/res_snd.cpp | |
| parent | 4177a1e16df7712c081e41a8eabf0b7d4694230b (diff) | |
| download | scummvm-rg350-e991cd8c53ad21af037df1e0a16816aeea2d0fe2.tar.gz scummvm-rg350-e991cd8c53ad21af037df1e0a16816aeea2d0fe2.tar.bz2 scummvm-rg350-e991cd8c53ad21af037df1e0a16816aeea2d0fe2.zip | |
- Revised abstract AudioCDManager.
- Removed AudioCDManager Singleton, and changed code for using AudioCDManager in OSystem.
- Added initialization code for new AudioCDManager in BaseBackend and OSystem_SDL.
svn-id: r49548
Diffstat (limited to 'engines/agos/res_snd.cpp')
| -rw-r--r-- | engines/agos/res_snd.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/engines/agos/res_snd.cpp b/engines/agos/res_snd.cpp index 6e54d926c4..11f675289b 100644 --- a/engines/agos/res_snd.cpp +++ b/engines/agos/res_snd.cpp @@ -30,7 +30,6 @@ #include "agos/agos.h" #include "agos/vga.h" -#include "sound/audiocd.h" #include "sound/audiostream.h" #include "sound/mididrv.h" #include "sound/mods/protracker.h" @@ -228,9 +227,9 @@ void AGOSEngine_Simon1::playMusic(uint16 music, uint16 track) { stopMusic(); // Support for compressed music from the ScummVM Music Enhancement Project - AudioCD.stop(); - AudioCD.play(music + 1, -1, 0, 0); - if (AudioCD.isPlaying()) + _system->getAudioCD()->stop(); + _system->getAudioCD()->play(music + 1, -1, 0, 0); + if (_system->getAudioCD()->isPlaying()) return; if (getPlatform() == Common::kPlatformAmiga) { |