diff options
Diffstat (limited to 'engines/access')
-rw-r--r-- | engines/access/sound.cpp | 4 | ||||
-rw-r--r-- | engines/access/sound.h | 6 | ||||
-rw-r--r-- | engines/access/video/movie_decoder.h | 7 |
3 files changed, 8 insertions, 9 deletions
diff --git a/engines/access/sound.cpp b/engines/access/sound.cpp index 38f544de4e..448f630501 100644 --- a/engines/access/sound.cpp +++ b/engines/access/sound.cpp @@ -20,9 +20,11 @@ * */ -#include "common/algorithm.h" #include "common/config-manager.h" #include "audio/mixer.h" +#include "audio/audiostream.h" +#include "audio/mididrv.h" +#include "audio/midiparser.h" #include "audio/decoders/raw.h" #include "audio/decoders/wave.h" // Miles Audio diff --git a/engines/access/sound.h b/engines/access/sound.h index b372e566d2..d82ee956b1 100644 --- a/engines/access/sound.h +++ b/engines/access/sound.h @@ -24,14 +24,16 @@ #define ACCESS_SOUND_H #include "common/scummsys.h" -#include "audio/audiostream.h" #include "audio/mixer.h" #include "access/files.h" #include "audio/midiplayer.h" -#include "audio/midiparser.h" #define MAX_SOUNDS 20 +namespace Audio { +class AudioStream; +} + namespace Access { class AccessEngine; diff --git a/engines/access/video/movie_decoder.h b/engines/access/video/movie_decoder.h index fe8a89fcde..8b5d94836b 100644 --- a/engines/access/video/movie_decoder.h +++ b/engines/access/video/movie_decoder.h @@ -23,13 +23,8 @@ #ifndef ACCESS_VIDEO_MOVIE_DECODER_H #define ACCESS_VIDEO_MOVIE_DECODER_H -#include "common/rect.h" #include "video/video_decoder.h" -#include "audio/decoders/raw.h" - -namespace Audio { -class QueuingAudioStream; -} +#include "audio/audiostream.h" namespace Common { class SeekableReadStream; |