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

Jamieson Christian jamieson630 at users.sourceforge.net
Wed Sep 24 17:03:25 CEST 2003


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

Modified Files:
	player_mod.h player_mod.cpp 
Log Message:
Can't delete a const pointer, duh

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

Index: player_mod.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/player_mod.cpp,v
retrieving revision 2.2
retrieving revision 2.3
diff -u -d -r2.2 -r2.3
--- player_mod.cpp	24 Sep 2003 12:57:37 -0000	2.2
+++ player_mod.cpp	25 Sep 2003 00:02:56 -0000	2.3
@@ -93,7 +93,7 @@
 	_channels[i].id = id;
 	_channels[i].vol = vol;
 	_channels[i].pan = pan;
-	_channels[i].ptr = (const byte*)data;
+	_channels[i].ptr = (byte*) data;
 	_channels[i].freq = rate;
 	_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);





More information about the Scummvm-git-logs mailing list