aboutsummaryrefslogtreecommitdiff
path: root/saga/music.cpp
diff options
context:
space:
mode:
authorJonathan Gray2004-04-29 04:50:45 +0000
committerJonathan Gray2004-04-29 04:50:45 +0000
commitcd21d5919b18ad6cb33b63d2be899b2ea6689f0b (patch)
tree14b66fcfc3c79efe2ce1fb4da2ad4a5fbab53ead /saga/music.cpp
parent4ed0d02f05db28f8007637ff429d0e23ec1ee6af (diff)
downloadscummvm-rg350-cd21d5919b18ad6cb33b63d2be899b2ea6689f0b.tar.gz
scummvm-rg350-cd21d5919b18ad6cb33b63d2be899b2ea6689f0b.tar.bz2
scummvm-rg350-cd21d5919b18ad6cb33b63d2be899b2ea6689f0b.zip
init some things to fix segfaults
svn-id: r13674
Diffstat (limited to 'saga/music.cpp')
-rw-r--r--saga/music.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/saga/music.cpp b/saga/music.cpp
index a69e2ab117..bacfb99708 100644
--- a/saga/music.cpp
+++ b/saga/music.cpp
@@ -47,7 +47,8 @@ static const byte mt32_to_gm[128] = {
47, 117, 127, 118, 118, 116, 115, 119, 115, 112, 55, 124, 123, 0, 14, 117 // 7x
};
-MusicPlayer::MusicPlayer(MidiDriver *driver) : _driver(driver), _looping(false) {
+MusicPlayer::MusicPlayer(MidiDriver *driver) : _driver(driver), _looping(false), _isPlaying(false) {
+ memset(_channel, 0, sizeof(_channel));
this->open();
}
@@ -84,6 +85,7 @@ int MusicPlayer::open() {
int ret = _driver->open();
if (ret)
return ret;
+
_driver->setTimerCallback(this, &onTimer);
return 0;
}