[Scummvm-cvs-logs] SF.net SVN: scummvm: [24325] scummvm/trunk/engines/scumm/smush
fingolfin at users.sourceforge.net
fingolfin at users.sourceforge.net
Sun Oct 15 03:27:46 CEST 2006
Revision: 24325
http://svn.sourceforge.net/scummvm/?rev=24325&view=rev
Author: fingolfin
Date: 2006-10-14 18:27:38 -0700 (Sat, 14 Oct 2006)
Log Message:
-----------
Replaced Chunk::ChunkString by tag2str
Modified Paths:
--------------
scummvm/trunk/engines/scumm/smush/chunk.cpp
scummvm/trunk/engines/scumm/smush/chunk.h
scummvm/trunk/engines/scumm/smush/imuse_channel.cpp
scummvm/trunk/engines/scumm/smush/saud_channel.cpp
scummvm/trunk/engines/scumm/smush/smush_player.cpp
Modified: scummvm/trunk/engines/scumm/smush/chunk.cpp
===================================================================
--- scummvm/trunk/engines/scumm/smush/chunk.cpp 2006-10-15 01:26:23 UTC (rev 24324)
+++ scummvm/trunk/engines/scumm/smush/chunk.cpp 2006-10-15 01:27:38 UTC (rev 24325)
@@ -31,16 +31,6 @@
namespace Scumm {
-const char *Chunk::ChunkString(Chunk::type t) {
- static char data[5];
- data[0] = (char)((t >> 24) & 0xFF);
- data[1] = (char)((t >> 16) & 0xFF);
- data[2] = (char)((t >> 8) & 0xFF);
- data[3] = (char)((t >> 0) & 0xFF);
- data[4] = 0;
- return data;
-}
-
BaseChunk::BaseChunk() :
_type(0),
_size(0),
Modified: scummvm/trunk/engines/scumm/smush/chunk.h
===================================================================
--- scummvm/trunk/engines/scumm/smush/chunk.h 2006-10-15 01:26:23 UTC (rev 24324)
+++ scummvm/trunk/engines/scumm/smush/chunk.h 2006-10-15 01:27:38 UTC (rev 24325)
@@ -35,7 +35,6 @@
virtual ~Chunk() {};
enum seek_type { seek_start, seek_end, seek_cur };
typedef uint32 type;
- static const char *ChunkString(type t);
virtual type getType() const = 0;
virtual uint32 getSize() const = 0;
virtual Chunk *subBlock() = 0;
Modified: scummvm/trunk/engines/scumm/smush/imuse_channel.cpp
===================================================================
--- scummvm/trunk/engines/scumm/smush/imuse_channel.cpp 2006-10-15 01:26:23 UTC (rev 24324)
+++ scummvm/trunk/engines/scumm/smush/imuse_channel.cpp 2006-10-15 01:27:38 UTC (rev 24325)
@@ -22,6 +22,7 @@
#include "common/stdafx.h"
#include "scumm/scumm.h"
+#include "scumm/util.h"
#include "scumm/smush/channel.h"
#include "scumm/smush/chunk.h"
#include "scumm/smush/chunk_type.h"
@@ -153,7 +154,7 @@
handleStop(*sub);
break;
default:
- error("Unknown iMUS subChunk found : %s, %d", Chunk::ChunkString(sub->getType()), sub->getSize());
+ error("Unknown iMUS subChunk found : %s, %d", tag2str(sub->getType()), sub->getSize());
}
delete sub;
}
@@ -243,7 +244,7 @@
}
return false;
default:
- error("unknown Chunk in iMUS track : %s ", Chunk::ChunkString(type));
+ error("unknown Chunk in iMUS track : %s ", tag2str(type));
}
offset += size + 8;
return true;
Modified: scummvm/trunk/engines/scumm/smush/saud_channel.cpp
===================================================================
--- scummvm/trunk/engines/scumm/smush/saud_channel.cpp 2006-10-15 01:26:23 UTC (rev 24324)
+++ scummvm/trunk/engines/scumm/smush/saud_channel.cpp 2006-10-15 01:27:38 UTC (rev 24325)
@@ -23,6 +23,7 @@
#include "common/stdafx.h"
#include "common/endian.h"
+#include "scumm/util.h"
#include "scumm/smush/channel.h"
#include "scumm/smush/chunk.h"
#include "scumm/smush/chunk_type.h"
@@ -83,7 +84,7 @@
offset += 8;
return false;
default:
- error("unknown Chunk in SAUD track : %s ", Chunk::ChunkString(type));
+ error("unknown Chunk in SAUD track : %s ", tag2str(type));
}
offset += size + 8;
return true;
Modified: scummvm/trunk/engines/scumm/smush/smush_player.cpp
===================================================================
--- scummvm/trunk/engines/scumm/smush/smush_player.cpp 2006-10-15 01:26:23 UTC (rev 24324)
+++ scummvm/trunk/engines/scumm/smush/smush_player.cpp 2006-10-15 01:27:38 UTC (rev 24325)
@@ -38,6 +38,7 @@
#include "scumm/imuse/imuse.h"
#include "scumm/scumm.h"
#include "scumm/sound.h"
+#include "scumm/util.h"
#include "scumm/smush/channel.h"
#include "scumm/smush/chunk_type.h"
#include "scumm/smush/chunk.h"
@@ -984,7 +985,7 @@
handleTextResource(*sub);
break;
default:
- error("Unknown frame subChunk found : %s, %d", Chunk::ChunkString(sub->getType()), sub->getSize());
+ error("Unknown frame subChunk found : %s, %d", tag2str(sub->getType()), sub->getSize());
}
b.reseek();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list