diff options
Diffstat (limited to 'engines/sherlock/music.cpp')
| -rw-r--r-- | engines/sherlock/music.cpp | 23 |
1 files changed, 3 insertions, 20 deletions
diff --git a/engines/sherlock/music.cpp b/engines/sherlock/music.cpp index 49c48126f4..ccaa6a4b86 100644 --- a/engines/sherlock/music.cpp +++ b/engines/sherlock/music.cpp @@ -412,15 +412,6 @@ bool Music::playMusic(const Common::String &name) { stream->read(midiMusicData, midiMusicDataSize); delete stream; - // for dumping the music tracks -#if 0 - Common::DumpFile outFile; - outFile.open(name + ".RAW"); - outFile.write(data, stream->size()); - outFile.flush(); - outFile.close(); -#endif - if (midiMusicDataSize < 14) { warning("Music: not enough data in music file"); delete[] midiMusicData; @@ -502,6 +493,8 @@ bool Music::playMusic(const Common::String &name) { } _mixer->playStream(Audio::Mixer::kMusicSoundType, &_digitalMusicHandle, musicStream); } + + _musicPlaying = true; return true; } @@ -510,12 +503,7 @@ void Music::stopMusic() { } void Music::startSong() { - if (!_musicOn) - return; - - // TODO - warning("TODO: Sound::startSong"); - _musicPlaying = true; + // No implementation needed for ScummVM } void Music::freeSong() { @@ -530,11 +518,6 @@ void Music::freeSong() { _musicPlaying = false; } -void Music::waitTimerRoland(uint time) { - // TODO - warning("TODO: Sound::waitTimerRoland"); -} - bool Music::isPlaying() { if (!IS_3DO) { // MIDI based |