[Scummvm-cvs-logs] CVS: scummvm/saga music.cpp,1.58,1.59 rscfile.cpp,1.24,1.25 sndres.cpp,1.45,1.46

[Torbjörn Andersson]

Update of /cvsroot/scummvm/scummvm/saga
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28069

Modified Files:
	music.cpp rscfile.cpp sndres.cpp 
Log Message:
Play the correct digital music. (And removed some unnecessary blank lines.)


Index: music.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/music.cpp,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -d -r1.58 -r1.59
--- music.cpp	19 Jul 2005 20:25:48 -0000	1.58
+++ music.cpp	19 Jul 2005 21:34:46 -0000	1.59
@@ -85,7 +85,6 @@
 	refill();
 }
 
-
 int RAWInputStream::readBuffer(int16 *buffer, const int numSamples) {
 	int samples = 0;
 	while (samples < numSamples && !eosIntern()) {
@@ -366,13 +365,10 @@
 	}
 
 	_trackNumber = resourceId;
-
 	_player->stopMusic();
-
 	_mixer->stopHandle(_musicHandle);
 
 	if (_vm->getGameType() == GType_ITE) {
-
 		if (resourceId >= 9 && resourceId <= 34) {
 			if (flags == MUSIC_DEFAULT) {
 				if ((resourceId == 13) || (resourceId == 19)) {
@@ -384,7 +380,7 @@
 
 			if (_musicContext != NULL) {
 				//TODO: check resource size
-				audioStream = new RAWInputStream(_vm, _musicContext, resourceId, flags == MUSIC_LOOP);
+				audioStream = new RAWInputStream(_vm, _musicContext, resourceId - 9, flags == MUSIC_LOOP);
 			}
 		}
 	}

Index: rscfile.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/rscfile.cpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- rscfile.cpp	19 Jul 2005 19:05:46 -0000	1.24
+++ rscfile.cpp	19 Jul 2005 21:34:46 -0000	1.25
@@ -59,8 +59,6 @@
 		context->isBigEndian = ((_vm->getFeatures() & GF_BIG_ENDIAN_VOICES) != 0) && ((context->fileType & GAME_VOICEFILE) != 0);
 	}
 
-
-
 	if (context->file->size() < RSC_MIN_FILESIZE) {
 		return false;
 	}
@@ -89,7 +87,6 @@
 
 	context->file->seek((long)resourceTableOffset, SEEK_SET);
 
-	
 	result = (context->file->read(tableBuffer, tableSize) == tableSize);
 	if (result) {
 		context->table = (ResourceData *)calloc(context->count, sizeof(*context->table));

Index: sndres.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/sndres.cpp,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -d -r1.45 -r1.46
--- sndres.cpp	19 Jul 2005 19:05:51 -0000	1.45
+++ sndres.cpp	19 Jul 2005 21:34:46 -0000	1.46
@@ -201,13 +201,11 @@
 	bool voiceFile = false;
 	double msDouble;
 	SoundBuffer buffer;
-
 	
 	if (!load(_voiceContext, resourceId, buffer, true)) {
 		return -1;
 	}
 
-
 	msDouble = (double)buffer.size;
 	if (buffer.sampleBits == 16) {
 		msDouble /= 2.0;
@@ -218,7 +216,6 @@
 
 	msDouble = msDouble / buffer.frequency * 1000.0;
 	return (int)msDouble;
-
 }
 
 } // End of namespace Saga