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/cge2 | |
| 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/cge2')
| -rw-r--r-- | engines/cge2/saveload.cpp | 4 | ||||
| -rw-r--r-- | engines/cge2/sound.cpp | 5 | ||||
| -rw-r--r-- | engines/cge2/sound.h | 12 |
3 files changed, 9 insertions, 12 deletions
diff --git a/engines/cge2/saveload.cpp b/engines/cge2/saveload.cpp index 7735c077a6..cd0be84567 100644 --- a/engines/cge2/saveload.cpp +++ b/engines/cge2/saveload.cpp @@ -25,7 +25,7 @@ * Copyright (c) 1994-1997 Janus B. Wisniewski and L.K. Avalon */ -#include "common/config-manager.h" +#include "common/memstream.h" #include "common/savefile.h" #include "common/system.h" #include "graphics/thumbnail.h" @@ -36,8 +36,6 @@ #include "cge2/snail.h" #include "cge2/hero.h" #include "cge2/text.h" -#include "cge2/sound.h" -#include "cge2/cge2_main.h" namespace CGE2 { diff --git a/engines/cge2/sound.cpp b/engines/cge2/sound.cpp index 57ec5983e8..691414d84a 100644 --- a/engines/cge2/sound.cpp +++ b/engines/cge2/sound.cpp @@ -26,10 +26,11 @@ */ #include "cge2/sound.h" -#include "common/config-manager.h" #include "common/memstream.h" -#include "audio/decoders/raw.h" #include "audio/audiostream.h" +#include "audio/decoders/wave.h" +#include "audio/mididrv.h" +#include "audio/midiparser.h" #include "cge2/cge2.h" namespace CGE2 { diff --git a/engines/cge2/sound.h b/engines/cge2/sound.h index 02afe610a2..8c16f06e97 100644 --- a/engines/cge2/sound.h +++ b/engines/cge2/sound.h @@ -28,19 +28,17 @@ #ifndef CGE2_SOUND_H #define CGE2_SOUND_H -#include "cge2/fileio.h" -#include "audio/audiostream.h" -#include "audio/decoders/wave.h" -#include "audio/fmopl.h" -#include "audio/mididrv.h" -#include "audio/midiparser.h" #include "audio/midiplayer.h" #include "audio/mixer.h" -#include "common/memstream.h" + +namespace Audio { +class RewindableAudioStream; +} namespace CGE2 { class CGE2Engine; +class EncryptedStream; // sample info struct SmpInfo { |