[Scummvm-cvs-logs] CVS: scummvm/scumm script_v8.cpp,2.132,2.133 sound.cpp,1.79,1.80 sound.h,1.25,1.26

Pawel Kolodziejski aquadran at users.sourceforge.net
Sun Jan 26 06:27:06 CET 2003


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

Modified Files:
	script_v8.cpp sound.cpp sound.h 
Log Message:
added "implementation" of imGetMusicPosition

Index: script_v8.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v8.cpp,v
retrieving revision 2.132
retrieving revision 2.133
diff -u -d -r2.132 -r2.133
--- script_v8.cpp	26 Jan 2003 11:13:46 -0000	2.132
+++ script_v8.cpp	26 Jan 2003 14:26:02 -0000	2.133
@@ -1661,7 +1661,8 @@
 		break;
 	case 0xE1:		// imGetMusicPosition
 		warning("o8_kernelGetFunctions: imGetMusicPosition(stub)\n");
-		push(0xFFFFF);
+		// FIXME - get this stuff to be properly implemented
+		push(_sound->_bundleMusicPosition);
 		break;
 	case 0xE2:		// musicLipSyncWidth
 	case 0xE3:		// musicLipSyncHeight

Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sound.cpp,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -d -r1.79 -r1.80
--- sound.cpp	26 Jan 2003 10:54:34 -0000	1.79
+++ sound.cpp	26 Jan 2003 14:26:02 -0000	1.80
@@ -987,6 +987,7 @@
 		_currentSampleBundleMusic = 0;
 		_offsetSampleBundleMusic = 0;
 		_offsetBufBundleMusic = 0;
+		_bundleMusicPosition = 0;
 		_pauseBundleMusic = false;
 		_musicBundleToBeRemoved = false;
 		_musicBundleToBeChanged = false;
@@ -1045,6 +1046,7 @@
 		_offsetSampleBundleMusic = 0;
 		_offsetBufBundleMusic = 0;
 		_musicBundleToBeChanged = false;
+		_bundleMusicPosition = 0;
 	}
 
 	ptr = _musicBundleBufOutput;
@@ -1110,6 +1112,7 @@
 		_currentSampleBundleMusic = 0;
 		_offsetSampleBundleMusic = 0;
 		_offsetBufBundleMusic = 0;
+		_bundleMusicPosition = 0;
 	}
 
 	ptr = _musicBundleBufFinal;
@@ -1127,6 +1130,7 @@
 		return;
 	}
 
+	_bundleMusicPosition += final_size;
 	if (_bundleMusicTrack == -1) {
 		_bundleMusicTrack = _scumm->_mixer->playStream(NULL, _scumm->_mixer->_beginSlots - 1, buffer, final_size, rate,
 															SoundMixer::FLAG_AUTOFREE | SoundMixer::FLAG_16BITS | SoundMixer::FLAG_STEREO, -1, 2000000);

Index: sound.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sound.h,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- sound.h	20 Jan 2003 05:59:25 -0000	1.25
+++ sound.h	26 Jan 2003 14:26:03 -0000	1.26
@@ -130,6 +130,7 @@
 public:
 
 	int _current_cache;
+	int32 _bundleMusicPosition;
 
 	int _talkChannel;	/* Mixer channel actor is talking on */
 	int _cd_timer_value;





More information about the Scummvm-git-logs mailing list