diff options
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/module.mk | 10 | ||||
| -rw-r--r-- | graphics/video/dxa_player.cpp (renamed from graphics/dxa_player.cpp) | 2 | ||||
| -rw-r--r-- | graphics/video/dxa_player.h (renamed from graphics/dxa_player.h) | 4 | ||||
| -rw-r--r-- | graphics/video/flic_player.cpp (renamed from graphics/flic_player.cpp) | 2 | ||||
| -rw-r--r-- | graphics/video/flic_player.h (renamed from graphics/flic_player.h) | 4 | ||||
| -rw-r--r-- | graphics/video/mpeg_player.cpp (renamed from graphics/mpeg_player.cpp) | 2 | ||||
| -rw-r--r-- | graphics/video/mpeg_player.h (renamed from graphics/mpeg_player.h) | 4 | ||||
| -rw-r--r-- | graphics/video/smk_player.cpp (renamed from graphics/smk_player.cpp) | 2 | ||||
| -rw-r--r-- | graphics/video/smk_player.h (renamed from graphics/smk_player.h) | 4 |
9 files changed, 17 insertions, 17 deletions
diff --git a/graphics/module.mk b/graphics/module.mk index f080a6555c..5a10bf2cd0 100644 --- a/graphics/module.mk +++ b/graphics/module.mk @@ -2,8 +2,6 @@ MODULE := graphics MODULE_OBJS := \ cursorman.o \ - dxa_player.o \ - flic_player.o \ font.o \ fontman.o \ fonts/consolefont.o \ @@ -13,15 +11,17 @@ MODULE_OBJS := \ iff.o \ imagedec.o \ imageman.o \ - mpeg_player.o \ primitives.o \ scaler.o \ scaler/thumbnail_intern.o \ - smk_player.o \ surface.o \ thumbnail.o \ VectorRenderer.o \ - VectorRendererSpec.o + VectorRendererSpec.o \ + video/dxa_player.o \ + video/flic_player.o \ + video/mpeg_player.o \ + video/smk_player.o ifndef DISABLE_SCALERS MODULE_OBJS += \ diff --git a/graphics/dxa_player.cpp b/graphics/video/dxa_player.cpp index 3629431d48..39c44a4770 100644 --- a/graphics/dxa_player.cpp +++ b/graphics/video/dxa_player.cpp @@ -25,7 +25,7 @@ #include "common/endian.h" #include "common/archive.h" -#include "graphics/dxa_player.h" +#include "graphics/video/dxa_player.h" #include "common/util.h" #ifdef USE_ZLIB diff --git a/graphics/dxa_player.h b/graphics/video/dxa_player.h index 540a5e3bfd..8ead07f2ae 100644 --- a/graphics/dxa_player.h +++ b/graphics/video/dxa_player.h @@ -23,8 +23,8 @@ * */ -#ifndef GRAPHICS_DXA_PLAYER_H -#define GRAPHICS_DXA_PLAYER_H +#ifndef GRAPHICS_VIDEO_DXA_PLAYER_H +#define GRAPHICS_VIDEO_DXA_PLAYER_H #include "common/scummsys.h" #include "common/stream.h" diff --git a/graphics/flic_player.cpp b/graphics/video/flic_player.cpp index 7a7e155838..d4a8ede4f8 100644 --- a/graphics/flic_player.cpp +++ b/graphics/video/flic_player.cpp @@ -23,7 +23,7 @@ * */ -#include "flic_player.h" +#include "graphics/video/flic_player.h" namespace Graphics { diff --git a/graphics/flic_player.h b/graphics/video/flic_player.h index eb318203cf..ef2b6d67ba 100644 --- a/graphics/flic_player.h +++ b/graphics/video/flic_player.h @@ -23,8 +23,8 @@ * */ -#ifndef GRAPHICS_FLICPLAYER_H -#define GRAPHICS_FLICPLAYER_H +#ifndef GRAPHICS_VIDEO_FLICPLAYER_H +#define GRAPHICS_VIDEO_FLICPLAYER_H #include "common/endian.h" #include "common/list.h" diff --git a/graphics/mpeg_player.cpp b/graphics/video/mpeg_player.cpp index 7432887360..964f4cd94d 100644 --- a/graphics/mpeg_player.cpp +++ b/graphics/video/mpeg_player.cpp @@ -23,7 +23,7 @@ * */ -#include "graphics/mpeg_player.h" +#include "graphics/video/mpeg_player.h" #include "common/file.h" #include "common/system.h" #include "common/util.h" diff --git a/graphics/mpeg_player.h b/graphics/video/mpeg_player.h index 1c975825a8..7d42618926 100644 --- a/graphics/mpeg_player.h +++ b/graphics/video/mpeg_player.h @@ -23,8 +23,8 @@ * */ -#ifndef GRAPHICS_MPEG_PLAYER_H -#define GRAPHICS_MPEG_PLAYER_H +#ifndef GRAPHICS_VIDEO_MPEG_PLAYER_H +#define GRAPHICS_VIDEO_MPEG_PLAYER_H #include "common/scummsys.h" diff --git a/graphics/smk_player.cpp b/graphics/video/smk_player.cpp index ccd366c7c0..458a8c0d12 100644 --- a/graphics/smk_player.cpp +++ b/graphics/video/smk_player.cpp @@ -27,7 +27,7 @@ // and the FFmpeg Smacker decoder (libavcodec/smacker.c), revision 16143 // http://svn.ffmpeg.org/ffmpeg/trunk/libavcodec/smacker.c?revision=16143&view=markup -#include "graphics/smk_player.h" +#include "graphics/video/smk_player.h" #include "common/archive.h" #include "common/system.h" #include "common/util.h" diff --git a/graphics/smk_player.h b/graphics/video/smk_player.h index b6513d1803..e07412b2a5 100644 --- a/graphics/smk_player.h +++ b/graphics/video/smk_player.h @@ -27,8 +27,8 @@ // and the FFmpeg Smacker decoder (libavcodec/smacker.c), revision 16143 // http://svn.ffmpeg.org/ffmpeg/trunk/libavcodec/smacker.c?revision=16143&view=markup -#ifndef GRAPHICS_SMK_PLAYER_H -#define GRAPHICS_SMK_PLAYER_H +#ifndef GRAPHICS_VIDEO_SMK_PLAYER_H +#define GRAPHICS_VIDEO_SMK_PLAYER_H #include "common/scummsys.h" #include "common/stream.h" |