diff options
| author | Ori Avtalion | 2016-04-14 16:10:21 +0300 |
|---|---|---|
| committer | Ori Avtalion | 2016-04-14 16:10:21 +0300 |
| commit | 356403233047e260e34887ba0144892be322f472 (patch) | |
| tree | 354b2e73ded557e3aa543460a1fe8e952b4a0c88 /engines/scumm/he | |
| parent | 253e18c44080f57eb2334296e09297a2db5efda9 (diff) | |
| download | scummvm-rg350-356403233047e260e34887ba0144892be322f472.tar.gz scummvm-rg350-356403233047e260e34887ba0144892be322f472.tar.bz2 scummvm-rg350-356403233047e260e34887ba0144892be322f472.zip | |
JANITORIAL: Reduce audio header dependencies
Diffstat (limited to 'engines/scumm/he')
| -rw-r--r-- | engines/scumm/he/animation_he.cpp | 7 | ||||
| -rw-r--r-- | engines/scumm/he/animation_he.h | 4 | ||||
| -rw-r--r-- | engines/scumm/he/sound_he.cpp | 6 |
3 files changed, 10 insertions, 7 deletions
diff --git a/engines/scumm/he/animation_he.cpp b/engines/scumm/he/animation_he.cpp index 8483a8a402..0a3a56ceda 100644 --- a/engines/scumm/he/animation_he.cpp +++ b/engines/scumm/he/animation_he.cpp @@ -22,16 +22,21 @@ #ifdef ENABLE_HE +#include "common/scummsys.h" + #include "scumm/he/animation_he.h" #include "scumm/he/intern_he.h" -#include "audio/audiostream.h" #include "video/smk_decoder.h" #ifdef USE_BINK #include "video/bink_decoder.h" #endif +namespace Audio { +class Mixer; +} + namespace Scumm { MoviePlayer::MoviePlayer(ScummEngine_v90he *vm, Audio::Mixer *mixer) : _vm(vm) { diff --git a/engines/scumm/he/animation_he.h b/engines/scumm/he/animation_he.h index 677a4b4247..6891ed8bf0 100644 --- a/engines/scumm/he/animation_he.h +++ b/engines/scumm/he/animation_he.h @@ -23,7 +23,9 @@ #if !defined(SCUMM_HE_ANIMATION_H) && defined(ENABLE_HE) #define SCUMM_HE_ANIMATION_H -#include "audio/mixer.h" +namespace Audio { +class Mixer; +} namespace Common { class String; diff --git a/engines/scumm/he/sound_he.cpp b/engines/scumm/he/sound_he.cpp index b806a9f3cc..9a456b86c0 100644 --- a/engines/scumm/he/sound_he.cpp +++ b/engines/scumm/he/sound_he.cpp @@ -34,14 +34,10 @@ #include "common/timer.h" #include "common/util.h" +#include "audio/audiostream.h" #include "audio/decoders/adpcm.h" -#include "audio/decoders/flac.h" -#include "audio/mididrv.h" #include "audio/mixer.h" -#include "audio/decoders/mp3.h" #include "audio/decoders/raw.h" -#include "audio/decoders/voc.h" -#include "audio/decoders/vorbis.h" #include "audio/decoders/wave.h" namespace Scumm { |