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/smush | |
| 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/smush')
| -rw-r--r-- | engines/scumm/smush/smush_mixer.cpp | 5 | ||||
| -rw-r--r-- | engines/scumm/smush/smush_mixer.h | 4 | ||||
| -rw-r--r-- | engines/scumm/smush/smush_player.cpp | 6 | ||||
| -rw-r--r-- | engines/scumm/smush/smush_player.h | 4 |
4 files changed, 10 insertions, 9 deletions
diff --git a/engines/scumm/smush/smush_mixer.cpp b/engines/scumm/smush/smush_mixer.cpp index 42e8f645be..445186d62b 100644 --- a/engines/scumm/smush/smush_mixer.cpp +++ b/engines/scumm/smush/smush_mixer.cpp @@ -21,14 +21,11 @@ */ -#include "common/util.h" - #include "scumm/smush/smush_mixer.h" #include "scumm/smush/channel.h" #include "scumm/scumm.h" -#include "scumm/sound.h" -#include "scumm/imuse/imuse.h" +#include "audio/audiostream.h" #include "audio/mixer.h" #include "audio/decoders/raw.h" diff --git a/engines/scumm/smush/smush_mixer.h b/engines/scumm/smush/smush_mixer.h index 18ec7f96fb..1bd6adac16 100644 --- a/engines/scumm/smush/smush_mixer.h +++ b/engines/scumm/smush/smush_mixer.h @@ -28,6 +28,10 @@ #include "common/mutex.h" #include "scumm/sound.h" +namespace Audio { +class QueuingAudioStream; +} + namespace Scumm { class SmushChannel; diff --git a/engines/scumm/smush/smush_player.cpp b/engines/scumm/smush/smush_player.cpp index 05c7ff2d9a..2ca2579b54 100644 --- a/engines/scumm/smush/smush_player.cpp +++ b/engines/scumm/smush/smush_player.cpp @@ -20,8 +20,6 @@ * */ -#include "engines/engine.h" - #include "common/config-manager.h" #include "common/file.h" #include "common/system.h" @@ -30,14 +28,11 @@ #include "graphics/cursorman.h" #include "graphics/palette.h" -#include "scumm/bomp.h" #include "scumm/file.h" #include "scumm/imuse_digi/dimuse.h" -#include "scumm/imuse/imuse.h" #include "scumm/scumm.h" #include "scumm/scumm_v7.h" #include "scumm/sound.h" -#include "scumm/util.h" #include "scumm/smush/channel.h" #include "scumm/smush/codec37.h" #include "scumm/smush/codec47.h" @@ -47,6 +42,7 @@ #include "scumm/insane/insane.h" +#include "audio/audiostream.h" #include "audio/mixer.h" #include "audio/decoders/mp3.h" #include "audio/decoders/raw.h" diff --git a/engines/scumm/smush/smush_player.h b/engines/scumm/smush/smush_player.h index 81c498a516..b0d6e6a9f0 100644 --- a/engines/scumm/smush/smush_player.h +++ b/engines/scumm/smush/smush_player.h @@ -26,6 +26,10 @@ #include "common/util.h" #include "scumm/sound.h" +namespace Audio { +class QueuingAudioStream; +} + namespace Scumm { class ScummEngine_v7; |