[Scummvm-cvs-logs] CVS: scummvm/scumm/imuse_digi dimuse.cpp,1.5,1.6 dimuse.h,1.5,1.6
Pawel Kolodziejski
aquadran at users.sourceforge.net
Tue Jan 6 22:52:04 CET 2004
Update of /cvsroot/scummvm/scummvm/scumm/imuse_digi
In directory sc8-pr-cvs1:/tmp/cvs-serv11670/imuse_digi
Modified Files:
dimuse.cpp dimuse.h
Log Message:
changed lipsync func param
Index: dimuse.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse_digi/dimuse.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- dimuse.cpp 7 Jan 2004 06:08:33 -0000 1.5
+++ dimuse.cpp 7 Jan 2004 06:51:45 -0000 1.6
@@ -181,6 +181,8 @@
break;
}
mixer_size -= result;
+// if (mixer_size < 0)
+// mixer_size = 0;
assert(mixer_size >= 0);
} while (mixer_size != 0);
}
@@ -570,7 +572,6 @@
}
int32 IMuseDigital::getPosInMs(int soundId) {
- debug(5, "IMuseDigital::getPosInMs(%d)", soundId);
for (int l = 0; l < MAX_DIGITAL_TRACKS; l++) {
if ((_track[l].idSound == soundId) && _track[l].used) {
int32 pos = 1000 * _track[l].trackOffset / _track[l].iteration;
@@ -582,6 +583,7 @@
}
int32 IMuseDigital::getCurMusicPosInMs() {
+ debug(5, "IMuseDigital::getCurMusicPosInMs(%d)", _curMusicId);
return getPosInMs(_curMusicId);
}
@@ -595,12 +597,12 @@
return _scumm->_rnd.getRandomNumber(255);
}
-int32 IMuseDigital::getCurMusicLipSyncWidth() {
+int32 IMuseDigital::getCurMusicLipSyncWidth(int32 param) {
// int32 pos = getPosInMs(_curMusicId);
return _scumm->_rnd.getRandomNumber(255);
}
-int32 IMuseDigital::getCurMusicLipSyncHeight() {
+int32 IMuseDigital::getCurMusicLipSyncHeight(int32 param) {
// int32 pos = getPosInMs(_curMusicId);
return _scumm->_rnd.getRandomNumber(255);
}
Index: dimuse.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse_digi/dimuse.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- dimuse.h 7 Jan 2004 05:58:12 -0000 1.5
+++ dimuse.h 7 Jan 2004 06:51:45 -0000 1.6
@@ -109,8 +109,8 @@
int32 getCurMusicPosInMs();
int32 getCurVoiceLipSyncWidth();
int32 getCurVoiceLipSyncHeight();
- int32 getCurMusicLipSyncWidth();
- int32 getCurMusicLipSyncHeight();
+ int32 getCurMusicLipSyncWidth(int32 param);
+ int32 getCurMusicLipSyncHeight(int32 param);
void closeBundleFiles();
};
More information about the Scummvm-git-logs
mailing list