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/made | |
| 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/made')
| -rw-r--r-- | engines/made/music.cpp | 7 | ||||
| -rw-r--r-- | engines/made/music.h | 6 |
2 files changed, 3 insertions, 10 deletions
diff --git a/engines/made/music.cpp b/engines/made/music.cpp index 779b7d6fe9..a6cc2bb38f 100644 --- a/engines/made/music.cpp +++ b/engines/made/music.cpp @@ -37,7 +37,7 @@ namespace Made { -MusicPlayer::MusicPlayer() : _parser(0), _driver(0), _looping(false), _isPlaying(false), _passThrough(false), _isGM(false) { +MusicPlayer::MusicPlayer() : _parser(0), _driver(0), _looping(false), _isPlaying(false), _isGM(false) { MidiDriver::DeviceHandle dev = MidiDriver::detectDevice(MDT_MIDI | MDT_ADLIB | MDT_PREFER_GM); _nativeMT32 = ((MidiDriver::getMusicType(dev) == MT_MT32) || ConfMan.getBool("native_mt32")); //bool adlib = (MidiDriver::getMusicType(dev) == MT_ADLIB); @@ -95,11 +95,6 @@ void MusicPlayer::setVolume(int volume) { } void MusicPlayer::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/made/music.h b/engines/made/music.h index b52a8116b5..43869cae12 100644 --- a/engines/made/music.h +++ b/engines/made/music.h @@ -46,11 +46,11 @@ public: MusicPlayer(); ~MusicPlayer(); - 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; } bool hasNativeMT32() const { return _nativeMT32; } void playXMIDI(GenericResource *midiResource, MusicFlags flags = MUSIC_NORMAL); @@ -59,7 +59,6 @@ public: void pause(); void resume(); void setLoop(bool loop) { _looping = loop; } - void setPassThrough(bool b) { _passThrough = b; } void setGM(bool isGM) { _isGM = isGM; } @@ -80,7 +79,6 @@ protected: byte _channelVolume[16]; bool _nativeMT32; bool _isGM; - bool _passThrough; bool _isPlaying; bool _looping; |
