diff options
| author | Ori Avtalion | 2016-05-21 13:55:38 +0300 |
|---|---|---|
| committer | Ori Avtalion | 2016-05-21 13:55:38 +0300 |
| commit | 3ad6af92f20b98b3c7a5045fe8e55045cff9caf1 (patch) | |
| tree | 5c9d1d47dbeff6a9ec20d84c925da19b199c917c /engines/scumm/sound.h | |
| parent | 10cbeb1ac6be299c06297c0f2c69e7cc8a5cb7cc (diff) | |
| download | scummvm-rg350-3ad6af92f20b98b3c7a5045fe8e55045cff9caf1.tar.gz scummvm-rg350-3ad6af92f20b98b3c7a5045fe8e55045cff9caf1.tar.bz2 scummvm-rg350-3ad6af92f20b98b3c7a5045fe8e55045cff9caf1.zip | |
SCUMM: Reduce audio header dependencies
Diffstat (limited to 'engines/scumm/sound.h')
| -rw-r--r-- | engines/scumm/sound.h | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/engines/scumm/sound.h b/engines/scumm/sound.h index 8c11c7b5b2..7fdb16371c 100644 --- a/engines/scumm/sound.h +++ b/engines/scumm/sound.h @@ -26,10 +26,14 @@ #include "common/scummsys.h" #include "common/str.h" #include "audio/mididrv.h" -#include "audio/mixer.h" #include "backends/audiocd/audiocd.h" #include "scumm/saveload.h" +namespace Audio { +class Mixer; +class SoundHandle; +} + namespace Scumm { class ScummEngine; @@ -81,12 +85,12 @@ protected: int16 _currentCDSound; int16 _currentMusic; - Audio::SoundHandle _loomSteamCDAudioHandle; + Audio::SoundHandle *_loomSteamCDAudioHandle; bool _isLoomSteam; AudioCDManager::Status _loomSteamCD; public: - Audio::SoundHandle _talkChannelHandle; // Handle of mixer channel actor is talking on + Audio::SoundHandle *_talkChannelHandle; // Handle of mixer channel actor is talking on bool _soundsPaused; byte _sfxMode; |