[Scummvm-cvs-logs] CVS: scummvm/sound mixer.cpp,1.1,1.2 mixer.h,1.1,1.2

Ludvig Strigeus strigeus at users.sourceforge.net
Tue Apr 16 05:08:34 CEST 2002


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

Modified Files:
	mixer.cpp mixer.h 
Log Message:
endian fixes,
don't use adlib driver if sound initialization fails,
simon1 savedialog works


Index: mixer.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/mixer.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** mixer.cpp	14 Apr 2002 18:13:08 -0000	1.1
--- mixer.cpp	16 Apr 2002 12:07:19 -0000	1.2
***************
*** 56,60 ****
  }
  
! void SoundMixer::bind_to_system(OSystem *syst) {
  	_volume_table = (int16*)calloc(256*sizeof(int16),1);
  		
--- 56,60 ----
  }
  
! bool SoundMixer::bind_to_system(OSystem *syst) {
  	_volume_table = (int16*)calloc(256*sizeof(int16),1);
  		
***************
*** 66,70 ****
  		error("OSystem returned invalid sample rate");
  	
! 	syst->set_sound_proc(this, on_generate_samples, OSystem::SOUND_16BIT);
  }
  
--- 66,70 ----
  		error("OSystem returned invalid sample rate");
  	
! 	return syst->set_sound_proc(this, on_generate_samples, OSystem::SOUND_16BIT);
  }
  

Index: mixer.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/mixer.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** mixer.h	14 Apr 2002 18:13:08 -0000	1.1
--- mixer.h	16 Apr 2002 12:07:19 -0000	1.2
***************
*** 91,95 ****
  	 * invoked automatically when samples need
  	 * to be generated */
! 	void bind_to_system(OSystem *syst);
  
  	/* set the volume, 0-256 */
--- 91,95 ----
  	 * invoked automatically when samples need
  	 * to be generated */
! 	bool bind_to_system(OSystem *syst);
  
  	/* set the volume, 0-256 */





More information about the Scummvm-git-logs mailing list