aboutsummaryrefslogtreecommitdiff
path: root/engines/m4
diff options
context:
space:
mode:
authorMax Horn2011-03-23 17:07:48 +0100
committerMax Horn2011-03-23 17:07:48 +0100
commit088bd7a70bc02aafab8d16385774efee55e270d2 (patch)
tree1db9ac591304e9b7a9f4fd646c0ed2681f969872 /engines/m4
parente70fd59b3505619cccb6f3280a4cf0fb57aefa97 (diff)
downloadscummvm-rg350-088bd7a70bc02aafab8d16385774efee55e270d2.tar.gz
scummvm-rg350-088bd7a70bc02aafab8d16385774efee55e270d2.tar.bz2
scummvm-rg350-088bd7a70bc02aafab8d16385774efee55e270d2.zip
ENGINES: Remove unused MIDI pass-through code
Diffstat (limited to 'engines/m4')
-rw-r--r--engines/m4/midi.cpp7
-rw-r--r--engines/m4/midi.h8
2 files changed, 4 insertions, 11 deletions
diff --git a/engines/m4/midi.cpp b/engines/m4/midi.cpp
index b5ae3b90ae..f4fe00319c 100644
--- a/engines/m4/midi.cpp
+++ b/engines/m4/midi.cpp
@@ -32,7 +32,7 @@
namespace M4 {
-MidiPlayer::MidiPlayer(MadsM4Engine *vm, MidiDriver *driver) : _vm(vm), _midiData(NULL), _driver(driver), _isPlaying(false), _passThrough(false), _isGM(false) {
+MidiPlayer::MidiPlayer(MadsM4Engine *vm, MidiDriver *driver) : _vm(vm), _midiData(NULL), _driver(driver), _isPlaying(false), _isGM(false) {
assert(_driver);
memset(_channel, 0, sizeof(_channel));
_masterVolume = 0;
@@ -79,11 +79,6 @@ void MidiPlayer::setVolume(int volume) {
}
void MidiPlayer::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/m4/midi.h b/engines/m4/midi.h
index 42948e5ff1..cc3f62621d 100644
--- a/engines/m4/midi.h
+++ b/engines/m4/midi.h
@@ -39,16 +39,15 @@ public:
MidiPlayer(MadsM4Engine *vm, MidiDriver *driver);
~MidiPlayer();
- bool isPlaying() { return _isPlaying; }
+ bool isPlaying() const { return _isPlaying; }
void setVolume(int volume);
- int getVolume() { return _masterVolume; }
+ int getVolume() const { return _masterVolume; }
void setNativeMT32(bool b) { _nativeMT32 = b; }
- bool hasNativeMT32() { return _nativeMT32; }
+ bool hasNativeMT32() const{ return _nativeMT32; }
void playMusic(const char *name, int32 vol, bool loop, int32 trigger, int32 scene);
void stopMusic();
- void setPassThrough(bool b) { _passThrough = b; }
void setGM(bool isGM) { _isGM = isGM; }
@@ -68,7 +67,6 @@ protected:
byte _channelVolume[16];
bool _nativeMT32;
bool _isGM;
- bool _passThrough;
bool _isPlaying;
bool _randomLoop;