[Scummvm-cvs-logs] CVS: scummvm/scumm/imuse_digi dimuse.cpp,1.81,1.82 dimuse.h,1.50,1.51

[Pawel Kolodziejski]

Update of /cvsroot/scummvm/scummvm/scumm/imuse_digi
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21231

Modified Files:
	dimuse.cpp dimuse.h 
Log Message:
added some save/load code (in progress)

Index: dimuse.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse_digi/dimuse.cpp,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -d -r1.81 -r1.82
--- dimuse.cpp	2 May 2004 10:07:59 -0000	1.81
+++ dimuse.cpp	2 May 2004 11:49:08 -0000	1.82
@@ -77,6 +77,55 @@
 }
 
 void IMuseDigital::saveOrLoad(Serializer *ser) {
+	Common::StackLock lock(_mutex, "IMuseDigital::saveOrLoad()");
+	
+	// save-load disabled
+	return;
+
+	const SaveLoadEntry mainEntries[] = {
+		MKLINE(IMuseDigital, _volVoice, sleInt32, VER(31)),
+		MKLINE(IMuseDigital, _volSfx, sleInt32, VER(31)),
+		MKLINE(IMuseDigital, _volMusic, sleInt32, VER(31)),
+		MKLINE(IMuseDigital, _curMusicState, sleInt32, VER(31)),
+		MKLINE(IMuseDigital, _curMusicSeq, sleInt32, VER(31)),
+		MKLINE(IMuseDigital, _curMusicCue, sleInt32, VER(31)),
+		MKLINE(IMuseDigital, _nextSeqToPlay, sleInt32, VER(31)),
+		MKARRAY(IMuseDigital, _attributes, sleInt32, 188, VER(8)),
+		MKEND()
+	};
+
+	const SaveLoadEntry trackEntries[] = {
+		MKLINE(Track, pan, sleInt8, VER(31)),
+		MKLINE(Track, vol, sleInt32, VER(31)),
+		MKLINE(Track, volFadeDest, sleInt32, VER(31)),
+		MKLINE(Track, volFadeStep, sleInt32, VER(31)),
+		MKLINE(Track, volFadeDelay, sleInt32, VER(31)),
+		MKLINE(Track, volFadeUsed, sleByte, VER(31)),
+		MKLINE(Track, soundId, sleInt32, VER(31)),
+		MKLINE(Track, used, sleByte, VER(31)),
+		MKLINE(Track, toBeRemoved, sleByte, VER(31)),
+		MKLINE(Track, started, sleByte, VER(31)),
+		MKLINE(Track, priority, sleInt32, VER(31)),
+		MKLINE(Track, regionOffset, sleInt32, VER(31)),
+		MKLINE(Track, trackOffset, sleInt32, VER(31)),
+		MKLINE(Track, dataOffset, sleInt32, VER(31)),
+		MKLINE(Track, curRegion, sleInt32, VER(31)),
+		MKLINE(Track, curHookId, sleInt32, VER(31)),
+		MKLINE(Track, volGroupId, sleInt32, VER(31)),
+		MKLINE(Track, iteration, sleInt32, VER(31)),
+		MKLINE(Track, mod, sleInt32, VER(31)),
+		MKLINE(Track, mixerFlags, sleInt32, VER(31)),
+		MKLINE(Track, mixerVol, sleInt32, VER(31)),
+		MKLINE(Track, mixerPan, sleInt32, VER(31)),
+		MKEND()
+	};
+
+	int i;
+
+	ser->_ref_me = this;
+	ser->saveLoadEntries(this, mainEntries);
+	for (i = 0; i < MAX_DIGITAL_TRACKS + MAX_DIGITAL_FADETRACKS; i++)
+		ser->saveLoadEntries(_track[i], trackEntries);
 }
 
 void IMuseDigital::callback() {

Index: dimuse.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse_digi/dimuse.h,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -d -r1.50 -r1.51
--- dimuse.h	2 May 2004 10:07:59 -0000	1.50
+++ dimuse.h	2 May 2004 11:49:08 -0000	1.51
@@ -27,6 +27,7 @@
 #include "scumm/imuse_digi/dimuse_bndmgr.h"
 #include "scumm/imuse_digi/dimuse_sndmgr.h"
 #include "scumm/music.h"
+#include "scumm/saveload.h"
 
 #include "sound/mixer.h"
 #include "sound/audiostream.h"