diff options
| author | Gregory Montoir | 2007-03-08 22:15:20 +0000 |
|---|---|---|
| committer | Gregory Montoir | 2007-03-08 22:15:20 +0000 |
| commit | a3c2c1f413049fd9d0e92f89b37b37755b6b5105 (patch) | |
| tree | 2699e8e18350ccdb49ea2f005316f7f97900b9fc /engines/queen/sound.cpp | |
| parent | 801771db87bdb1298652d19291b6a658f3fdd6b6 (diff) | |
| download | scummvm-rg350-a3c2c1f413049fd9d0e92f89b37b37755b6b5105.tar.gz scummvm-rg350-a3c2c1f413049fd9d0e92f89b37b37755b6b5105.tar.bz2 scummvm-rg350-a3c2c1f413049fd9d0e92f89b37b37755b6b5105.zip | |
Since the amiga version handle music very differently than the PC version, the existing Music and MusicPlayer classes have been merged to a single MidiMusic class, simplifying code a bit.
svn-id: r26033
Diffstat (limited to 'engines/queen/sound.cpp')
| -rw-r--r-- | engines/queen/sound.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/queen/sound.cpp b/engines/queen/sound.cpp index fe321cf007..e6d9e23e80 100644 --- a/engines/queen/sound.cpp +++ b/engines/queen/sound.cpp @@ -148,7 +148,7 @@ PCSound::PCSound(Audio::Mixer *mixer, QueenEngine *vm) if (native_mt32) driver->property(MidiDriver::PROP_CHANNEL_MASK, 0x03FE); - _music = new Music(driver, vm); + _music = new MidiMusic(driver, vm); _music->hasNativeMT32(native_mt32); } @@ -224,7 +224,7 @@ void PCSound::setVolume(int vol) { } int PCSound::volume() { - return _music->volume(); + return _music->getVolume(); } void PCSound::waitFinished(bool isSpeech) { |