[Scummvm-cvs-logs] CVS: scummvm/sound adlib.cpp,1.6,1.7 imuse.cpp,1.13,1.14

[James Brown]

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

Modified Files:
	adlib.cpp imuse.cpp 
Log Message:
winCE part 2 - still gui.cpp and scummvm.cpp left



Index: adlib.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/adlib.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** adlib.cpp	10 Mar 2002 17:21:38 -0000	1.6
--- adlib.cpp	14 Mar 2002 14:45:04 -0000	1.7
***************
*** 125,129 ****
  
  	_adlib_reg_cache = (byte*)calloc(256,1);
! 	_opl = OPLCreate(OPL_TYPE_YM3812,3579545,22050);
  	adlib_write(1,0x20);
  	adlib_write(8,0x40);
--- 125,134 ----
  
  	_adlib_reg_cache = (byte*)calloc(256,1);
! 
! 	#ifdef _WIN32_WCE // Poor WIN32 won't handle 22050 well !
! 		_opl = OPLCreate(OPL_TYPE_YM3812,3579545,11025);
! 	#else
! 		_opl = OPLCreate(OPL_TYPE_YM3812,3579545,22050);
! 	#endif
  	adlib_write(1,0x20);
  	adlib_write(8,0x40);

Index: imuse.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/imuse.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** imuse.cpp	14 Mar 2002 08:04:21 -0000	1.13
--- imuse.cpp	14 Mar 2002 14:45:04 -0000	1.14
***************
*** 29,38 ****
  
  #ifdef USE_ADLIB
! #define TEMPO_BASE 0x1924E0
! #define HARDWARE_TYPE 1
  #else
! #define TEMPO_BASE 0x400000
! #define HARDWARE_TYPE 5
  #endif
  #define SYSEX_ID 0x7D
  #define SPECIAL_CHANNEL 9
--- 29,43 ----
  
  #ifdef USE_ADLIB
! 	#ifdef _WIN32_WCE
! 		#define TEMPO_BASE 0x1F0000 * 2 // Sampled down to 11 kHz
! 	#else
! 		#define TEMPO_BASE 0x1924E0
! 	#endif
! 	#define HARDWARE_TYPE 1
  #else
! 	#define TEMPO_BASE 0x400000
! 	#define HARDWARE_TYPE 5
  #endif
+ 
  #define SYSEX_ID 0x7D
  #define SPECIAL_CHANNEL 9
***************
*** 2111,2114 ****
--- 2116,2124 ----
  		stop_all_sounds();
  	}
+ 
+ 	#ifdef _WIN32_WCE	// Don't break savegames made with andys' build
+         if (!ser->isSaving() && ser->checkEOFLoadStream())
+                 return 0;
+ 	#endif
  
  	ser->_ref_me = this;