[Jake2-commits] jake2/src/jake2/sound/joal JOALSoundImpl.java,1.11,1.12

[Carsten W. <ca...@us...>]

Update of /cvsroot/jake2/jake2/src/jake2/sound/joal
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30397/src/jake2/sound/joal

Modified Files:
	JOALSoundImpl.java 
Log Message:
code cleanup

Index: JOALSoundImpl.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/sound/joal/JOALSoundImpl.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** JOALSoundImpl.java	26 Apr 2005 20:17:54 -0000	1.11
--- JOALSoundImpl.java	26 Apr 2005 22:39:34 -0000	1.12
***************
*** 15,18 ****
--- 15,19 ----
  import jake2.util.Vargs;
  
+ import java.awt.image.SampleModel;
  import java.io.*;
  import java.nio.IntBuffer;
***************
*** 177,192 ****
  	 * @see jake2.sound.SoundImpl#RegisterSound(jake2.sound.sfx_t)
  	 */
! 	private void initBuffer(sfx_t sfx) {
! 		if (sfx.cache == null ) {
! 			//System.out.println(sfx.name + " " + sfx.cache.length+ " " + sfx.cache.loopstart + " " + sfx.cache.speed + " " + sfx.cache.stereo + " " + sfx.cache.width);
! 			return;
! 		}
! 		
! 		int format = AL.AL_FORMAT_MONO16;
! 		byte[] data = sfx.cache.data;
! 		int freq = sfx.cache.speed;
! 		int size = data.length;
! 		
! 		al.alBufferData( buffers[sfx.bufferId], format, data, size, freq);
  	}
  
--- 178,184 ----
  	 * @see jake2.sound.SoundImpl#RegisterSound(jake2.sound.sfx_t)
  	 */
! 	private void initBuffer(byte[] samples, int bufferId, int freq) {
! 		al.alBufferData(buffers[bufferId], AL.AL_FORMAT_MONO16, samples,
! 				samples.length, freq);
  	}
  
***************
*** 513,518 ****
  		sfxcache_t sc = WaveLoader.LoadSound(s);
  		if (sc != null) {
! 			initBuffer(s);
  		    s.isCached = true;
  		}
  		return sc;
--- 505,512 ----
  		sfxcache_t sc = WaveLoader.LoadSound(s);
  		if (sc != null) {
! 			initBuffer(sc.data, s.bufferId, sc.speed);
  		    s.isCached = true;
+ 		    // free samples for GC
+ 		    s.cache.data = null;
  		}
  		return sc;