[Scummvm-cvs-logs] CVS: scummvm/sword2/driver d_sound.cpp,1.111,1.112 d_sound.h,1.45,1.46

[Torbjörn Andersson]

Update of /cvsroot/scummvm/scummvm/sword2/driver
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24037

Modified Files:
	d_sound.cpp d_sound.h 
Log Message:
Cleanup


Index: d_sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/driver/d_sound.cpp,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -d -r1.111 -r1.112
--- d_sound.cpp	1 May 2004 10:42:23 -0000	1.111
+++ d_sound.cpp	12 Jun 2004 09:53:45 -0000	1.112
@@ -49,7 +49,7 @@
 #define GetCompressedAmplitude(n)  ((n) & 7)
 
 static void premix_proc(void *param, int16 *data, uint len) {
-	((Sound *) param)->fxServer(data, len);
+	((Sound *) param)->streamMusic(data, len);
 }
 
 Sound::Sound(Sword2Engine *vm) {
@@ -86,13 +86,23 @@
 		_vm->_system->deleteMutex(_mutex);
 }
 
-void Sound::fxServer(int16 *data, uint len) {
+void Sound::streamMusic(int16 *data, uint len) {
 	Common::StackLock lock(_mutex);
 
 	if (!_soundOn)
 		return;
 
-	updateCompSampleStreaming(data, len);
+	for (int i = 0; i < MAXMUS; i++) {
+		if (!_music[i]._streaming || _music[i]._paused)
+			continue;
+
+		st_volume_t volume = _musicMuted ? 0 : _musicVolTable[_musicVol];
+
+		fpMus.seek(_music[i]._filePos, SEEK_SET);
+		_converter->flow(_music[i], data, len, volume, volume);
+	}
+
+	// DipMusic();
 
 	if (!_music[0]._streaming && !_music[1]._streaming && fpMus.isOpen())
 		fpMus.close();
@@ -516,20 +526,6 @@
 	return _music[primaryStream].play(filename, musicId, looping);
 }
 
-void Sound::updateCompSampleStreaming(int16 *data, uint len) {
-	for (int i = 0; i < MAXMUS; i++) {
-		if (!_music[i]._streaming || _music[i]._paused)
-			continue;
-
-		st_volume_t volume = _musicMuted ? 0 : _musicVolTable[_musicVol];
-
-		fpMus.seek(_music[i]._filePos, SEEK_SET);
-		_converter->flow(_music[i], data, len, volume, volume);
-	}
-
-	// DipMusic();
-}
-
 int32 Sound::dipMusic(void) {
 	// disable this func for now
 	return RD_OK;

Index: d_sound.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/driver/d_sound.h,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -d -r1.45 -r1.46
--- d_sound.h	1 May 2004 10:42:23 -0000	1.45
+++ d_sound.h	12 Jun 2004 09:53:45 -0000	1.46
@@ -92,7 +92,6 @@
 	bool _musicMuted;
 	uint8 _musicVol;
 
-	void updateCompSampleStreaming(int16 *data, uint len);
 	int32 dipMusic(void);
 
 	PlayingSoundHandle _soundHandleSpeech;
@@ -113,7 +112,7 @@
 	Sound(Sword2Engine *vm);
 	~Sound();
 
-	void fxServer(int16 *data, uint len);
+	void streamMusic(int16 *data, uint len);
 	void buildPanTable(bool reverse);
 
 	bool getWavInfo(uint8 *data, WavInfo *wavInfo);