aboutsummaryrefslogtreecommitdiff
path: root/engines/agos
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/agos
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/agos')
-rw-r--r--engines/agos/midi.cpp13
-rw-r--r--engines/agos/midi.h7
2 files changed, 2 insertions, 18 deletions
diff --git a/engines/agos/midi.cpp b/engines/agos/midi.cpp
index 234aa8d815..a37c96a787 100644
--- a/engines/agos/midi.cpp
+++ b/engines/agos/midi.cpp
@@ -45,7 +45,6 @@ MidiPlayer::MidiPlayer() {
// between songs.
_driver = 0;
_map_mt32_to_gm = false;
- _passThrough = false;
_enable_sfx = true;
_current = 0;
@@ -108,11 +107,6 @@ void MidiPlayer::send(uint32 b) {
if (!_current)
return;
- if (_passThrough) {
- _driver->send(b);
- return;
- }
-
byte channel = (byte)(b & 0x0F);
if ((b & 0xFFF0) == 0x07B0) {
// Adjust volume changes by master music and master sfx volume.
@@ -306,13 +300,6 @@ void MidiPlayer::setVolume(int musicVol, int sfxVol) {
}
}
-void MidiPlayer::setDriver(MidiDriver *md) {
- // Don't try to set this more than once.
- if (_driver)
- return;
- _driver = md;
-}
-
void MidiPlayer::setLoop(bool loop) {
Common::StackLock lock(_mutex);
diff --git a/engines/agos/midi.h b/engines/agos/midi.h
index 64ab14d4ee..ad69a3ddde 100644
--- a/engines/agos/midi.h
+++ b/engines/agos/midi.h
@@ -60,7 +60,6 @@ protected:
Common::Mutex _mutex;
MidiDriver *_driver;
bool _map_mt32_to_gm;
- bool _passThrough;
bool _nativeMT32;
MusicInfo _music;
@@ -106,14 +105,12 @@ public:
void stop();
void pause(bool b);
- int getMusicVolume() { return _musicVolume; }
- int getSFXVolume() { return _sfxVolume; }
+ int getMusicVolume() const { return _musicVolume; }
+ int getSFXVolume() const { return _sfxVolume; }
void setVolume(int musicVol, int sfxVol);
- void setDriver(MidiDriver *md);
public:
int open(int gameType);
- void setPassThrough(bool b) { _passThrough = b; }
// MidiDriver_BASE interface implementation
virtual void send(uint32 b);