aboutsummaryrefslogtreecommitdiff
path: root/graphics
diff options
context:
space:
mode:
authorTorbjörn Andersson2006-08-27 09:10:24 +0000
committerTorbjörn Andersson2006-08-27 09:10:24 +0000
commit8ae050ff084e4acee056f94f1246ac13bcb012b8 (patch)
tree8b593724ed3be5a6d079d2bffefdee0548811d49 /graphics
parent57bdecb4c6dc6f35a69120201e0b0f2654ac4c65 (diff)
downloadscummvm-rg350-8ae050ff084e4acee056f94f1246ac13bcb012b8.tar.gz
scummvm-rg350-8ae050ff084e4acee056f94f1246ac13bcb012b8.tar.bz2
scummvm-rg350-8ae050ff084e4acee056f94f1246ac13bcb012b8.zip
Renamed graphics/animation.[cpp|h] to graphics/mpeg_player.[cpp|h] to be more
consistent with dxa_player.[cpp|h]. (Though actually, "decoder" might be more accurate...) svn-id: r23774
Diffstat (limited to 'graphics')
-rw-r--r--graphics/module.mk2
-rw-r--r--graphics/mpeg_player.cpp (renamed from graphics/animation.cpp)3
-rw-r--r--graphics/mpeg_player.h (renamed from graphics/animation.h)0
3 files changed, 2 insertions, 3 deletions
diff --git a/graphics/module.mk b/graphics/module.mk
index 104d4ea4da..d14ca763f2 100644
--- a/graphics/module.mk
+++ b/graphics/module.mk
@@ -1,7 +1,6 @@
MODULE := graphics
MODULE_OBJS := \
- animation.o \
cursorman.o \
dxa_player.o \
font.o \
@@ -13,6 +12,7 @@ MODULE_OBJS := \
ilbm.o \
imagedec.o \
imageman.o \
+ mpeg_player.o \
paletteman.o \
primitives.o \
scaler.o \
diff --git a/graphics/animation.cpp b/graphics/mpeg_player.cpp
index 7951e7f2d6..4ecf5cb6a6 100644
--- a/graphics/animation.cpp
+++ b/graphics/mpeg_player.cpp
@@ -21,8 +21,7 @@
*/
#include "common/stdafx.h"
-#include "graphics/animation.h"
-#include "common/config-manager.h"
+#include "graphics/mpeg_player.h"
#include "common/file.h"
#include "common/system.h"
#include "common/util.h"
diff --git a/graphics/animation.h b/graphics/mpeg_player.h
index aff644d2d3..aff644d2d3 100644
--- a/graphics/animation.h
+++ b/graphics/mpeg_player.h