From 8ae050ff084e4acee056f94f1246ac13bcb012b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torbj=C3=B6rn=20Andersson?= Date: Sun, 27 Aug 2006 09:10:24 +0000 Subject: [PATCH] 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 --- engines/sword1/animation.h | 2 +- engines/sword2/animation.h | 2 +- graphics/module.mk | 2 +- graphics/{animation.cpp => mpeg_player.cpp} | 3 +-- graphics/{animation.h => mpeg_player.h} | 0 5 files changed, 4 insertions(+), 5 deletions(-) rename graphics/{animation.cpp => mpeg_player.cpp} (99%) rename graphics/{animation.h => mpeg_player.h} (100%) diff --git a/engines/sword1/animation.h b/engines/sword1/animation.h index 07aa5241f0c..589a6257809 100644 --- a/engines/sword1/animation.h +++ b/engines/sword1/animation.h @@ -23,8 +23,8 @@ #ifndef ANIMATION_H #define ANIMATION_H -#include "graphics/animation.h" #include "graphics/dxa_player.h" +#include "graphics/mpeg_player.h" #include "sword1/screen.h" #include "sword1/sound.h" diff --git a/engines/sword2/animation.h b/engines/sword2/animation.h index 99c4231585e..d667b248fab 100644 --- a/engines/sword2/animation.h +++ b/engines/sword2/animation.h @@ -22,8 +22,8 @@ #ifndef SWORD2_ANIMATION_H #define SWORD2_ANIMATION_H -#include "graphics/animation.h" #include "graphics/dxa_player.h" +#include "graphics/mpeg_player.h" #include "sound/mixer.h" namespace Sword2 { diff --git a/graphics/module.mk b/graphics/module.mk index 104d4ea4dae..d14ca763f23 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 similarity index 99% rename from graphics/animation.cpp rename to graphics/mpeg_player.cpp index 7951e7f2d60..4ecf5cb6a6f 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 similarity index 100% rename from graphics/animation.h rename to graphics/mpeg_player.h