[Scummvm-cvs-logs] CVS: scummvm/bs2/driver d_sound.cpp,1.72,1.73
Max Horn
fingolfin at users.sourceforge.net
Sat Oct 4 04:51:02 CEST 2003
Update of /cvsroot/scummvm/scummvm/bs2/driver
In directory sc8-pr-cvs1:/tmp/cvs-serv25712/bs2/driver
Modified Files:
d_sound.cpp
Log Message:
use namespace Common a bit more; don't zero the RNG in scumm (else the seed gets reset); remove obsolete 256 color blending code
Index: d_sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/driver/d_sound.cpp,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -d -r1.72 -r1.73
--- d_sound.cpp 4 Oct 2003 08:07:03 -0000 1.72
+++ d_sound.cpp 4 Oct 2003 11:50:21 -0000 1.73
@@ -180,7 +180,7 @@
// after the credits.
void Sound::saveMusicState() {
- StackLock lock(_mutex);
+ Common::StackLock lock(_mutex);
int saveStream;
@@ -203,7 +203,7 @@
}
void Sound::restoreMusicState() {
- StackLock lock(_mutex);
+ Common::StackLock lock(_mutex);
int restoreStream;
@@ -272,7 +272,7 @@
}
void Sound::fxServer(int16 *data, uint len) {
- StackLock lock(_mutex);
+ Common::StackLock lock(_mutex);
if (!_soundOn)
return;
@@ -899,7 +899,7 @@
*/
int32 Sound::streamCompMusic(const char *filename, uint32 musicId, bool looping) {
- StackLock lock(_mutex);
+ Common::StackLock lock(_mutex);
uint32 len;
int32 primaryStream = -1;
@@ -1062,7 +1062,7 @@
*/
int32 Sound::musicTimeRemaining() {
- StackLock lock(_mutex);
+ Common::StackLock lock(_mutex);
for (int i = 0; i < MAXMUS; i++) {
if (_music[i]._streaming && !_music[i]._fading)
@@ -1077,7 +1077,7 @@
*/
void Sound::stopMusic(void) {
- StackLock lock(_mutex);
+ Common::StackLock lock(_mutex);
for (int i = 0; i < MAXMUS; i++) {
if (_music[i]._streaming)
@@ -1092,7 +1092,7 @@
*/
void Sound::pauseMusic(void) {
- StackLock lock(_mutex);
+ Common::StackLock lock(_mutex);
if (_soundOn) {
for (int i = 0; i < MAXMUS; i++) {
@@ -1110,7 +1110,7 @@
*/
void Sound::unpauseMusic(void) {
- StackLock lock(_mutex);
+ Common::StackLock lock(_mutex);
if (_soundOn) {
for (int i = 0; i < MAXMUS; i++)
More information about the Scummvm-git-logs
mailing list