mirror of
https://github.com/libretro/scummvm.git
synced 2025-04-02 14:51:40 +00:00
Made AGOS, DRASCULA, GOB, GROOVIE, MADE, SCUMM and TINSEL properly stop CD audio playback on engine quit. (This only problem affected playback from CD, not from ripped audio files)
svn-id: r43512
This commit is contained in:
parent
db0cd620f6
commit
b33b90ecd0
@ -899,7 +899,7 @@ AGOSEngine::~AGOSEngine() {
|
||||
if (_driver)
|
||||
delete _driver;
|
||||
|
||||
AudioCD.destroy();
|
||||
AudioCD.stop();
|
||||
|
||||
for (uint i = 0; i < _itemHeap.size(); i++) {
|
||||
delete[] _itemHeap[i];
|
||||
|
@ -106,6 +106,7 @@ DrasculaEngine::DrasculaEngine(OSystem *syst, const DrasculaGameDescription *gam
|
||||
|
||||
DrasculaEngine::~DrasculaEngine() {
|
||||
delete _rnd;
|
||||
stopSound();
|
||||
|
||||
free(_charMap);
|
||||
free(_itemLocations);
|
||||
|
@ -46,6 +46,7 @@ CDROM::CDROM() {
|
||||
}
|
||||
|
||||
CDROM::~CDROM() {
|
||||
stop();
|
||||
}
|
||||
|
||||
void CDROM::readLIC(DataStream &stream) {
|
||||
|
@ -38,6 +38,10 @@ MusicPlayer::MusicPlayer(GroovieEngine *vm) :
|
||||
_prevCDtrack(0), _backgroundDelay(0) {
|
||||
}
|
||||
|
||||
MusicPlayer::~MusicPlayer() {
|
||||
AudioCD.stop();
|
||||
}
|
||||
|
||||
void MusicPlayer::playSong(uint32 fileref) {
|
||||
Common::StackLock lock(_mutex);
|
||||
|
||||
|
@ -37,7 +37,7 @@ namespace Groovie {
|
||||
class MusicPlayer {
|
||||
public:
|
||||
MusicPlayer(GroovieEngine *vm);
|
||||
virtual ~MusicPlayer() {}
|
||||
virtual ~MusicPlayer();
|
||||
|
||||
void playSong(uint32 fileref);
|
||||
void setBackgroundSong(uint32 fileref);
|
||||
|
@ -127,6 +127,8 @@ MadeEngine::MadeEngine(OSystem *syst, const MadeGameDescription *gameDesc) : Eng
|
||||
}
|
||||
|
||||
MadeEngine::~MadeEngine() {
|
||||
AudioCD.stop();
|
||||
|
||||
delete _rnd;
|
||||
delete _pmvPlayer;
|
||||
delete _res;
|
||||
|
@ -86,7 +86,7 @@ Sound::Sound(ScummEngine *parent, Audio::Mixer *mixer)
|
||||
|
||||
Sound::~Sound() {
|
||||
stopCDTimer();
|
||||
AudioCD.destroy();
|
||||
AudioCD.stop();
|
||||
delete _sfxFile;
|
||||
}
|
||||
|
||||
|
@ -888,6 +888,7 @@ TinselEngine::~TinselEngine() {
|
||||
if (MoviePlaying())
|
||||
FinishBMV();
|
||||
|
||||
AudioCD.stop();
|
||||
delete _sound;
|
||||
delete _midiMusic;
|
||||
delete _pcmMusic;
|
||||
|
Loading…
x
Reference in New Issue
Block a user