[Scummvm-cvs-logs] CVS: scummvm/scumm/imuse_digi dimuse.h,1.76,1.77 dimuse_bndmgr.h,1.19,1.20 dimuse_codecs.cpp,1.13,1.14 dimuse_sndmgr.cpp,1.76,1.77

[Chris Apers]

Update of /cvsroot/scummvm/scummvm/scumm/imuse_digi
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24000/imuse_digi

Modified Files:
	dimuse.h dimuse_bndmgr.h dimuse_codecs.cpp dimuse_sndmgr.cpp 
Log Message:
Change __PALM_OS__ with new PALMOS_68K / PALMOS_MODE

Index: dimuse.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse_digi/dimuse.h,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -d -r1.76 -r1.77
--- dimuse.h	14 May 2005 23:28:21 -0000	1.76
+++ dimuse.h	8 Oct 2005 21:25:09 -0000	1.77
@@ -213,7 +213,7 @@
 	byte volume;
 };
 
-#ifdef __PALM_OS__
+#ifdef PALMOS_68K
 extern const imuseRoomMap *_digStateMusicMap;
 extern const imuseDigTable *_digStateMusicTable;
 extern const imuseDigTable *_digSeqMusicTable;

Index: dimuse_bndmgr.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse_digi/dimuse_bndmgr.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- dimuse_bndmgr.h	2 Sep 2005 01:41:52 -0000	1.19
+++ dimuse_bndmgr.h	8 Oct 2005 21:25:09 -0000	1.20
@@ -95,7 +95,7 @@
 
 uint32 decode12BitsSample(const byte *src, byte **dst, uint32 size);
 void initializeImcTables();
-#ifdef __PALM_OS__
+#ifdef PALMOS_68K
 void releaseImcTables();
 #endif
 int32 decompressCodec(int32 codec, byte *comp_input, byte *comp_output, int32 input_size);

Index: dimuse_codecs.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse_digi/dimuse_codecs.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- dimuse_codecs.cpp	30 Jul 2005 21:11:32 -0000	1.13
+++ dimuse_codecs.cpp	8 Oct 2005 21:25:09 -0000	1.14
@@ -54,7 +54,7 @@
  * varies the size of each "packet" between 2 and 7 bits.
  */
 
-#ifdef __PALM_OS__
+#ifdef PALMOS_68K
 static byte *_destImcTable = NULL;		// save 23k of memory !
 static uint32 *_destImcTable2 = NULL;
 
@@ -113,7 +113,7 @@
 	}
 };
 
-#ifdef __PALM_OS__
+#ifdef PALMOS_68K
 void releaseImcTables() {
 	free(_destImcTable);
 	free(_destImcTable2);
@@ -123,7 +123,7 @@
 void initializeImcTables() {
 	int pos;
 
-#ifdef __PALM_OS__
+#ifdef PALMOS_68K
 	if (!_destImcTable) _destImcTable = (byte *)calloc(89, sizeof(byte));
 	if (!_destImcTable2) _destImcTable2 = (uint32 *)calloc(89 * 64, sizeof(uint32));
 #endif
@@ -670,7 +670,7 @@
 
 } // End of namespace Scumm
 
-#ifdef __PALM_OS__
+#ifdef PALMOS_68K
 #include "scumm_globals.h"
 
 _GINIT(DimuseCodecs)

Index: dimuse_sndmgr.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse_digi/dimuse_sndmgr.cpp,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -d -r1.76 -r1.77
--- dimuse_sndmgr.cpp	2 Sep 2005 01:41:53 -0000	1.76
+++ dimuse_sndmgr.cpp	8 Oct 2005 21:25:09 -0000	1.77
@@ -48,7 +48,7 @@
 	for (int l = 0; l < MAX_IMUSE_SOUNDS; l++) {
 		closeSound(&_sounds[l]);
 	}
-#ifdef __PALM_OS__
+#ifdef PALMOS_68K
 	BundleCodecs::releaseImcTables();
 #endif
 }