diff options
| author | Willem Jan Palenstijn | 2016-07-21 13:30:47 +0200 |
|---|---|---|
| committer | Willem Jan Palenstijn | 2016-07-21 13:30:47 +0200 |
| commit | 6f001d831623a46f643379554d20e94463d8c2f1 (patch) | |
| tree | 901caa296592814b48a98ac2e3d381331c5a7821 /engines/cine | |
| parent | 75fdd1504de98c7c6937344877685bfef6514344 (diff) | |
| parent | 5f301b24002fffb3e8e05061a92ae2e0ee3a92ec (diff) | |
| download | scummvm-rg350-6f001d831623a46f643379554d20e94463d8c2f1.tar.gz scummvm-rg350-6f001d831623a46f643379554d20e94463d8c2f1.tar.bz2 scummvm-rg350-6f001d831623a46f643379554d20e94463d8c2f1.zip | |
Merge branch 'master' into titanic
Diffstat (limited to 'engines/cine')
| -rw-r--r-- | engines/cine/main_loop.cpp | 2 | ||||
| -rw-r--r-- | engines/cine/sound.cpp | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/engines/cine/main_loop.cpp b/engines/cine/main_loop.cpp index e52fc464d5..19a2d8a82e 100644 --- a/engines/cine/main_loop.cpp +++ b/engines/cine/main_loop.cpp @@ -222,7 +222,7 @@ void manageEvents() { mouseData.left = mouseLeft; mouseData.right = mouseRight; - g_system->getAudioCDManager()->updateCD(); + g_system->getAudioCDManager()->update(); } void getMouseData(uint16 param, uint16 *pButton, uint16 *pX, uint16 *pY) { diff --git a/engines/cine/sound.cpp b/engines/cine/sound.cpp index 7cab067371..a8b4c085ff 100644 --- a/engines/cine/sound.cpp +++ b/engines/cine/sound.cpp @@ -939,6 +939,10 @@ PCSound::PCSound(Audio::Mixer *mixer, CineEngine *vm) } _player = new PCSoundFxPlayer(_soundDriver); + + // Ensure the CD is open + if (_vm->getGameType() == GType_FW && (_vm->getFeatures() & GF_CD)) + g_system->getAudioCDManager()->open(); } PCSound::~PCSound() { |