[Scummvm-cvs-logs] CVS: scummvm/scumm/imuse_digi dimuse.cpp,1.125,1.126 dimuse.h,1.72,1.73 dimuse_music.cpp,1.36,1.37

[Max Horn]

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

Modified Files:
	dimuse.cpp dimuse.h dimuse_music.cpp 
Log Message:
Renamed _mouseButStat -> _mouseAndKeyboardStat (that's what it really is); moved _audioNames to class IMuseDigital

Index: dimuse.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse_digi/dimuse.cpp,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -d -r1.125 -r1.126
--- dimuse.cpp	8 Apr 2005 20:51:23 -0000	1.125
+++ dimuse.cpp	20 Apr 2005 23:33:34 -0000	1.126
@@ -54,6 +54,9 @@
 		_track[l]->used = false;
 	}
 	_vm->_timer->installTimerProc(timer_handler, 1000000 / _callbackFps, this);
+
+	_audioNames = NULL;
+	_numAudioNames = 0;
 }
 
 IMuseDigital::~IMuseDigital() {
@@ -63,6 +66,7 @@
 		delete _track[l];
 	}
 	delete _sound;
+	free(_audioNames);
 }
 
 void IMuseDigital::resetState() {

Index: dimuse.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse_digi/dimuse.h,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -d -r1.72 -r1.73
--- dimuse.h	12 Mar 2005 18:55:44 -0000	1.72
+++ dimuse.h	20 Apr 2005 23:33:35 -0000	1.73
@@ -90,6 +90,9 @@
 	ScummEngine *_vm;
 	ImuseDigiSndMgr *_sound;
 
+	char *_audioNames;
+	int32 _numAudioNames;
+
 	bool _pause;
 
 	int32 _attributes[188];
@@ -129,6 +132,8 @@
 	IMuseDigital(ScummEngine *scumm, int fps);
 	virtual ~IMuseDigital();
 
+	void setAudioNames(int32 num, char *names);
+
 	void startVoice(int soundId, AudioStream *input);
 	void startVoice(int soundId, const char *soundName);
 	void startMusic(int soundId, int volume);

Index: dimuse_music.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse_digi/dimuse_music.cpp,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- dimuse_music.cpp	3 Apr 2005 17:11:06 -0000	1.36
+++ dimuse_music.cpp	20 Apr 2005 23:33:35 -0000	1.37
@@ -394,10 +394,16 @@
 	_curMusicCue = cueId;
 }
 
+void IMuseDigital::setAudioNames(int32 num, char *names) {
+	free(_audioNames);
+	_numAudioNames = num;
+	_audioNames = names;
+}
+
 int IMuseDigital::getSoundIdByName(const char *soundName) {
 	if (soundName && soundName[0] != 0) {
-		for (int r = 0; r < _vm->_numAudioNames; r++) {
-			if (strcmp(soundName, &_vm->_audioNames[r * 9]) == 0) {
+		for (int r = 0; r < _numAudioNames; r++) {
+			if (strcmp(soundName, &_audioNames[r * 9]) == 0) {
 				return r;
 			}
 		}