[Scummvm-cvs-logs] CVS: scummvm/saga music.cpp,1.57,1.58
Torbjörn Andersson
eriktorbjorn at users.sourceforge.net
Tue Jul 19 13:34:27 CEST 2005
Update of /cvsroot/scummvm/scummvm/saga
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9742
Modified Files:
music.cpp
Log Message:
Cleanup.
Index: music.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/music.cpp,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -d -r1.57 -r1.58
--- music.cpp 19 Jul 2005 19:44:20 -0000 1.57
+++ music.cpp 19 Jul 2005 20:25:48 -0000 1.58
@@ -349,12 +349,6 @@
return _mixer->isSoundHandleActive(_musicHandle) || _player->isPlaying();
}
-// The Wyrmkeep release of Inherit The Earth features external MIDI files, so
-// we need a mapping from resource number to filename.
-//
-// reset.mid seems to be unused.
-
-
void Music::play(uint32 resourceId, MusicFlags flags) {
AudioStream *audioStream = NULL;
MidiParser *parser;
@@ -377,7 +371,6 @@
_mixer->stopHandle(_musicHandle);
-
if (_vm->getGameType() == GType_ITE) {
if (resourceId >= 9 && resourceId <= 34) {
@@ -389,7 +382,6 @@
}
}
-
if (_musicContext != NULL) {
//TODO: check resource size
audioStream = new RAWInputStream(_vm, _musicContext, resourceId, flags == MUSIC_LOOP);
@@ -397,7 +389,6 @@
}
}
-
if (audioStream) {
debug(2, "Playing digitized music");
_mixer->playInputStream(Audio::Mixer::kMusicSoundType, &_musicHandle, audioStream);
More information about the Scummvm-git-logs
mailing list