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/saga | |
| 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/saga')
| -rw-r--r-- | engines/saga/music.cpp | 3 | ||||
| -rw-r--r-- | engines/saga/music.h | 5 | ||||
| -rw-r--r-- | engines/saga/shorten.cpp | 2 | ||||
| -rw-r--r-- | engines/saga/shorten.h | 9 | ||||
| -rw-r--r-- | engines/saga/sound.cpp | 2 |
5 files changed, 13 insertions, 8 deletions
diff --git a/engines/saga/music.cpp b/engines/saga/music.cpp index cd48ebaa4d..0bc1e8a2a0 100644 --- a/engines/saga/music.cpp +++ b/engines/saga/music.cpp @@ -32,7 +32,10 @@ #include "audio/midiparser.h" #include "audio/midiparser_qt.h" #include "audio/miles.h" +#include "audio/decoders/flac.h" +#include "audio/decoders/mp3.h" #include "audio/decoders/raw.h" +#include "audio/decoders/vorbis.h" #include "common/config-manager.h" #include "common/file.h" #include "common/substream.h" diff --git a/engines/saga/music.h b/engines/saga/music.h index 2e7cc4c5ec..0213f4108a 100644 --- a/engines/saga/music.h +++ b/engines/saga/music.h @@ -25,13 +25,10 @@ #ifndef SAGA_MUSIC_H #define SAGA_MUSIC_H +#include "audio/mididrv.h" #include "audio/midiplayer.h" #include "audio/midiparser.h" #include "audio/mixer.h" -#include "audio/decoders/mp3.h" -#include "audio/decoders/vorbis.h" -#include "audio/decoders/flac.h" -#include "common/mutex.h" namespace Saga { diff --git a/engines/saga/shorten.cpp b/engines/saga/shorten.cpp index 1e1c397212..db67d510bc 100644 --- a/engines/saga/shorten.cpp +++ b/engines/saga/shorten.cpp @@ -21,7 +21,9 @@ */ #include "common/scummsys.h" +#include "common/stream.h" #include "common/textconsole.h" +#include "audio/audiostream.h" #include "saga/shorten.h" diff --git a/engines/saga/shorten.h b/engines/saga/shorten.h index 556abaf311..4d4ec328c6 100644 --- a/engines/saga/shorten.h +++ b/engines/saga/shorten.h @@ -30,9 +30,14 @@ #define SOUND_SHORTEN_H #include "common/scummsys.h" -#include "common/stream.h" -#include "audio/audiostream.h" +namespace Audio { +class AudioStream; +} + +namespace Common { +class ReadStream; +} namespace Saga { diff --git a/engines/saga/sound.cpp b/engines/saga/sound.cpp index 0eb6f8a82a..f4e31542fe 100644 --- a/engines/saga/sound.cpp +++ b/engines/saga/sound.cpp @@ -27,8 +27,6 @@ #include "audio/audiostream.h" #include "audio/mixer.h" -#include "audio/decoders/adpcm.h" -#include "audio/decoders/raw.h" namespace Saga { |