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/groovie | |
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/groovie')
-rw-r--r-- | engines/groovie/groovie.cpp | 3 | ||||
-rw-r--r-- | engines/groovie/music.h | 2 | ||||
-rw-r--r-- | engines/groovie/player.cpp | 1 | ||||
-rw-r--r-- | engines/groovie/player.h | 5 | ||||
-rw-r--r-- | engines/groovie/roq.cpp | 1 | ||||
-rw-r--r-- | engines/groovie/script.cpp | 1 | ||||
-rw-r--r-- | engines/groovie/vdx.cpp | 1 |
7 files changed, 9 insertions, 5 deletions
diff --git a/engines/groovie/groovie.cpp b/engines/groovie/groovie.cpp index bbc290eccf..ac77ec3099 100644 --- a/engines/groovie/groovie.cpp +++ b/engines/groovie/groovie.cpp @@ -20,9 +20,6 @@ * */ -#include "audio/mididrv.h" -#include "audio/mixer.h" - #include "groovie/groovie.h" #include "groovie/cursor.h" #include "groovie/detection.h" diff --git a/engines/groovie/music.h b/engines/groovie/music.h index dcb91d42a8..c549527c77 100644 --- a/engines/groovie/music.h +++ b/engines/groovie/music.h @@ -25,6 +25,8 @@ #include "common/array.h" #include "common/mutex.h" +#include "audio/mididrv.h" +#include "audio/mixer.h" class MidiParser; diff --git a/engines/groovie/player.cpp b/engines/groovie/player.cpp index c1b90fbd2c..dea32386f2 100644 --- a/engines/groovie/player.cpp +++ b/engines/groovie/player.cpp @@ -21,6 +21,7 @@ */ #include "common/debug.h" +#include "audio/audiostream.h" #include "groovie/player.h" #include "groovie/groovie.h" diff --git a/engines/groovie/player.h b/engines/groovie/player.h index b1aac963f2..952d3ac208 100644 --- a/engines/groovie/player.h +++ b/engines/groovie/player.h @@ -24,7 +24,10 @@ #define GROOVIE_PLAYER_H #include "common/system.h" -#include "audio/audiostream.h" + +namespace Audio { +class QueuingAudioStream; +} namespace Groovie { diff --git a/engines/groovie/roq.cpp b/engines/groovie/roq.cpp index f14cacd6b8..c1b6c44c4d 100644 --- a/engines/groovie/roq.cpp +++ b/engines/groovie/roq.cpp @@ -40,6 +40,7 @@ // Required for the YUV to RGB conversion #include "graphics/conversion.h" #endif +#include "audio/audiostream.h" #include "audio/mixer.h" #include "audio/decoders/raw.h" diff --git a/engines/groovie/script.cpp b/engines/groovie/script.cpp index eef97b6ff9..47fdaacf7a 100644 --- a/engines/groovie/script.cpp +++ b/engines/groovie/script.cpp @@ -21,7 +21,6 @@ */ #include "audio/mididrv.h" -#include "audio/mixer.h" #include "groovie/script.h" #include "groovie/cell.h" diff --git a/engines/groovie/vdx.cpp b/engines/groovie/vdx.cpp index 09c2e0d3ea..94b6aa0680 100644 --- a/engines/groovie/vdx.cpp +++ b/engines/groovie/vdx.cpp @@ -28,6 +28,7 @@ #include "common/debug.h" #include "common/debug-channels.h" #include "common/textconsole.h" +#include "audio/audiostream.h" #include "audio/mixer.h" #include "audio/decoders/raw.h" #include "graphics/palette.h" |