aboutsummaryrefslogtreecommitdiff
path: root/engines/groovie
diff options
context:
space:
mode:
authorJohannes Schickel2009-08-18 15:31:26 +0000
committerJohannes Schickel2009-08-18 15:31:26 +0000
commitb33b90ecd0468c58b93e13ff80bf6939e97ed7a6 (patch)
tree1badb8720dc0022a1c5fcf76a9232b43766c1ada /engines/groovie
parentdb0cd620f6f5766b6287bb0f0aa1ac9c866c4cba (diff)
downloadscummvm-rg350-b33b90ecd0468c58b93e13ff80bf6939e97ed7a6.tar.gz
scummvm-rg350-b33b90ecd0468c58b93e13ff80bf6939e97ed7a6.tar.bz2
scummvm-rg350-b33b90ecd0468c58b93e13ff80bf6939e97ed7a6.zip
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
Diffstat (limited to 'engines/groovie')
-rw-r--r--engines/groovie/music.cpp4
-rw-r--r--engines/groovie/music.h2
2 files changed, 5 insertions, 1 deletions
diff --git a/engines/groovie/music.cpp b/engines/groovie/music.cpp
index 797290a6f3..a92beee17e 100644
--- a/engines/groovie/music.cpp
+++ b/engines/groovie/music.cpp
@@ -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);
diff --git a/engines/groovie/music.h b/engines/groovie/music.h
index 9909c8a185..fb1ddfe9c3 100644
--- a/engines/groovie/music.h
+++ b/engines/groovie/music.h
@@ -37,7 +37,7 @@ namespace Groovie {
class MusicPlayer {
public:
MusicPlayer(GroovieEngine *vm);
- virtual ~MusicPlayer() {}
+ virtual ~MusicPlayer();
void playSong(uint32 fileref);
void setBackgroundSong(uint32 fileref);