Minor cleanup

svn-id: r21960

3 files changed, 13 insertions, 18 deletions

diff --git a/engines/simon/animation.cpp b/engines/simon/animation.cpp
index 1cbac3ccc9..a1fd4ed57f 100644
--- a/engines/simon/animation.cpp
+++ b/engines/simon/animation.cpp
@@ -31,7 +31,7 @@
 #include <zlib.h>
 #endif
 
-bool DXA_Player::open(const char *filename) {
+bool MoviePlayer::open(const char *filename) {
 	bool opened = false;
 	char filename2[100];
 
@@ -80,13 +80,13 @@ bool DXA_Player::open(const char *filename) {
 	return opened;
 }
 
-void DXA_Player::close() {
+void MoviePlayer::close() {
 	_fd.close();
 	free(_frameBuffer1);
 	free(_frameBuffer2);
 }
 
-void DXA_Player::play() {
+void MoviePlayer::play() {
 	g_system->clearScreen();
 
 	while (_currentFrame < _framesCount) {
@@ -97,7 +97,7 @@ void DXA_Player::play() {
 	g_system->clearScreen();
 }
 
-void DXA_Player::handleNextFrame() {
+void MoviePlayer::handleNextFrame() {
 	uint32 tag = _fd.readUint32BE();
 	if (tag == MKID_BE('CMAP')) {
 		uint8 rgb[768];
@@ -154,7 +154,7 @@ void DXA_Player::handleNextFrame() {
 	delay(_frameTicks);
 }
 
-void DXA_Player::decodeZlib(uint8 *data, int size, int totalSize) {
+void MoviePlayer::decodeZlib(uint8 *data, int size, int totalSize) {
 #ifdef USE_ZLIB
 	uint8 *temp = (uint8 *)malloc(size);
 	if (temp) {
@@ -176,15 +176,15 @@ void DXA_Player::decodeZlib(uint8 *data, int size, int totalSize) {
 #endif
 }
 
-void DXA_Player::decode0(uint8 *data, int size) {
+void MoviePlayer::decode0(uint8 *data, int size) {
 	error("decode0");
 }
 
-void DXA_Player::decode2(uint8 *data, int size, int totalSize) {
+void MoviePlayer::decode2(uint8 *data, int size, int totalSize) {
 	error("decode2");
 }
 
-void DXA_Player::delay(uint amount) {
+void MoviePlayer::delay(uint amount) {
 	OSystem::Event event;
 
 	uint32 start = g_system->getMillis();
diff --git a/engines/simon/animation.h b/engines/simon/animation.h
index 822cd7cc03..b1fa7cb271 100644
--- a/engines/simon/animation.h
+++ b/engines/simon/animation.h
@@ -20,17 +20,12 @@
  *
  */
 
-#ifndef __DXA_PLAYER_H__
-#define __DXA_PLAYER_H__
+#ifndef ANIMATION_H
+#define ANIMATION_H
 
 #include "common/file.h"
 
-struct DXA_Player {
-	static const uint32 _tagDEXA;
-	static const uint32 _tagFRAM;
-	static const uint32 _tagWAVE;
-	static const uint32 _tagCMAP;
-	
+struct MoviePlayer {
 	bool _playing;
 	bool _leftButtonDown;
 	bool _rightButtonDown;
@@ -55,4 +50,4 @@ struct DXA_Player {
 	void decode2(uint8 *data, int size, int totalSize);
 };
 
-#endif // __DXA_PLAYER_H__
+#endif
diff --git a/engines/simon/items.cpp b/engines/simon/items.cpp
index f93b586cd1..7a75bec70f 100644
--- a/engines/simon/items.cpp
+++ b/engines/simon/items.cpp
@@ -1933,7 +1933,7 @@ void SimonEngine::o3_playSmack() {
 	// 183: play video
 	debug(0, "Play video %s", _videoName);
 
-	DXA_Player p;
+	MoviePlayer p;
 	if (p.open((const char *)_videoName)) {
 		p.play();
 		p.close();