diff options
author | Max Horn | 2011-03-23 17:07:48 +0100 |
---|---|---|
committer | Max Horn | 2011-03-23 17:07:48 +0100 |
commit | 088bd7a70bc02aafab8d16385774efee55e270d2 (patch) | |
tree | 1db9ac591304e9b7a9f4fd646c0ed2681f969872 /engines/agi | |
parent | e70fd59b3505619cccb6f3280a4cf0fb57aefa97 (diff) | |
download | scummvm-rg350-088bd7a70bc02aafab8d16385774efee55e270d2.tar.gz scummvm-rg350-088bd7a70bc02aafab8d16385774efee55e270d2.tar.bz2 scummvm-rg350-088bd7a70bc02aafab8d16385774efee55e270d2.zip |
ENGINES: Remove unused MIDI pass-through code
Diffstat (limited to 'engines/agi')
-rw-r--r-- | engines/agi/sound_midi.cpp | 7 | ||||
-rw-r--r-- | engines/agi/sound_midi.h | 8 |
2 files changed, 4 insertions, 11 deletions
diff --git a/engines/agi/sound_midi.cpp b/engines/agi/sound_midi.cpp index fe3d97b9c0..b58e1e50ab 100644 --- a/engines/agi/sound_midi.cpp +++ b/engines/agi/sound_midi.cpp @@ -71,7 +71,7 @@ MIDISound::MIDISound(uint8 *data, uint32 len, int resnum, SoundMgr &manager) : A warning("Error creating MIDI sound from resource %d (Type %d, length %d)", resnum, _type, len); } -SoundGenMIDI::SoundGenMIDI(AgiEngine *vm, Audio::Mixer *pMixer) : SoundGen(vm, pMixer), _parser(0), _isPlaying(false), _passThrough(false), _isGM(false) { +SoundGenMIDI::SoundGenMIDI(AgiEngine *vm, Audio::Mixer *pMixer) : SoundGen(vm, pMixer), _parser(0), _isPlaying(false), _isGM(false) { MidiDriver::DeviceHandle dev = MidiDriver::detectDevice(MDT_MIDI | MDT_ADLIB); _driver = MidiDriver::createMidi(dev); assert(_driver); @@ -135,11 +135,6 @@ void SoundGenMIDI::setVolume(int volume) { } void SoundGenMIDI::send(uint32 b) { - if (_passThrough) { - _driver->send(b); - return; - } - byte channel = (byte)(b & 0x0F); if ((b & 0xFFF0) == 0x07B0) { // Adjust volume changes by master volume diff --git a/engines/agi/sound_midi.h b/engines/agi/sound_midi.h index dc6609c3e7..f70a20f24a 100644 --- a/engines/agi/sound_midi.h +++ b/engines/agi/sound_midi.h @@ -54,19 +54,18 @@ public: void play(int resnum); void stop(); - bool isPlaying() { return _isPlaying; } + bool isPlaying() const { return _isPlaying; } void setPlaying(bool playing) { _isPlaying = playing; } void setVolume(int volume); - int getVolume() { return _masterVolume; } + int getVolume() const { return _masterVolume; } void syncVolume(); void setNativeMT32(bool b) { _nativeMT32 = b; } - bool hasNativeMT32() { return _nativeMT32; } + bool hasNativeMT32() const { return _nativeMT32; } void pause(); void resume(); void setLoop(bool loop) { _looping = loop; } - void setPassThrough(bool b) { _passThrough = b; } void setGM(bool isGM) { _isGM = isGM; } @@ -88,7 +87,6 @@ private: byte _channelVolume[16]; bool _nativeMT32; bool _isGM; - bool _passThrough; bool _isPlaying; bool _looping; |