diff options
| author | Paul Gilbert | 2016-07-26 19:48:14 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2016-07-26 19:48:14 -0400 |
| commit | 504cf6ecb688a3f1c65a857bffd527d8b0e6ba63 (patch) | |
| tree | 0c0d96d4061c11850c851f0fc981c75a58c20515 /engines/mads/sound.cpp | |
| parent | d8c28d15ae553d047b7e571f98727fa79ee143f3 (diff) | |
| parent | e19922d181e775791f9105b8be7ff410770ede51 (diff) | |
| download | scummvm-rg350-504cf6ecb688a3f1c65a857bffd527d8b0e6ba63.tar.gz scummvm-rg350-504cf6ecb688a3f1c65a857bffd527d8b0e6ba63.tar.bz2 scummvm-rg350-504cf6ecb688a3f1c65a857bffd527d8b0e6ba63.zip | |
Merge branch 'master' into xeen
Diffstat (limited to 'engines/mads/sound.cpp')
| -rw-r--r-- | engines/mads/sound.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/engines/mads/sound.cpp b/engines/mads/sound.cpp index 4a35edb80f..5f2c9aca56 100644 --- a/engines/mads/sound.cpp +++ b/engines/mads/sound.cpp @@ -20,14 +20,16 @@ * */ -#include "audio/audiostream.h" #include "audio/fmopl.h" -#include "audio/decoders/raw.h" #include "common/memstream.h" #include "mads/sound.h" #include "mads/mads.h" #include "mads/nebular/sound_nebular.h" +namespace Audio { +class Mixer; +} + namespace MADS { SoundManager::SoundManager(MADSEngine *vm, Audio::Mixer *mixer) { @@ -39,6 +41,8 @@ SoundManager::SoundManager(MADSEngine *vm, Audio::Mixer *mixer) { _newSoundsPaused = false; _masterVolume = 255; + _preferRoland = false; + _opl = OPL::Config::create(); _opl->init(); |