[Scummvm-cvs-logs] SF.net SVN: scummvm:[35781] scummvm/trunk/graphics/video

[fingolfin at users.sourceforge.net]

Revision: 35781
          http://scummvm.svn.sourceforge.net/scummvm/?rev=35781&view=rev
Author:   fingolfin
Date:     2009-01-07 23:36:41 +0000 (Wed, 07 Jan 2009)

Log Message:
-----------
Reduced header deps

Modified Paths:
--------------
    scummvm/trunk/graphics/video/dxa_player.cpp
    scummvm/trunk/graphics/video/dxa_player.h
    scummvm/trunk/graphics/video/flic_player.cpp
    scummvm/trunk/graphics/video/flic_player.h
    scummvm/trunk/graphics/video/smk_player.cpp
    scummvm/trunk/graphics/video/smk_player.h
    scummvm/trunk/graphics/video/video_player.h

Modified: scummvm/trunk/graphics/video/dxa_player.cpp
===================================================================
--- scummvm/trunk/graphics/video/dxa_player.cpp	2009-01-07 23:30:31 UTC (rev 35780)
+++ scummvm/trunk/graphics/video/dxa_player.cpp	2009-01-07 23:36:41 UTC (rev 35781)
@@ -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

Modified: scummvm/trunk/graphics/video/dxa_player.h
===================================================================
--- scummvm/trunk/graphics/video/dxa_player.h	2009-01-07 23:30:31 UTC (rev 35780)
+++ scummvm/trunk/graphics/video/dxa_player.h	2009-01-07 23:36:41 UTC (rev 35781)
@@ -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 {

Modified: scummvm/trunk/graphics/video/flic_player.cpp
===================================================================
--- scummvm/trunk/graphics/video/flic_player.cpp	2009-01-07 23:30:31 UTC (rev 35780)
+++ scummvm/trunk/graphics/video/flic_player.cpp	2009-01-07 23:36:41 UTC (rev 35781)
@@ -23,8 +23,10 @@
  *
  */
 
+#include "graphics/video/flic_player.h"
 #include "common/archive.h"
-#include "graphics/video/flic_player.h"
+#include "common/stream.h"
+#include "common/endian.h"
 
 namespace Graphics {
 

Modified: scummvm/trunk/graphics/video/flic_player.h
===================================================================
--- scummvm/trunk/graphics/video/flic_player.h	2009-01-07 23:30:31 UTC (rev 35780)
+++ scummvm/trunk/graphics/video/flic_player.h	2009-01-07 23:36:41 UTC (rev 35781)
@@ -26,11 +26,14 @@
 #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 {
 
 struct ChunkHeader {

Modified: scummvm/trunk/graphics/video/smk_player.cpp
===================================================================
--- scummvm/trunk/graphics/video/smk_player.cpp	2009-01-07 23:30:31 UTC (rev 35780)
+++ scummvm/trunk/graphics/video/smk_player.cpp	2009-01-07 23:36:41 UTC (rev 35781)
@@ -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"
 

Modified: scummvm/trunk/graphics/video/smk_player.h
===================================================================
--- scummvm/trunk/graphics/video/smk_player.h	2009-01-07 23:30:31 UTC (rev 35780)
+++ scummvm/trunk/graphics/video/smk_player.h	2009-01-07 23:36:41 UTC (rev 35781)
@@ -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 {
 

Modified: scummvm/trunk/graphics/video/video_player.h
===================================================================
--- scummvm/trunk/graphics/video/video_player.h	2009-01-07 23:30:31 UTC (rev 35780)
+++ scummvm/trunk/graphics/video/video_player.h	2009-01-07 23:36:41 UTC (rev 35781)
@@ -27,12 +27,13 @@
 #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 {
 
 /**


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.