diff options
| author | Matthew Hoops | 2015-04-03 00:18:58 -0400 |
|---|---|---|
| committer | Matthew Hoops | 2015-07-07 20:19:42 -0400 |
| commit | f1f29302f5401c4782985cec4d47d069b99036ee (patch) | |
| tree | 60c6c8c7b2867cf9524197d2c2c0734746906b71 /engines/tsage | |
| parent | 2fa1ce51dd3cb00eef289094fe9f660c237254bc (diff) | |
| download | scummvm-rg350-f1f29302f5401c4782985cec4d47d069b99036ee.tar.gz scummvm-rg350-f1f29302f5401c4782985cec4d47d069b99036ee.tar.bz2 scummvm-rg350-f1f29302f5401c4782985cec4d47d069b99036ee.zip | |
AUDIO: Remove the legacy OPL API
Diffstat (limited to 'engines/tsage')
| -rw-r--r-- | engines/tsage/sound.cpp | 2 | ||||
| -rw-r--r-- | engines/tsage/sound.h | 7 |
2 files changed, 6 insertions, 3 deletions
diff --git a/engines/tsage/sound.cpp b/engines/tsage/sound.cpp index b95b614f09..455b58d09f 100644 --- a/engines/tsage/sound.cpp +++ b/engines/tsage/sound.cpp @@ -20,9 +20,9 @@ * */ +#include "audio/fmopl.h" #include "audio/decoders/raw.h" #include "common/config-manager.h" -#include "audio/decoders/raw.h" #include "audio/audiostream.h" #include "tsage/core.h" #include "tsage/globals.h" diff --git a/engines/tsage/sound.h b/engines/tsage/sound.h index 49558b4bca..c222a6e7c6 100644 --- a/engines/tsage/sound.h +++ b/engines/tsage/sound.h @@ -27,12 +27,15 @@ #include "common/mutex.h" #include "common/queue.h" #include "audio/audiostream.h" -#include "audio/fmopl.h" #include "audio/mixer.h" #include "common/list.h" #include "tsage/saveload.h" #include "tsage/core.h" +namespace OPL { +class OPL; +} + namespace TsAGE { class Sound; @@ -450,7 +453,7 @@ class AdlibSoundDriver: public SoundDriver, Audio::AudioStream { private: GroupData _groupData; Audio::Mixer *_mixer; - FM_OPL *_opl; + OPL::OPL *_opl; Audio::SoundHandle _soundHandle; int _sampleRate; byte _portContents[256]; |