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/lure | |
| 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/lure')
| -rw-r--r-- | engines/lure/sound.cpp | 7 | ||||
| -rw-r--r-- | engines/lure/sound.h | 13 |
2 files changed, 5 insertions, 15 deletions
diff --git a/engines/lure/sound.cpp b/engines/lure/sound.cpp index 8ab0f5486c..da9e136ec3 100644 --- a/engines/lure/sound.cpp +++ b/engines/lure/sound.cpp @@ -615,8 +615,6 @@ MidiMusic::MidiMusic(MidiDriver *driver, ChannelEntry channels[NUM_CHANNELS], else setVolume(Sound.sfxVolume()); - _passThrough = false; - _parser = MidiParser::createParser_SMF(); _parser->setMidiDriver(this); _parser->setTimerRate(_driver->getBaseTempo()); @@ -685,11 +683,6 @@ void MidiMusic::playMusic() { } void MidiMusic::send(uint32 b) { - if (_passThrough) { - _driver->send(b); - return; - } - #ifdef SOUND_CROP_CHANNELS if ((b & 0xF) >= _numChannels) return; byte channel = _channelNumber + (byte)(b & 0x0F); diff --git a/engines/lure/sound.h b/engines/lure/sound.h index fe7ec50add..dd5538085c 100644 --- a/engines/lure/sound.h +++ b/engines/lure/sound.h @@ -66,14 +66,12 @@ private: uint32 songOffset(uint16 songNum) const; uint32 songLength(uint16 songNum) const; - bool _passThrough; - public: MidiMusic(MidiDriver *driver, ChannelEntry channels[NUM_CHANNELS], uint8 channelNum, uint8 soundNum, bool isMus, uint8 numChannels, void *soundData, uint32 size); ~MidiMusic(); void setVolume(int volume); - int getVolume() { return _volume; } + int getVolume() const { return _volume; } void playSong(uint16 songNum); void stopSong() { stopMusic(); } @@ -81,7 +79,6 @@ public: void stopMusic(); void queueTuneList(int16 tuneList); bool queueSong(uint16 songNum); - void setPassThrough(bool b) { _passThrough = b; } void toggleVChange(); // MidiDriver_BASE interface implementation @@ -90,10 +87,10 @@ public: void onTimer(); - uint8 channelNumber() { return _channelNumber; } - uint8 soundNumber() { return _soundNumber; } - bool isPlaying() { return _isPlaying; } - bool isMusic() {return _isMusic; } + uint8 channelNumber() const { return _channelNumber; } + uint8 soundNumber() const { return _soundNumber; } + bool isPlaying() const { return _isPlaying; } + bool isMusic() const { return _isMusic; } }; class SoundManager : public Common::Singleton<SoundManager> { |