ScummVM/scummvm
1
0
Fork 0
mirror of https://github.com/scummvm/scummvm.git synced 2026-06-20 05:45:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup.

Browse Source 
svn-id: r18563
This commit is contained in:
Torbjörn Andersson
2005-07-19 20:25:48 +00:00
parent 6904278e23
commit 993c262e2b
1 changed files with 0 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
saga/music.cpp
-9
View File
@@ -349,12 +349,6 @@ bool Music::isPlaying() {
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 @@ void Music::play(uint32 resourceId, MusicFlags flags) {
_mixer->stopHandle(_musicHandle);
if (_vm->getGameType() == GType_ITE) {
if (resourceId >= 9 && resourceId <= 34) {
@@ -389,7 +382,6 @@ void Music::play(uint32 resourceId, MusicFlags flags) {
}
}
if (_musicContext != NULL) {
//TODO: check resource size
audioStream = new RAWInputStream(_vm, _musicContext, resourceId, flags == MUSIC_LOOP);
@@ -397,7 +389,6 @@ void Music::play(uint32 resourceId, MusicFlags flags) {
}
}
if (audioStream) {
debug(2, "Playing digitized music");
_mixer->playInputStream(Audio::Mixer::kMusicSoundType, &_musicHandle, audioStream);