[Scummvm-cvs-logs] CVS: scummvm/saga music.cpp,1.59,1.60
Torbjörn Andersson
eriktorbjorn at users.sourceforge.net
Tue Jul 19 14:54:23 CEST 2005
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/saga music.cpp,1.58,1.59 rscfile.cpp,1.24,1.25 sndres.cpp,1.45,1.46
- Next message: [Scummvm-cvs-logs] CVS: tools Makefile,1.53,1.54 extract_loom_tg16.c,1.3,1.4 extract_mm_c64.c,1.1,1.2 extract_mm_nes.c,1.12,1.13 extract_zak_c64.c,1.1,1.2 util.c,1.8,1.9
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/saga
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31521
Modified Files:
music.cpp
Log Message:
Fixed crash when quitting.
Index: music.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/music.cpp,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -d -r1.59 -r1.60
--- music.cpp 19 Jul 2005 21:34:46 -0000 1.59
+++ music.cpp 19 Jul 2005 21:48:59 -0000 1.60
@@ -293,6 +293,7 @@
}
Music::~Music() {
+ _mixer->stopHandle(_musicHandle);
delete _player;
xmidiParser->setMidiDriver(NULL);
smfParser->setMidiDriver(NULL);
@@ -318,7 +319,7 @@
if (volume < 0)
volume = 1;
- _vm->_mixer->setVolumeForSoundType(Audio::Mixer::kMusicSoundType, volume);
+ _mixer->setVolumeForSoundType(Audio::Mixer::kMusicSoundType, volume);
_player->setVolume(volume);
if (_currentVolumePercent == 100) {
@@ -335,7 +336,7 @@
volume = ConfMan.getInt("music_volume");
if (time == 1) {
- _vm->_mixer->setVolumeForSoundType(Audio::Mixer::kMusicSoundType, volume);
+ _mixer->setVolumeForSoundType(Audio::Mixer::kMusicSoundType, volume);
Common::g_timer->removeTimerProc(&musicVolumeGaugeCallback);
_currentVolume = volume;
return;
@@ -429,7 +430,6 @@
} else {
context = _vm->_resource->getContext(GAME_MUSICFILE_GM);
}
-
}
_player->setGM(true);
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/saga music.cpp,1.58,1.59 rscfile.cpp,1.24,1.25 sndres.cpp,1.45,1.46
- Next message: [Scummvm-cvs-logs] CVS: tools Makefile,1.53,1.54 extract_loom_tg16.c,1.3,1.4 extract_mm_c64.c,1.1,1.2 extract_mm_nes.c,1.12,1.13 extract_zak_c64.c,1.1,1.2 util.c,1.8,1.9
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list