aboutsummaryrefslogtreecommitdiff
path: root/engines/touche/touche.cpp
diff options
context:
space:
mode:
authorGregory Montoir2006-11-05 00:29:34 +0000
committerGregory Montoir2006-11-05 00:29:34 +0000
commit102969f8209ba1d75d5d9d51837a0e311eedcf90 (patch)
tree76e1967da97be573646f5ddd8e866a22514719b7 /engines/touche/touche.cpp
parentbccec3c3e75cef9f3c9c3081670a3902df100444 (diff)
downloadscummvm-rg350-102969f8209ba1d75d5d9d51837a0e311eedcf90.tar.gz
scummvm-rg350-102969f8209ba1d75d5d9d51837a0e311eedcf90.tar.bz2
scummvm-rg350-102969f8209ba1d75d5d9d51837a0e311eedcf90.zip
added basic MIDI playback
svn-id: r24617
Diffstat (limited to 'engines/touche/touche.cpp')
-rw-r--r--engines/touche/touche.cpp11
1 files changed, 11 insertions, 0 deletions
diff --git a/engines/touche/touche.cpp b/engines/touche/touche.cpp
index 9d564bca6d..2c1981ade7 100644
--- a/engines/touche/touche.cpp
+++ b/engines/touche/touche.cpp
@@ -24,6 +24,9 @@
#include "common/config-manager.h"
#include "common/system.h"
+#include "sound/mididrv.h"
+
+#include "touche/midi.h"
#include "touche/touche.h"
#include "touche/graphics.h"
@@ -74,10 +77,15 @@ ToucheEngine::ToucheEngine(OSystem *system, Common::Language language)
Common::addSpecialDebugLevel(kDebugResource, "Resource", "Resource debug level");
Common::addSpecialDebugLevel(kDebugOpcodes, "Opcodes", "Opcodes debug level");
Common::addSpecialDebugLevel(kDebugUserIntf, "UserIntf", "UserInterface debug level");
+
+ int midiDriver = MidiDriver::detectMusicDriver(MDT_MIDI | MDT_ADLIB | MDT_PREFER_MIDI);
+ MidiDriver *driver = MidiDriver::createMidi(midiDriver);
+ _midiPlayer = new MidiPlayer(driver);
}
ToucheEngine::~ToucheEngine() {
Common::clearAllSpecialDebugLevels();
+ delete _midiPlayer;
}
int ToucheEngine::init() {
@@ -88,6 +96,9 @@ int ToucheEngine::init() {
_mixer->setVolumeForSoundType(Audio::Mixer::kSFXSoundType, ConfMan.getInt("sfx_volume"));
_mixer->setVolumeForSoundType(Audio::Mixer::kSpeechSoundType, ConfMan.getInt("speech_volume"));
+ _mixer->setVolumeForSoundType(Audio::Mixer::kMusicSoundType, Audio::Mixer::kMaxMixerVolume);
+
+ _midiPlayer->setVolume(ConfMan.getInt("music_volume"));
return 0;
}