diff options
| author | dhewg | 2011-03-21 22:50:21 +0100 |
|---|---|---|
| committer | dhewg | 2011-03-22 21:02:08 +0100 |
| commit | bb12acfa0ffc0c1fe0a907e6b63c3dd0c2acaec5 (patch) | |
| tree | 2be8978e43edfdcf4ba8b88a11094c6ea655f7af /audio/softsynth/mt32.cpp | |
| parent | 2053936959f6d079c927866da8936cf5dcc7edde (diff) | |
| download | scummvm-rg350-bb12acfa0ffc0c1fe0a907e6b63c3dd0c2acaec5.tar.gz scummvm-rg350-bb12acfa0ffc0c1fe0a907e6b63c3dd0c2acaec5.tar.bz2 scummvm-rg350-bb12acfa0ffc0c1fe0a907e6b63c3dd0c2acaec5.zip | |
AUDIO: Cleanup
Is it just me or is overwriting-but-not-marking-as-virtual
irritating?
Diffstat (limited to 'audio/softsynth/mt32.cpp')
| -rw-r--r-- | audio/softsynth/mt32.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/audio/softsynth/mt32.cpp b/audio/softsynth/mt32.cpp index a980b564fc..dd2c7e2121 100644 --- a/audio/softsynth/mt32.cpp +++ b/audio/softsynth/mt32.cpp @@ -51,7 +51,6 @@ class MidiChannel_MT32 : public MidiChannel_MPU401 { class MidiDriver_MT32 : public MidiDriver_Emulated { private: - Audio::SoundHandle _handle; MidiChannel_MT32 _midiChannels[16]; uint16 _channelMask; MT32Emu::Synth *_synth; @@ -336,7 +335,7 @@ int MidiDriver_MT32::open() { g_system->updateScreen(); - _mixer->playStream(Audio::Mixer::kSFXSoundType, &_handle, this, -1, Audio::Mixer::kMaxChannelVolume, 0, DisposeAfterUse::NO, true); + _mixer->playStream(Audio::Mixer::kSFXSoundType, &_mixerSoundHandle, this, -1, Audio::Mixer::kMaxChannelVolume, 0, DisposeAfterUse::NO, true); return 0; } @@ -378,7 +377,7 @@ void MidiDriver_MT32::close() { // Detach the player callback handler setTimerCallback(NULL, NULL); // Detach the mixer callback handler - _mixer->stopHandle(_handle); + _mixer->stopHandle(_mixerSoundHandle); _synth->close(); delete _synth; |