[Scummvm-cvs-logs] CVS: scummvm/scumm player_mod.cpp,2.1,2.2 player_mod.h,2.1,2.2 player_v2a.cpp,2.1,2.2

[Oliver Kiehl]

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

Modified Files:
	player_mod.cpp player_mod.h player_v2a.cpp 
Log Message:
fix gcc compile


Index: player_mod.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/player_mod.cpp,v
retrieving revision 2.1
retrieving revision 2.2
diff -u -d -r2.1 -r2.2
--- player_mod.cpp	24 Sep 2003 06:56:30 -0000	2.1
+++ player_mod.cpp	24 Sep 2003 12:57:37 -0000	2.2
@@ -93,9 +93,9 @@
 	_channels[i].id = id;
 	_channels[i].vol = vol;
 	_channels[i].pan = pan;
-	_channels[i].ptr = (byte *)data;
+	_channels[i].ptr = (const byte*)data;
 	_channels[i].freq = rate;
-	_channels[i].input = makeLinearInputStream(SoundMixer::FLAG_AUTOFREE | (loopStart != loopEnd ? SoundMixer::FLAG_LOOP : 0), (byte *)data, size, loopStart, loopEnd - loopStart);
+	_channels[i].input = makeLinearInputStream(SoundMixer::FLAG_AUTOFREE | (loopStart != loopEnd ? SoundMixer::FLAG_LOOP : 0), (const byte*)data, size, loopStart, loopEnd - loopStart);
 	_channels[i].converter = makeRateConverter(rate, _mixer->getOutputRate(), false, false);
 }
 

Index: player_mod.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/player_mod.h,v
retrieving revision 2.1
retrieving revision 2.2
diff -u -d -r2.1 -r2.2
--- player_mod.h	24 Sep 2003 06:56:30 -0000	2.1
+++ player_mod.h	24 Sep 2003 12:57:37 -0000	2.2
@@ -60,7 +60,7 @@
 		uint8 vol;
 		int8 pan;
 		uint16 freq;
-		byte *ptr;
+		const byte *ptr;
 		RateConverter *converter;
 		AudioInputStream *input;
 	} _channels[MOD_MAXCHANS];

Index: player_v2a.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/player_v2a.cpp,v
retrieving revision 2.1
retrieving revision 2.2
diff -u -d -r2.1 -r2.2
--- player_v2a.cpp	24 Sep 2003 06:56:30 -0000	2.1
+++ player_v2a.cpp	24 Sep 2003 12:57:37 -0000	2.2
@@ -744,7 +744,7 @@
 
 class V2A_Sound_Special_SingleDurationMultiDurations : public V2A_Sound {
 public:
-	V2A_Sound_Special_SingleDurationMultiDurations(uint16 offset, uint16 size, uint16 freq, uint8 vol, uint8 numdurs, uint8 *durations) :
+	V2A_Sound_Special_SingleDurationMultiDurations(uint16 offset, uint16 size, uint16 freq, uint8 vol, uint8 numdurs, const uint8 *durations) :
 		_offset(offset), _size(size), _freq(freq), _vol(vol), _numdurs(numdurs), _durations(durations) { }
 	virtual void start(Player_MOD *mod, int id, const byte *data) {
 		_mod = mod;
@@ -1118,7 +1118,7 @@
 	{0xE1A91583,new V2A_Sound_Special_MultiLoopedDurationMulti(0x00D0,0x0040,0x007C,0x3F,0x007B,0x3F,0x3C,5,6)},	// Maniac 23
 	{0x64816ED5,new V2A_Sound_Special_MultiLoopedDurationMulti(0x00D0,0x0040,0x00BE,0x37,0x00BD,0x37,0x3C,5,6)},	// Maniac 24
 	{0x639D72C2,new V2A_Sound_Special_SingleDurationMulti(0x00D0,0x10A4,0x0080,0x3F,0x28,3)},	// Maniac 46
-	{0xE8826D92,new V2A_Sound_Special_SingleDurationMultiDurations(0x00EC,0x025A,0x023C,0x3F,8,(uint8 *)"\x20\x41\x04\x21\x08\x10\x13\x07")},	// Maniac 45
+	{0xE8826D92,new V2A_Sound_Special_SingleDurationMultiDurations(0x00EC,0x025A,0x023C,0x3F,8,(const uint8 *)"\x20\x41\x04\x21\x08\x10\x13\x07")},	// Maniac 45
 	{0xEDFF3D41,new V2A_Sound_Single(0x00F8,0x2ADE,0x01F8,0x3F)},	// Maniac 42 (this should echo, but it's barely noticeable and I don't feel like doing it)
 	{0x15606D06,new V2A_Sound_Special_QuadSiren(0x0148,0x0020,0x0168,0x0020,0x3F)},	// Maniac 32
 	{0x753EAFE3,new V2A_Sound_Special_TwinSirenMulti(0x017C,0x0010,0x018C,0x0020,0x00C8,0x0080,0x3F)},	// Maniac 44