[Scummvm-cvs-logs] CVS: scummvm/scumm/smush channel.h,1.12,1.13 chunk.cpp,1.19,1.20 chunk.h,1.9,1.10 chunk_type.h,1.6,1.7 codec1.cpp,1.11,1.12 codec37.cpp,1.23,1.24 codec37.h,1.12,1.13 codec47.cpp,1.60,1.61 codec47.h,1.18,1.19 imuse_channel.cpp,1.21,1.22 saud_channel.cpp,1.18,1.19 smush_font.cpp,1.13,1.14 smush_font.h,1.8,1.9 smush_mixer.cpp,1.19,1.20 smush_mixer.h,1.4,1.5 smush_player.cpp,1.54,1.55 smush_player.h,1.11,1.12

[Max Horn]

Update of /cvsroot/scummvm/scummvm/scumm/smush
In directory sc8-pr-cvs1:/tmp/cvs-serv12234/smush

Modified Files:
	channel.h chunk.cpp chunk.h chunk_type.h codec1.cpp 
	codec37.cpp codec37.h codec47.cpp codec47.h imuse_channel.cpp 
	saud_channel.cpp smush_font.cpp smush_font.h smush_mixer.cpp 
	smush_mixer.h smush_player.cpp smush_player.h 
Log Message:
introduced namespace Scumm; made #include statements use scumm/ prefix explicitly

Index: channel.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/smush/channel.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- channel.h	10 Sep 2003 12:31:20 -0000	1.12
+++ channel.h	3 Oct 2003 18:33:56 -0000	1.13
@@ -24,6 +24,8 @@
 
 #include "common/util.h"
 
+namespace Scumm {
+
 class Chunk;
 class ContChunk;
 	
@@ -136,5 +138,7 @@
 	};
 	virtual int32 getTrackIdentifier() const { return _track; };
 };
+
+} // End of namespace Scumm
 
 #endif

Index: chunk.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/smush/chunk.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- chunk.cpp	2 Oct 2003 17:43:02 -0000	1.19
+++ chunk.cpp	3 Oct 2003 18:33:56 -0000	1.20
@@ -20,12 +20,14 @@
  */
 
 #include "stdafx.h"
-#include "chunk.h"
+#include "scumm/smush/chunk.h"
 
 #include "common/file.h"
 #include "common/str.h"
 #include "common/util.h"
 
+namespace Scumm {
+
 class FilePtr : public File {
 	Common::String _filename;
 	int32 _refcount;
@@ -253,3 +255,5 @@
 	_curPos += 4;
 	return READ_LE_UINT32(ptr);
 }
+
+} // End of namespace Scumm

Index: chunk.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/smush/chunk.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- chunk.h	25 May 2003 11:39:08 -0000	1.9
+++ chunk.h	3 Oct 2003 18:33:56 -0000	1.10
@@ -24,6 +24,8 @@
 
 #include "common/scummsys.h"
 
+namespace Scumm {
+
 class Chunk {
 public:
 	virtual ~Chunk() {};
@@ -97,5 +99,7 @@
 	uint16 getWord();
 	uint32 getDword();
 };
+
+} // End of namespace Scumm
 
 #endif

Index: chunk_type.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/smush/chunk_type.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- chunk_type.h	13 Mar 2003 02:30:06 -0000	1.6
+++ chunk_type.h	3 Oct 2003 18:33:56 -0000	1.7
@@ -23,7 +23,9 @@
 #define CHUNK_TYPE_H
 
 #include "common/scummsys.h"
-#include "chunk.h"
+#include "scumm/smush/chunk.h"
+
+namespace Scumm {
 
 static const Chunk::type TYPE_ANIM = 'ANIM';
 static const Chunk::type TYPE_AHDR = 'AHDR';
@@ -50,5 +52,7 @@
 static const Chunk::type TYPE_MAP_ = 'MAP ';
 static const Chunk::type TYPE_DATA = 'DATA';
 static const Chunk::type TYPE_ETRS = 'ETRS';
+
+} // End of namespace Scumm
 
 #endif

Index: codec1.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/smush/codec1.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- codec1.cpp	7 Jun 2003 00:45:32 -0000	1.11
+++ codec1.cpp	3 Oct 2003 18:33:56 -0000	1.12
@@ -22,6 +22,8 @@
 #include "stdafx.h"
 #include "common/scummsys.h"
 
+namespace Scumm {
+
 void smush_decode_codec1(byte *dst, byte *src, int height) {
 	byte val, code;
 	int32 length;
@@ -52,3 +54,5 @@
 		}
 	}
 }
+
+} // End of namespace Scumm

Index: codec37.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/smush/codec37.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- codec37.cpp	10 Sep 2003 12:31:20 -0000	1.23
+++ codec37.cpp	3 Oct 2003 18:33:56 -0000	1.24
@@ -24,6 +24,8 @@
 #include "scumm/bomp.h"
 #include "scumm/smush/codec37.h"
 
+namespace Scumm {
+
 void Codec37Decoder::init(int width, int height) {
 	deinit();
 	_width = width;
@@ -511,4 +513,6 @@
 
 	memcpy(dst, _deltaBufs[_curtable], _frameSize);
 }
+
+} // End of namespace Scumm
 

Index: codec37.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/smush/codec37.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- codec37.h	30 May 2003 19:00:33 -0000	1.12
+++ codec37.h	3 Oct 2003 18:33:57 -0000	1.13
@@ -24,6 +24,8 @@
 
 #include "common/scummsys.h"
 
+namespace Scumm {
+
 class Codec37Decoder {
 private:
 
@@ -52,5 +54,7 @@
 public:
 	void decode(byte *dst, const byte *src);
 };
+
+} // End of namespace Scumm
 
 #endif

Index: codec47.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/smush/codec47.cpp,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -d -r1.60 -r1.61
--- codec47.cpp	10 Sep 2003 12:31:20 -0000	1.60
+++ codec47.cpp	3 Oct 2003 18:33:57 -0000	1.61
@@ -24,6 +24,8 @@
 #include "scumm/bomp.h"
 #include "scumm/smush/codec47.h"
 
+namespace Scumm {
+
 #if defined(SCUMM_NEED_ALIGNMENT)
 
 #define COPY_4X1_LINE(dst, src)			\
@@ -627,3 +629,5 @@
 _GEND
 
 #endif
+
+} // End of namespace Scumm

Index: codec47.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/smush/codec47.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- codec47.h	17 Aug 2003 16:17:13 -0000	1.18
+++ codec47.h	3 Oct 2003 18:33:57 -0000	1.19
@@ -24,6 +24,8 @@
 
 #include "common/scummsys.h"
 
+namespace Scumm {
+
 class Codec47Decoder {
 private:
 
@@ -56,5 +58,7 @@
 	void deinit();
 	bool decode(byte *dst, const byte *src);
 };
+
+} // End of namespace Scumm
 
 #endif

Index: imuse_channel.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/smush/imuse_channel.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- imuse_channel.cpp	24 Sep 2003 06:33:59 -0000	1.21
+++ imuse_channel.cpp	3 Oct 2003 18:33:57 -0000	1.22
@@ -20,9 +20,11 @@
  */
 
 #include "stdafx.h"
-#include "channel.h"
-#include "chunk.h"
-#include "chunk_type.h"
+#include "scumm/smush/channel.h"
+#include "scumm/smush/chunk.h"
+#include "scumm/smush/chunk_type.h"
+
+namespace Scumm {
 
 ImuseChannel::ImuseChannel(int32 track, int32 freq) : 
 	_track(track), 
@@ -349,3 +351,5 @@
 	_sbufferSize = 0;
 	_dataSize -= _srbufferSize;
 }
+
+} // End of namespace Scumm

Index: saud_channel.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/smush/saud_channel.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- saud_channel.cpp	24 Sep 2003 06:33:59 -0000	1.18
+++ saud_channel.cpp	3 Oct 2003 18:33:57 -0000	1.19
@@ -21,9 +21,11 @@
 
 #include "stdafx.h"
 
-#include "channel.h"
-#include "chunk.h"
-#include "chunk_type.h"
+#include "scumm/smush/channel.h"
+#include "scumm/smush/chunk.h"
+#include "scumm/smush/chunk_type.h"
+
+namespace Scumm {
 
 void SaudChannel::handleStrk(Chunk &b) {
 	int32 size = b.getSize();
@@ -266,3 +268,5 @@
 	_sbuffer = 0;
 	_sbufferSize = 0;
 }
+
+} // End of namespace Scumm

Index: smush_font.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/smush/smush_font.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- smush_font.cpp	9 Jun 2003 12:24:04 -0000	1.13
+++ smush_font.cpp	3 Oct 2003 18:33:57 -0000	1.14
@@ -23,7 +23,9 @@
 #include "common/file.h"
 #include "scumm/scumm.h"
 
-#include "smush_font.h"
+#include "scumm/smush/smush_font.h"
+
+namespace Scumm {
 
 SmushFont::SmushFont(bool use_original_colors, bool new_colors) :
 	NutRenderer(g_scumm),	// FIXME: evil hack
@@ -317,3 +319,5 @@
 	
 	free(s);
 }
+
+} // End of namespace Scumm

Index: smush_font.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/smush/smush_font.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- smush_font.h	9 Jun 2003 12:24:04 -0000	1.8
+++ smush_font.h	3 Oct 2003 18:33:57 -0000	1.9
@@ -25,6 +25,8 @@
 #include "common/scummsys.h"
 #include "scumm/nut_renderer.h"
 
+namespace Scumm {
+
 class SmushFont : public NutRenderer {
 protected:
 	int _nbChars;
@@ -48,5 +50,7 @@
 	void drawStringWrap        (const char *str, byte *buffer, int dst_width, int dst_height, int x, int y, int left, int right);
 	void drawStringWrapCentered(const char *str, byte *buffer, int dst_width, int dst_height, int x, int y, int left, int right);
 };
+
+} // End of namespace Scumm
 
 #endif

Index: smush_mixer.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/smush/smush_mixer.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- smush_mixer.cpp	6 Sep 2003 10:47:29 -0000	1.19
+++ smush_mixer.cpp	3 Oct 2003 18:33:57 -0000	1.20
@@ -21,13 +21,18 @@
 
 #include "stdafx.h"
 #include "common/util.h"
-#include "smush_mixer.h"
-#include "channel.h"
-#include "sound/mixer.h"
+
+#include "scumm/smush/smush_mixer.h"
+#include "scumm/smush/channel.h"
 #include "scumm/scumm.h"
 #include "scumm/sound.h"
 #include "scumm/imuse.h"
 
+#include "sound/mixer.h"
+
+
+namespace Scumm {
+
 SmushMixer::SmushMixer(SoundMixer *m) :
 	_mixer(m),
 	_nextIndex(0),
@@ -158,3 +163,5 @@
 	}
 	return true;
 }
+
+} // End of namespace Scumm

Index: smush_mixer.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/smush/smush_mixer.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- smush_mixer.h	1 Sep 2003 13:43:22 -0000	1.4
+++ smush_mixer.h	3 Oct 2003 18:33:57 -0000	1.5
@@ -19,10 +19,14 @@
  *
  */
 
-#include "stdafx.h"
+#ifndef SMUSH_MIXER_H
+#define SMUSH_MIXER_H
 
+#include "stdafx.h"
 #include "sound/mixer.h"
 
+namespace Scumm {
+
 class SmushChannel;
 
 class SmushMixer {
@@ -49,3 +53,7 @@
 	bool update();
 	bool _silentMixer;
 };
+
+} // End of namespace Scumm
+
+#endif

Index: smush_player.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/smush/smush_player.cpp,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -d -r1.54 -r1.55
--- smush_player.cpp	2 Oct 2003 22:42:03 -0000	1.54
+++ smush_player.cpp	3 Oct 2003 18:33:57 -0000	1.55
@@ -20,28 +20,33 @@
  */
 
 #include "stdafx.h"
-#include "scumm/scumm.h"
-#include "scumm/bomp.h"
-#include "scumm/sound.h"
-#include "scumm/imuse.h"
-#include "scumm/imuse_digi.h"
-#include "sound/mixer.h"
-#include "smush_player.h"
-#include "smush_mixer.h"
-#include "smush_font.h"
-#include "channel.h"
-#include "chunk.h"
-#include "chunk_type.h"
 
 #include "base/engine.h"
+
 #include "common/file.h"
 #include "common/util.h"
 #include "common/timer.h"
 
+#include "scumm/bomp.h"
+#include "scumm/imuse_digi.h"
+#include "scumm/imuse.h"
+#include "scumm/scumm.h"
+#include "scumm/sound.h"
+#include "scumm/smush/channel.h"
+#include "scumm/smush/chunk_type.h"
+#include "scumm/smush/chunk.h"
+#include "scumm/smush/smush_font.h"
+#include "scumm/smush/smush_mixer.h"
+#include "scumm/smush/smush_player.h"
+
+#include "sound/mixer.h"
+
 #ifdef DUMP_SMUSH_FRAMES
 #include <png.h>
 #endif
 
+namespace Scumm {
+
 const int MAX_STRINGS = 200;
 
 class StringResource {
@@ -982,3 +987,5 @@
 	// Reset mouse state
 	_scumm->_system->show_mouse(oldMouseState);
 }
+
+} // End of namespace Scumm

Index: smush_player.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/smush/smush_player.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- smush_player.h	2 Oct 2003 22:42:03 -0000	1.11
+++ smush_player.h	3 Oct 2003 18:33:57 -0000	1.12
@@ -28,6 +28,8 @@
 #include "scumm/smush/codec47.h"
 #include "sound/mixer.h"
 
+namespace Scumm {
+
 class SmushFont;
 class SmushMixer;
 class StringResource;
@@ -101,5 +103,7 @@
 	
 	static void timerCallback(void *ptr);
 };
+
+} // End of namespace Scumm
 
 #endif