[Scummvm-cvs-logs] SF.net SVN: scummvm: [22454] residual/trunk/imuse/imuse.cpp

[aquadran at users.sourceforge.net]

Revision: 22454
Author:   aquadran
Date:     2006-05-13 09:55:33 -0700 (Sat, 13 May 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm/?rev=22454&view=rev

Log Message:
-----------
forgot include in commit

Modified Paths:
--------------
    residual/trunk/imuse/imuse.cpp
Modified: residual/trunk/imuse/imuse.cpp
===================================================================
--- residual/trunk/imuse/imuse.cpp	2006-05-13 16:52:22 UTC (rev 22453)
+++ residual/trunk/imuse/imuse.cpp	2006-05-13 16:55:33 UTC (rev 22454)
@@ -92,38 +92,38 @@
 	printf("Imuse::restoreState() started.\n");
 
 	savedState->beginSection('IMUS');
-	savedState->readBlock(&_volVoice, sizeof(int32));
-	savedState->readBlock(&_volSfx, sizeof(int32));
-	savedState->readBlock(&_volMusic, sizeof(int32));
-	savedState->readBlock(&_curMusicState, sizeof(int32));
-	savedState->readBlock(&_curMusicSeq, sizeof(int32));
-	savedState->readBlock(_attributes, sizeof(int32) * 185);
+	savedState->read(&_volVoice, sizeof(int32));
+	savedState->read(&_volSfx, sizeof(int32));
+	savedState->read(&_volMusic, sizeof(int32));
+	savedState->read(&_curMusicState, sizeof(int32));
+	savedState->read(&_curMusicSeq, sizeof(int32));
+	savedState->read(_attributes, sizeof(int32) * 185);
 
 	for (int l = 0; l < MAX_IMUSE_TRACKS + MAX_IMUSE_FADETRACKS; l++) {
 		Track *track = _track[l];
-		savedState->readBlock(&track->pan, sizeof(int32));
-		savedState->readBlock(&track->panFadeDest, sizeof(int32));
-		savedState->readBlock(&track->panFadeDelay, sizeof(int32));
-		savedState->readBlock(&track->panFadeUsed, sizeof(bool));
-		savedState->readBlock(&track->vol, sizeof(int32));
-		savedState->readBlock(&track->volFadeDest, sizeof(int32));
-		savedState->readBlock(&track->volFadeDelay, sizeof(int32));
-		savedState->readBlock(&track->volFadeUsed, sizeof(bool));
-		savedState->readBlock(track->soundName, 32);
-		savedState->readBlock(&track->used, sizeof(bool));
-		savedState->readBlock(&track->toBeRemoved, sizeof(bool));
-		savedState->readBlock(&track->readyToRemove, sizeof(bool));
-		savedState->readBlock(&track->started, sizeof(bool));
-		savedState->readBlock(&track->priority, sizeof(int32));
-		savedState->readBlock(&track->regionOffset, sizeof(int32));
-		savedState->readBlock(&track->dataOffset, sizeof(int32));
-		savedState->readBlock(&track->curRegion, sizeof(int32));
-		savedState->readBlock(&track->curHookId, sizeof(int32));
-		savedState->readBlock(&track->volGroupId, sizeof(int32));
-		savedState->readBlock(&track->iteration, sizeof(int32));
-		savedState->readBlock(&track->mixerFlags, sizeof(int32));
-		savedState->readBlock(&track->mixerVol, sizeof(int32));
-		savedState->readBlock(&track->mixerPan, sizeof(int32));
+		savedState->read(&track->pan, sizeof(int32));
+		savedState->read(&track->panFadeDest, sizeof(int32));
+		savedState->read(&track->panFadeDelay, sizeof(int32));
+		savedState->read(&track->panFadeUsed, sizeof(bool));
+		savedState->read(&track->vol, sizeof(int32));
+		savedState->read(&track->volFadeDest, sizeof(int32));
+		savedState->read(&track->volFadeDelay, sizeof(int32));
+		savedState->read(&track->volFadeUsed, sizeof(bool));
+		savedState->read(track->soundName, 32);
+		savedState->read(&track->used, sizeof(bool));
+		savedState->read(&track->toBeRemoved, sizeof(bool));
+		savedState->read(&track->readyToRemove, sizeof(bool));
+		savedState->read(&track->started, sizeof(bool));
+		savedState->read(&track->priority, sizeof(int32));
+		savedState->read(&track->regionOffset, sizeof(int32));
+		savedState->read(&track->dataOffset, sizeof(int32));
+		savedState->read(&track->curRegion, sizeof(int32));
+		savedState->read(&track->curHookId, sizeof(int32));
+		savedState->read(&track->volGroupId, sizeof(int32));
+		savedState->read(&track->iteration, sizeof(int32));
+		savedState->read(&track->mixerFlags, sizeof(int32));
+		savedState->read(&track->mixerVol, sizeof(int32));
+		savedState->read(&track->mixerPan, sizeof(int32));
 
 		if (!track->used)
 			continue;
@@ -153,38 +153,38 @@
 	printf("Imuse::saveState() started.\n");
 
 	savedState->beginSection('IMUS');
-	savedState->writeBlock(&_volVoice, sizeof(int32));
-	savedState->writeBlock(&_volSfx, sizeof(int32));
-	savedState->writeBlock(&_volMusic, sizeof(int32));
-	savedState->writeBlock(&_curMusicState, sizeof(int32));
-	savedState->writeBlock(&_curMusicSeq, sizeof(int32));
-	savedState->writeBlock(_attributes, sizeof(int32) * 185);
+	savedState->write(&_volVoice, sizeof(int32));
+	savedState->write(&_volSfx, sizeof(int32));
+	savedState->write(&_volMusic, sizeof(int32));
+	savedState->write(&_curMusicState, sizeof(int32));
+	savedState->write(&_curMusicSeq, sizeof(int32));
+	savedState->write(_attributes, sizeof(int32) * 185);
 
 	for (int l = 0; l < MAX_IMUSE_TRACKS + MAX_IMUSE_FADETRACKS; l++) {
 		Track *track = _track[l];
-		savedState->writeBlock(&track->pan, sizeof(int32));
-		savedState->writeBlock(&track->panFadeDest, sizeof(int32));
-		savedState->writeBlock(&track->panFadeDelay, sizeof(int32));
-		savedState->writeBlock(&track->panFadeUsed, sizeof(bool));
-		savedState->writeBlock(&track->vol, sizeof(int32));
-		savedState->writeBlock(&track->volFadeDest, sizeof(int32));
-		savedState->writeBlock(&track->volFadeDelay, sizeof(int32));
-		savedState->writeBlock(&track->volFadeUsed, sizeof(bool));
-		savedState->writeBlock(track->soundName, 32);
-		savedState->writeBlock(&track->used, sizeof(bool));
-		savedState->writeBlock(&track->toBeRemoved, sizeof(bool));
-		savedState->writeBlock(&track->readyToRemove, sizeof(bool));
-		savedState->writeBlock(&track->started, sizeof(bool));
-		savedState->writeBlock(&track->priority, sizeof(int32));
-		savedState->writeBlock(&track->regionOffset, sizeof(int32));
-		savedState->writeBlock(&track->dataOffset, sizeof(int32));
-		savedState->writeBlock(&track->curRegion, sizeof(int32));
-		savedState->writeBlock(&track->curHookId, sizeof(int32));
-		savedState->writeBlock(&track->volGroupId, sizeof(int32));
-		savedState->writeBlock(&track->iteration, sizeof(int32));
-		savedState->writeBlock(&track->mixerFlags, sizeof(int32));
-		savedState->writeBlock(&track->mixerVol, sizeof(int32));
-		savedState->writeBlock(&track->mixerPan, sizeof(int32));
+		savedState->write(&track->pan, sizeof(int32));
+		savedState->write(&track->panFadeDest, sizeof(int32));
+		savedState->write(&track->panFadeDelay, sizeof(int32));
+		savedState->write(&track->panFadeUsed, sizeof(bool));
+		savedState->write(&track->vol, sizeof(int32));
+		savedState->write(&track->volFadeDest, sizeof(int32));
+		savedState->write(&track->volFadeDelay, sizeof(int32));
+		savedState->write(&track->volFadeUsed, sizeof(bool));
+		savedState->write(track->soundName, 32);
+		savedState->write(&track->used, sizeof(bool));
+		savedState->write(&track->toBeRemoved, sizeof(bool));
+		savedState->write(&track->readyToRemove, sizeof(bool));
+		savedState->write(&track->started, sizeof(bool));
+		savedState->write(&track->priority, sizeof(int32));
+		savedState->write(&track->regionOffset, sizeof(int32));
+		savedState->write(&track->dataOffset, sizeof(int32));
+		savedState->write(&track->curRegion, sizeof(int32));
+		savedState->write(&track->curHookId, sizeof(int32));
+		savedState->write(&track->volGroupId, sizeof(int32));
+		savedState->write(&track->iteration, sizeof(int32));
+		savedState->write(&track->mixerFlags, sizeof(int32));
+		savedState->write(&track->mixerVol, sizeof(int32));
+		savedState->write(&track->mixerPan, sizeof(int32));
 	}
 	savedState->endSection();
 	printf("Imuse::saveState() finished.\n");


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.