[Scummvm-cvs-logs] SF.net SVN: scummvm:[43516] scummvm/branches/branch-1-0-0/engines

lordhoto at users.sourceforge.net lordhoto at users.sourceforge.net
Tue Aug 18 17:57:54 CEST 2009


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

Log Message:
-----------
Backport of CD audio playback fixes from r43512.

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

Modified: scummvm/branches/branch-1-0-0/engines/agos/agos.cpp
===================================================================
--- scummvm/branches/branch-1-0-0/engines/agos/agos.cpp	2009-08-18 15:41:00 UTC (rev 43515)
+++ scummvm/branches/branch-1-0-0/engines/agos/agos.cpp	2009-08-18 15:57:54 UTC (rev 43516)
@@ -900,7 +900,7 @@
 	if (_driver)
 		delete _driver;
 
-	AudioCD.destroy();
+	AudioCD.stop();
 
 	for (uint i = 0; i < _itemHeap.size(); i++) {
 		delete[] _itemHeap[i];

Modified: scummvm/branches/branch-1-0-0/engines/drascula/drascula.cpp
===================================================================
--- scummvm/branches/branch-1-0-0/engines/drascula/drascula.cpp	2009-08-18 15:41:00 UTC (rev 43515)
+++ scummvm/branches/branch-1-0-0/engines/drascula/drascula.cpp	2009-08-18 15:57:54 UTC (rev 43516)
@@ -105,6 +105,7 @@
 
 DrasculaEngine::~DrasculaEngine() {
 	delete _rnd;
+	stopSound();
 
 	free(_charMap);
 	free(_itemLocations);

Modified: scummvm/branches/branch-1-0-0/engines/gob/sound/cdrom.cpp
===================================================================
--- scummvm/branches/branch-1-0-0/engines/gob/sound/cdrom.cpp	2009-08-18 15:41:00 UTC (rev 43515)
+++ scummvm/branches/branch-1-0-0/engines/gob/sound/cdrom.cpp	2009-08-18 15:57:54 UTC (rev 43516)
@@ -46,6 +46,7 @@
 }
 
 CDROM::~CDROM() {
+	stop();
 }
 
 void CDROM::readLIC(DataStream &stream) {

Modified: scummvm/branches/branch-1-0-0/engines/groovie/music.cpp
===================================================================
--- scummvm/branches/branch-1-0-0/engines/groovie/music.cpp	2009-08-18 15:41:00 UTC (rev 43515)
+++ scummvm/branches/branch-1-0-0/engines/groovie/music.cpp	2009-08-18 15:57:54 UTC (rev 43516)
@@ -38,6 +38,10 @@
 	_prevCDtrack(0), _backgroundDelay(0) {
 }
 
+MusicPlayer::~MusicPlayer() {
+	AudioCD.stop();
+}
+
 void MusicPlayer::playSong(uint32 fileref) {
 	Common::StackLock lock(_mutex);
 

Modified: scummvm/branches/branch-1-0-0/engines/groovie/music.h
===================================================================
--- scummvm/branches/branch-1-0-0/engines/groovie/music.h	2009-08-18 15:41:00 UTC (rev 43515)
+++ scummvm/branches/branch-1-0-0/engines/groovie/music.h	2009-08-18 15:57:54 UTC (rev 43516)
@@ -37,7 +37,7 @@
 class MusicPlayer {
 public:
 	MusicPlayer(GroovieEngine *vm);
-	virtual ~MusicPlayer() {}
+	virtual ~MusicPlayer();
 
 	void playSong(uint32 fileref);
 	void setBackgroundSong(uint32 fileref);

Modified: scummvm/branches/branch-1-0-0/engines/made/made.cpp
===================================================================
--- scummvm/branches/branch-1-0-0/engines/made/made.cpp	2009-08-18 15:41:00 UTC (rev 43515)
+++ scummvm/branches/branch-1-0-0/engines/made/made.cpp	2009-08-18 15:57:54 UTC (rev 43516)
@@ -126,6 +126,8 @@
 }
 
 MadeEngine::~MadeEngine() {
+	AudioCD.stop();
+
 	delete _rnd;
 	delete _pmvPlayer;
 	delete _res;

Modified: scummvm/branches/branch-1-0-0/engines/scumm/sound.cpp
===================================================================
--- scummvm/branches/branch-1-0-0/engines/scumm/sound.cpp	2009-08-18 15:41:00 UTC (rev 43515)
+++ scummvm/branches/branch-1-0-0/engines/scumm/sound.cpp	2009-08-18 15:57:54 UTC (rev 43516)
@@ -86,7 +86,7 @@
 
 Sound::~Sound() {
 	stopCDTimer();
-	AudioCD.destroy();
+	AudioCD.stop();
 	delete _sfxFile;
 }
 

Modified: scummvm/branches/branch-1-0-0/engines/tinsel/tinsel.cpp
===================================================================
--- scummvm/branches/branch-1-0-0/engines/tinsel/tinsel.cpp	2009-08-18 15:41:00 UTC (rev 43515)
+++ scummvm/branches/branch-1-0-0/engines/tinsel/tinsel.cpp	2009-08-18 15:57:54 UTC (rev 43516)
@@ -887,6 +887,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.




More information about the Scummvm-git-logs mailing list