[Scummvm-cvs-logs] CVS: scummvm/scumm imuse_digi.cpp,1.93,1.94 sound.cpp,1.300,1.301

[Max Horn]

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

Modified Files:
	imuse_digi.cpp sound.cpp 
Log Message:
renamed VOC functions

Index: imuse_digi.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse_digi.cpp,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -d -r1.93 -r1.94
--- imuse_digi.cpp	26 Dec 2003 22:55:48 -0000	1.93
+++ imuse_digi.cpp	27 Dec 2003 14:10:45 -0000	1.94
@@ -836,7 +836,7 @@
 				_voiceVocData = NULL;
 			} else if (READ_UINT32(ptr) == MKID('Crea')) {
 				int32 loops = 0;
-				byte *t_ptr= readCreativeVoc(ptr, size, _channel[l].freq, loops);
+				byte *t_ptr= readVOCFromMemory(ptr, size, _channel[l].freq, loops);
 				_channel[l].mixerSize = _channel[l].freq * 2;
 				_channel[l].size = size * 2;
 				_channel[l].bits = 8;

Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sound.cpp,v
retrieving revision 1.300
retrieving revision 1.301
diff -u -d -r1.300 -r1.301
--- sound.cpp	26 Dec 2003 23:11:35 -0000	1.300
+++ sound.cpp	27 Dec 2003 14:10:45 -0000	1.301
@@ -812,7 +812,7 @@
 
 	int32 size;
 	int rate;
-	byte *data = loadVocSample(_sfxFile, size, rate);
+	byte *data = loadVOCFile(_sfxFile, size, rate);
 
 	if (_scumm->_imuseDigital) {
 		_scumm->_imuseDigital->setVocVoice(data, size, rate);