[Scummvm-cvs-logs] CVS: scummvm/scumm script_v8.cpp,2.203,2.204 sound.cpp,1.270,1.271 sound.h,1.53,1.54
Pawel Kolodziejski
aquadran at users.sourceforge.net
Tue Nov 11 23:07:03 CET 2003
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/dists/msvc7 queen.vcproj,1.9,1.10 scumm.vcproj,1.2,1.3 scummvm.vcproj,1.9,1.10 simon.vcproj,1.2,1.3 sky.vcproj,1.2,1.3 sword2.vcproj,1.2,1.3
- Next message: [Scummvm-cvs-logs] CVS: scummvm/sword2/driver driver96.h,1.59,1.60
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv8023
Modified Files:
script_v8.cpp sound.cpp sound.h
Log Message:
changed getting position of bundle song to ms
Index: script_v8.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v8.cpp,v
retrieving revision 2.203
retrieving revision 2.204
diff -u -d -r2.203 -r2.204
--- script_v8.cpp 11 Nov 2003 00:40:35 -0000 2.203
+++ script_v8.cpp 12 Nov 2003 07:05:52 -0000 2.204
@@ -1497,7 +1497,7 @@
case 0xE1: // imGetMusicPosition
warning("o8_kernelGetFunctions: imGetMusicPosition(stub)");
// FIXME - get this stuff to be properly implemented
- push(_sound->_bundleMusicPosition);
+ push(_sound->_bundleSongPosInMs);
break;
case 0xE2: // musicLipSyncWidth
case 0xE3: // musicLipSyncHeight
Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sound.cpp,v
retrieving revision 1.270
retrieving revision 1.271
diff -u -d -r1.270 -r1.271
--- sound.cpp 11 Nov 2003 00:40:35 -0000 1.270
+++ sound.cpp 12 Nov 2003 07:05:52 -0000 1.271
@@ -1039,6 +1039,7 @@
_offsetSampleBundleMusic = 0;
_offsetBufBundleMusic = 0;
_bundleMusicPosition = 0;
+ _bundleSongPosInMs = 0;
_pauseBundleMusic = false;
_musicBundleToBeChanged = false;
_bundleMusicTrack = 0;
@@ -1087,6 +1088,7 @@
_offsetBufBundleMusic = 0;
_musicBundleToBeChanged = false;
_bundleMusicPosition = 0;
+ _bundleSongPosInMs = 0;
}
ptr = _musicBundleBufOutput;
@@ -1153,6 +1155,7 @@
_offsetSampleBundleMusic = 0;
_offsetBufBundleMusic = 0;
_bundleMusicPosition = 0;
+ _bundleSongPosInMs = 0;
}
ptr = _musicBundleBufFinal;
@@ -1170,6 +1173,7 @@
return;
}
+ _bundleSongPosInMs = (_bundleMusicPosition * 5) / (_outputMixerSize / 200);
_bundleMusicPosition += final_size;
if (_bundleMusicTrack == 0) {
_scumm->_mixer->newStream(&_bundleMusicTrack, buffer, final_size, rate,
Index: sound.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sound.h,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -d -r1.53 -r1.54
--- sound.h 11 Nov 2003 00:40:35 -0000 1.53
+++ sound.h 12 Nov 2003 07:05:52 -0000 1.54
@@ -42,6 +42,7 @@
public:
const char *_nameBundleMusic;
int32 _bundleMusicPosition;
+ int32 _bundleSongPosInMs;
protected:
const char *_newNameBundleMusic;
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/dists/msvc7 queen.vcproj,1.9,1.10 scumm.vcproj,1.2,1.3 scummvm.vcproj,1.9,1.10 simon.vcproj,1.2,1.3 sky.vcproj,1.2,1.3 sword2.vcproj,1.2,1.3
- Next message: [Scummvm-cvs-logs] CVS: scummvm/sword2/driver driver96.h,1.59,1.60
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list