diff options
| author | Eugene Sandulenko | 2011-08-05 13:33:42 +0100 |
|---|---|---|
| committer | Eugene Sandulenko | 2011-08-06 11:30:42 +0100 |
| commit | 0dafa7f80fbc271e599092e81655d8073ab91abe (patch) | |
| tree | 1d33034c8c8dc5258417431c6023567a4501be6f /engines/mohawk | |
| parent | 6e795a89b0d45c79f99dcd9d50fda467e9a2466e (diff) | |
| download | scummvm-rg350-0dafa7f80fbc271e599092e81655d8073ab91abe.tar.gz scummvm-rg350-0dafa7f80fbc271e599092e81655d8073ab91abe.tar.bz2 scummvm-rg350-0dafa7f80fbc271e599092e81655d8073ab91abe.zip | |
ALL: Reduce audio/ header dependency
Diffstat (limited to 'engines/mohawk')
| -rw-r--r-- | engines/mohawk/cstime.h | 2 | ||||
| -rw-r--r-- | engines/mohawk/livingbooks.h | 2 | ||||
| -rw-r--r-- | engines/mohawk/mohawk.cpp | 2 | ||||
| -rw-r--r-- | engines/mohawk/sound.cpp | 5 | ||||
| -rw-r--r-- | engines/mohawk/sound.h | 7 |
5 files changed, 7 insertions, 11 deletions
diff --git a/engines/mohawk/cstime.h b/engines/mohawk/cstime.h index 3a1de6a137..0bc236f930 100644 --- a/engines/mohawk/cstime.h +++ b/engines/mohawk/cstime.h @@ -30,8 +30,6 @@ #include "common/random.h" #include "common/list.h" -#include "audio/mixer.h" - namespace Mohawk { class CSTimeCase; diff --git a/engines/mohawk/livingbooks.h b/engines/mohawk/livingbooks.h index 27e703a578..008a7dbf23 100644 --- a/engines/mohawk/livingbooks.h +++ b/engines/mohawk/livingbooks.h @@ -33,8 +33,6 @@ #include "common/queue.h" #include "common/random.h" -#include "audio/mixer.h" - #include "livingbooks_code.h" namespace Common { diff --git a/engines/mohawk/mohawk.cpp b/engines/mohawk/mohawk.cpp index faf52595b7..cb419064c0 100644 --- a/engines/mohawk/mohawk.cpp +++ b/engines/mohawk/mohawk.cpp @@ -31,8 +31,6 @@ #include "mohawk/sound.h" #include "mohawk/video.h" -#include "audio/mixer.h" - namespace Mohawk { MohawkEngine::MohawkEngine(OSystem *syst, const MohawkGameDescription *gamedesc) : Engine(syst), _gameDescription(gamedesc) { diff --git a/engines/mohawk/sound.cpp b/engines/mohawk/sound.cpp index 791b18db49..68b60515be 100644 --- a/engines/mohawk/sound.cpp +++ b/engines/mohawk/sound.cpp @@ -20,19 +20,20 @@ * */ -#include "mohawk/sound.h" - #include "common/debug.h" #include "common/system.h" #include "common/util.h" #include "common/textconsole.h" +#include "audio/midiparser.h" #include "audio/musicplugin.h" #include "audio/audiostream.h" #include "audio/decoders/mp3.h" #include "audio/decoders/raw.h" #include "audio/decoders/wave.h" +#include "mohawk/sound.h" + namespace Mohawk { Sound::Sound(MohawkEngine* vm) : _vm(vm) { diff --git a/engines/mohawk/sound.h b/engines/mohawk/sound.h index 593f2fcd0b..12a59cdedf 100644 --- a/engines/mohawk/sound.h +++ b/engines/mohawk/sound.h @@ -27,14 +27,15 @@ #include "common/str.h" #include "audio/audiostream.h" -#include "audio/decoders/adpcm.h" -#include "audio/mididrv.h" -#include "audio/midiparser.h" #include "audio/mixer.h" +#include "audio/decoders/adpcm.h" #include "mohawk/mohawk.h" #include "mohawk/resource.h" +class MidiDriver; +class MidiParser; + namespace Mohawk { #define MAX_CHANNELS 2 // Can there be more than 2? |