[Scummvm-cvs-logs] CVS: scummvm/saga music.cpp,1.4,1.5
Jonathan Gray
khalek at users.sourceforge.net
Wed Apr 28 21:52:02 CEST 2004
Update of /cvsroot/scummvm/scummvm/saga
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3153
Modified Files:
music.cpp
Log Message:
init some things to fix segfaults
Index: music.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/music.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- music.cpp 29 Apr 2004 04:24:55 -0000 1.4
+++ music.cpp 29 Apr 2004 04:50:45 -0000 1.5
@@ -47,7 +47,8 @@
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 ret = _driver->open();
if (ret)
return ret;
+
_driver->setTimerCallback(this, &onTimer);
return 0;
}
More information about the Scummvm-git-logs
mailing list