[Scummvm-cvs-logs] CVS: scummvm readme.txt,1.30,1.31 sound.cpp,1.53,1.54

[James Brown]

Update of /cvsroot/scummvm/scummvm
In directory usw-pr-cvs1:/tmp/cvs-serv27955

Modified Files:
	readme.txt sound.cpp 
Log Message:
Apply urkles MI1 MP3 CD Audio patch and Loom MP3 syncronisation fix patch


Index: readme.txt
===================================================================
RCS file: /cvsroot/scummvm/scummvm/readme.txt,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** readme.txt	19 Apr 2002 11:12:27 -0000	1.30
--- readme.txt	22 Apr 2002 11:18:11 -0000	1.31
***************
*** 350,357 ****
          Janne Huttunen    - Zak256/Indy256/LoomCD actor mask support
          Jeroen Janssen    - Numerous readability and bugfix patches
          Daniel Schepler   - Final MI1 CD music support
          Tim 'realmz'      - Initial MI1 CD music support
          Jonathan 'khalek' - Expert weaver in the Loom
! 
          And to all the contributors, users, and beta testers we've missed.
          Thanks!
--- 350,358 ----
          Janne Huttunen    - Zak256/Indy256/LoomCD actor mask support
          Jeroen Janssen    - Numerous readability and bugfix patches
+         Edward Rudd       - Fixes for playing MP3 versions of MI1/Loom Audio
          Daniel Schepler   - Final MI1 CD music support
          Tim 'realmz'      - Initial MI1 CD music support
          Jonathan 'khalek' - Expert weaver in the Loom
!         
          And to all the contributors, users, and beta testers we've missed.
          Thanks!

Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound.cpp,v
retrieving revision 1.53
retrieving revision 1.54
diff -C2 -d -r1.53 -r1.54
*** sound.cpp	22 Apr 2002 08:16:13 -0000	1.53
--- sound.cpp	22 Apr 2002 11:18:11 -0000	1.54
***************
*** 107,112 ****
  	if (ptr != NULL && READ_UINT32_UNALIGNED(ptr) == MKID('SOUN')) {
  		ptr += 8;
! 		_system->play_cdrom(ptr[16], ptr[17] == 0xff ? -1 : ptr[17],
  						(ptr[18] * 60 + ptr[19]) * 75 + ptr[20], 0);
  		current_cd_sound = sound;
  		return;
--- 107,117 ----
  	if (ptr != NULL && READ_UINT32_UNALIGNED(ptr) == MKID('SOUN')) {
  		ptr += 8;
! #ifdef COMPRESSED_SOUND_FILE
! 		playMP3CDTrack(ptr[16], ptr[17] == 0xff ? -1 : ptr[17],
  						(ptr[18] * 60 + ptr[19]) * 75 + ptr[20], 0);
+ #else
+  		_system->play_cdrom(ptr[16], ptr[17] == 0xff ? -1 : ptr[17],
+  						(ptr[18] * 60 + ptr[19]) * 75 + ptr[20], 0);
+ #endif
  		current_cd_sound = sound;
  		return;
***************
*** 718,722 ****
  		return;
  
! 	if (!start && !delay) {
  		_mixer->stop(_mp3_handle);
  		return;
--- 723,727 ----
  		return;
  
! 	if (!num_loops && !start) {
  		_mixer->stop(_mp3_handle);
  		return;
***************
*** 729,737 ****
  	// Calc offset
  	frame_size = 144 * _mad_header[index].bitrate / _mad_header[index].samplerate;
! 	offset = (long)((float)start / (float)75 * 1000 /
! 	       			(float)((float)1152 / (float)_mad_header[index].samplerate *
! 									  	  1000) * (float)(frame_size + 0.5));
  	// Calc delay
! 	mad_timer_set(&duration, 0, delay, 75);
  	// Go
  	fseek(_mp3_tracks[index], offset, SEEK_SET);
--- 734,748 ----
  	// Calc offset
  	frame_size = 144 * _mad_header[index].bitrate / _mad_header[index].samplerate;
! 	offset = (long)( (float)start / (float)75 * ((float)_mad_header[index].bitrate/(float)8));
! 	
  	// Calc delay
! 	if (!delay) {
! 		struct stat file_stat;
! 		fstat(fileno(_mp3_tracks[index]),&file_stat);		
! 		mad_timer_set(&duration, 0,file_stat.st_size, (_mad_header[index].bitrate/8));
! 	} else {
! 		mad_timer_set(&duration, 0, delay, 75);
! 	}	
! 
  	// Go
  	fseek(_mp3_tracks[index], offset, SEEK_SET);