aboutsummaryrefslogtreecommitdiff
path: root/engines/draci
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/draci
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/draci')
-rw-r--r--engines/draci/music.cpp7
-rw-r--r--engines/draci/music.h8
2 files changed, 4 insertions, 11 deletions
diff --git a/engines/draci/music.cpp b/engines/draci/music.cpp
index 210e925389..cdea2d9fdd 100644
--- a/engines/draci/music.cpp
+++ b/engines/draci/music.cpp
@@ -36,7 +36,7 @@
namespace Draci {
-MusicPlayer::MusicPlayer(const char *pathMask) : _parser(0), _driver(0), _pathMask(pathMask), _looping(false), _isPlaying(false), _passThrough(false), _isGM(false), _track(-1) {
+MusicPlayer::MusicPlayer(const char *pathMask) : _parser(0), _driver(0), _pathMask(pathMask), _looping(false), _isPlaying(false), _isGM(false), _track(-1) {
MidiDriver::DeviceHandle dev = MidiDriver::detectDevice(MDT_MIDI | MDT_ADLIB | MDT_PREFER_GM);
_nativeMT32 = ((MidiDriver::getMusicType(dev) == MT_MT32) || ConfMan.getBool("native_mt32"));
@@ -104,11 +104,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/draci/music.h b/engines/draci/music.h
index e46901424d..0125a661c3 100644
--- a/engines/draci/music.h
+++ b/engines/draci/music.h
@@ -41,20 +41,19 @@ public:
MusicPlayer(const char *pathMask);
~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; }
void syncVolume();
- bool hasNativeMT32() { return _nativeMT32; }
+ bool hasNativeMT32() const { return _nativeMT32; }
void playSMF(int track, bool loop);
void stop();
void pause();
void resume();
void setLoop(bool loop) { _looping = loop; }
- void setPassThrough(bool b) { _passThrough = b; }
void setGM(bool isGM) { _isGM = isGM; }
@@ -77,7 +76,6 @@ protected:
byte _channelVolume[16];
bool _nativeMT32;
bool _isGM;
- bool _passThrough;
bool _isPlaying;
bool _looping;