[Scummvm-cvs-logs] SF.net SVN: scummvm:[43512] scummvm/trunk/engines

[lordhoto at users.sourceforge.net]

Revision: 43512
          http://scummvm.svn.sourceforge.net/scummvm/?rev=43512&view=rev
Author:   lordhoto
Date:     2009-08-18 15:31:26 +0000 (Tue, 18 Aug 2009)

Log Message:
-----------
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)

Modified Paths:
--------------
    scummvm/trunk/engines/agos/agos.cpp
    scummvm/trunk/engines/drascula/drascula.cpp
    scummvm/trunk/engines/gob/sound/cdrom.cpp
    scummvm/trunk/engines/groovie/music.cpp
    scummvm/trunk/engines/groovie/music.h
    scummvm/trunk/engines/made/made.cpp
    scummvm/trunk/engines/scumm/sound.cpp
    scummvm/trunk/engines/tinsel/tinsel.cpp

Modified: scummvm/trunk/engines/agos/agos.cpp
===================================================================
--- scummvm/trunk/engines/agos/agos.cpp	2009-08-18 15:01:32 UTC (rev 43511)
+++ scummvm/trunk/engines/agos/agos.cpp	2009-08-18 15:31:26 UTC (rev 43512)
@@ -899,7 +899,7 @@
 	if (_driver)
 		delete _driver;
 
-	AudioCD.destroy();
+	AudioCD.stop();
 
 	for (uint i = 0; i < _itemHeap.size(); i++) {
 		delete[] _itemHeap[i];

Modified: scummvm/trunk/engines/drascula/drascula.cpp
===================================================================
--- scummvm/trunk/engines/drascula/drascula.cpp	2009-08-18 15:01:32 UTC (rev 43511)
+++ scummvm/trunk/engines/drascula/drascula.cpp	2009-08-18 15:31:26 UTC (rev 43512)
@@ -106,6 +106,7 @@
 
 DrasculaEngine::~DrasculaEngine() {
 	delete _rnd;
+	stopSound();
 
 	free(_charMap);
 	free(_itemLocations);

Modified: scummvm/trunk/engines/gob/sound/cdrom.cpp
===================================================================
--- scummvm/trunk/engines/gob/sound/cdrom.cpp	2009-08-18 15:01:32 UTC (rev 43511)
+++ scummvm/trunk/engines/gob/sound/cdrom.cpp	2009-08-18 15:31:26 UTC (rev 43512)
@@ -46,6 +46,7 @@
 }
 
 CDROM::~CDROM() {
+	stop();
 }
 
 void CDROM::readLIC(DataStream &stream) {

Modified: scummvm/trunk/engines/groovie/music.cpp
===================================================================
--- scummvm/trunk/engines/groovie/music.cpp	2009-08-18 15:01:32 UTC (rev 43511)
+++ scummvm/trunk/engines/groovie/music.cpp	2009-08-18 15:31:26 UTC (rev 43512)
@@ -38,6 +38,10 @@
 	_prevCDtrack(0), _backgroundDelay(0) {
 }
 
+MusicPlayer::~MusicPlayer() {
+	AudioCD.stop();
+}
+
 void MusicPlayer::playSong(uint32 fileref) {
 	Common::StackLock lock(_mutex);
 

Modified: scummvm/trunk/engines/groovie/music.h
===================================================================
--- scummvm/trunk/engines/groovie/music.h	2009-08-18 15:01:32 UTC (rev 43511)
+++ scummvm/trunk/engines/groovie/music.h	2009-08-18 15:31:26 UTC (rev 43512)
@@ -37,7 +37,7 @@
 class MusicPlayer {
 public:
 	MusicPlayer(GroovieEngine *vm);
-	virtual ~MusicPlayer() {}
+	virtual ~MusicPlayer();
 
 	void playSong(uint32 fileref);
 	void setBackgroundSong(uint32 fileref);

Modified: scummvm/trunk/engines/made/made.cpp
===================================================================
--- scummvm/trunk/engines/made/made.cpp	2009-08-18 15:01:32 UTC (rev 43511)
+++ scummvm/trunk/engines/made/made.cpp	2009-08-18 15:31:26 UTC (rev 43512)
@@ -127,6 +127,8 @@
 }
 
 MadeEngine::~MadeEngine() {
+	AudioCD.stop();
+
 	delete _rnd;
 	delete _pmvPlayer;
 	delete _res;

Modified: scummvm/trunk/engines/scumm/sound.cpp
===================================================================
--- scummvm/trunk/engines/scumm/sound.cpp	2009-08-18 15:01:32 UTC (rev 43511)
+++ scummvm/trunk/engines/scumm/sound.cpp	2009-08-18 15:31:26 UTC (rev 43512)
@@ -86,7 +86,7 @@
 
 Sound::~Sound() {
 	stopCDTimer();
-	AudioCD.destroy();
+	AudioCD.stop();
 	delete _sfxFile;
 }
 

Modified: scummvm/trunk/engines/tinsel/tinsel.cpp
===================================================================
--- scummvm/trunk/engines/tinsel/tinsel.cpp	2009-08-18 15:01:32 UTC (rev 43511)
+++ scummvm/trunk/engines/tinsel/tinsel.cpp	2009-08-18 15:31:26 UTC (rev 43512)
@@ -888,6 +888,7 @@
 	if (MoviePlaying())
 		FinishBMV();
 
+	AudioCD.stop();
 	delete _sound;
 	delete _midiMusic;
 	delete _pcmMusic;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.