aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--engines/agos/animation.h4
-rw-r--r--engines/scumm/he/animation_he.h2
-rw-r--r--engines/sword1/animation.h4
-rw-r--r--engines/sword2/animation.h4
-rw-r--r--engines/tucker/tucker.h2
-rw-r--r--graphics/module.mk10
-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
14 files changed, 25 insertions, 25 deletions
diff --git a/engines/agos/animation.h b/engines/agos/animation.h
index 822ac8ee73..a4fcbfc6d0 100644
--- a/engines/agos/animation.h
+++ b/engines/agos/animation.h
@@ -29,8 +29,8 @@
#include "common/file.h"
#include "common/stream.h"
-#include "graphics/dxa_player.h"
-#include "graphics/smk_player.h"
+#include "graphics/video/dxa_player.h"
+#include "graphics/video/smk_player.h"
#include "sound/mixer.h"
namespace AGOS {
diff --git a/engines/scumm/he/animation_he.h b/engines/scumm/he/animation_he.h
index 7516ce79a4..93acc2253c 100644
--- a/engines/scumm/he/animation_he.h
+++ b/engines/scumm/he/animation_he.h
@@ -28,7 +28,7 @@
#include "common/file.h"
-#include "graphics/smk_player.h"
+#include "graphics/video/smk_player.h"
#include "sound/mixer.h"
diff --git a/engines/sword1/animation.h b/engines/sword1/animation.h
index 2f38b197fe..3c6bf0fc1a 100644
--- a/engines/sword1/animation.h
+++ b/engines/sword1/animation.h
@@ -26,8 +26,8 @@
#ifndef SWORD1_ANIMATION_H
#define SWORD1_ANIMATION_H
-#include "graphics/dxa_player.h"
-#include "graphics/mpeg_player.h"
+#include "graphics/video/dxa_player.h"
+#include "graphics/video/mpeg_player.h"
#include "sword1/screen.h"
#include "sword1/sound.h"
diff --git a/engines/sword2/animation.h b/engines/sword2/animation.h
index 7946ea227b..da59a4c509 100644
--- a/engines/sword2/animation.h
+++ b/engines/sword2/animation.h
@@ -28,8 +28,8 @@
#ifndef SWORD2_ANIMATION_H
#define SWORD2_ANIMATION_H
-#include "graphics/dxa_player.h"
-#include "graphics/mpeg_player.h"
+#include "graphics/video/dxa_player.h"
+#include "graphics/video/mpeg_player.h"
#include "sound/mixer.h"
#include "sword2/screen.h"
diff --git a/engines/tucker/tucker.h b/engines/tucker/tucker.h
index b2ca3dd227..bc8d112d8a 100644
--- a/engines/tucker/tucker.h
+++ b/engines/tucker/tucker.h
@@ -32,7 +32,7 @@
#include "common/events.h"
#include "common/stream.h"
-#include "graphics/flic_player.h"
+#include "graphics/video/flic_player.h"
#include "sound/mixer.h"
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"
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-19 10:48:21 +0000