diff options
-rw-r--r-- | graphics/video/dxa_player.cpp | 3 | ||||
-rw-r--r-- | graphics/video/dxa_player.h | 3 | ||||
-rw-r--r-- | graphics/video/flic_player.cpp | 4 | ||||
-rw-r--r-- | graphics/video/flic_player.h | 7 | ||||
-rw-r--r-- | graphics/video/smk_player.cpp | 7 | ||||
-rw-r--r-- | graphics/video/smk_player.h | 8 | ||||
-rw-r--r-- | graphics/video/video_player.h | 9 |
7 files changed, 24 insertions, 17 deletions
diff --git a/graphics/video/dxa_player.cpp b/graphics/video/dxa_player.cpp index aef0e30354..e228510e6b 100644 --- a/graphics/video/dxa_player.cpp +++ b/graphics/video/dxa_player.cpp @@ -25,9 +25,10 @@ #include "common/endian.h" #include "common/archive.h" -#include "graphics/video/dxa_player.h" #include "common/util.h" +#include "graphics/video/dxa_player.h" + #ifdef USE_ZLIB #include "common/zlib.h" #endif diff --git a/graphics/video/dxa_player.h b/graphics/video/dxa_player.h index 1593658ae7..fb5645c089 100644 --- a/graphics/video/dxa_player.h +++ b/graphics/video/dxa_player.h @@ -26,9 +26,6 @@ #ifndef GRAPHICS_VIDEO_DXA_PLAYER_H #define GRAPHICS_VIDEO_DXA_PLAYER_H -#include "common/scummsys.h" -#include "common/stream.h" - #include "graphics/video/video_player.h" namespace Graphics { diff --git a/graphics/video/flic_player.cpp b/graphics/video/flic_player.cpp index a6062aeb16..b928981ef3 100644 --- a/graphics/video/flic_player.cpp +++ b/graphics/video/flic_player.cpp @@ -23,8 +23,10 @@ * */ -#include "common/archive.h" #include "graphics/video/flic_player.h" +#include "common/archive.h" +#include "common/stream.h" +#include "common/endian.h" namespace Graphics { diff --git a/graphics/video/flic_player.h b/graphics/video/flic_player.h index 7f0a029df8..43f3775bdd 100644 --- a/graphics/video/flic_player.h +++ b/graphics/video/flic_player.h @@ -26,10 +26,13 @@ #ifndef GRAPHICS_VIDEO_FLICPLAYER_H #define GRAPHICS_VIDEO_FLICPLAYER_H -#include "common/endian.h" +#include "common/scummsys.h" #include "common/list.h" #include "common/rect.h" -#include "common/file.h" + +namespace Common { + class SeekableReadStream; +} namespace Graphics { diff --git a/graphics/video/smk_player.cpp b/graphics/video/smk_player.cpp index f97555bb15..81c18e94b4 100644 --- a/graphics/video/smk_player.cpp +++ b/graphics/video/smk_player.cpp @@ -28,11 +28,14 @@ // http://svn.ffmpeg.org/ffmpeg/trunk/libavcodec/smacker.c?revision=16143&view=markup #include "graphics/video/smk_player.h" + #include "common/archive.h" -#include "common/system.h" -#include "common/util.h" #include "common/array.h" #include "common/endian.h" +#include "common/util.h" +#include "common/stream.h" +#include "common/system.h" + #include "sound/mixer.h" #include "sound/audiostream.h" diff --git a/graphics/video/smk_player.h b/graphics/video/smk_player.h index 3ddc12e2d6..512eb57c20 100644 --- a/graphics/video/smk_player.h +++ b/graphics/video/smk_player.h @@ -30,12 +30,12 @@ #ifndef GRAPHICS_VIDEO_SMK_PLAYER_H #define GRAPHICS_VIDEO_SMK_PLAYER_H -#include "common/scummsys.h" -#include "common/stream.h" +#include "graphics/video/video_player.h" #include "sound/mixer.h" -#include "sound/audiostream.h" -#include "graphics/video/video_player.h" +namespace Audio { + class AppendableAudioStream; +} namespace Graphics { diff --git a/graphics/video/video_player.h b/graphics/video/video_player.h index ea9122499f..4a44349552 100644 --- a/graphics/video/video_player.h +++ b/graphics/video/video_player.h @@ -27,11 +27,12 @@ #define GRAPHICS_VIDEO_PLAYER_H #include "common/scummsys.h" -#include "common/stream.h" -#include "common/system.h" +#include "common/events.h" #include "common/list.h" -#include "sound/mixer.h" -#include "sound/audiostream.h" + +namespace Common { + class SeekableReadStream; +} namespace Graphics { |