[Scummvm-cvs-logs] CVS: scummvm/scumm/imuse_digi dimuse.cpp,1.67,1.68 dimuse.h,1.42,1.43

[Pawel Kolodziejski]

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

Modified Files:
	dimuse.cpp dimuse.h 
Log Message:
pull not pool

Index: dimuse.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse_digi/dimuse.cpp,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -d -r1.67 -r1.68
--- dimuse.cpp	11 Apr 2004 18:56:32 -0000	1.67
+++ dimuse.cpp	11 Apr 2004 18:57:44 -0000	1.68
@@ -78,8 +78,8 @@
 	_nextSeqToPlay = 0;
 }
 
-void IMuseDigital::poolDataForMixer(int32 pullSize, byte *mixerBuffer, AudioStream *stream) {
-	Common::StackLock lock(_mutex, "IMuseDigital::poolDataForMixer()");
+void IMuseDigital::pullDataForMixer(int32 pullSize, byte *mixerBuffer, AudioStream *stream) {
+	Common::StackLock lock(_mutex, "IMuseDigital::pullDataForMixer()");
 	for (int l = 0; l < MAX_DIGITAL_TRACKS + MAX_DIGITAL_FADETRACKS; l++) {
 		if (_track[l]->stream == stream) {
 			int32 mixer_size = pullSize;

Index: dimuse.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse_digi/dimuse.h,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- dimuse.h	11 Apr 2004 18:56:32 -0000	1.42
+++ dimuse.h	11 Apr 2004 18:57:44 -0000	1.43
@@ -93,7 +93,7 @@
 	int _curMusicCue;
 
 	static void timer_handler(void *refConf);
-	void poolDataForMixer(int32 pullSize, byte *mixerBuffer, AudioStream *stream);
+	void pullDataForMixer(int32 pullSize, byte *mixerBuffer, AudioStream *stream);
 	void callback();
 	void switchToNextRegion(int track);
 	void allocSlot(int priority);