[Jake2-commits] jake2/src/jake2/sound/lwjgl Channel.java, 1.8, 1.9 LWJGLSoundImpl.java, 1.8, 1.9

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

Update of /cvsroot/jake2/jake2/src/jake2/sound/lwjgl
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv3095/src/jake2/sound/lwjgl

Modified Files:
	Channel.java LWJGLSoundImpl.java 
Log Message:
switch to lwjgl 1.0beta3

(sound and gfx tested on MacBook Pro)

Index: Channel.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/sound/lwjgl/Channel.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** Channel.java	4 Dec 2005 20:56:26 -0000	1.8
--- Channel.java	26 Oct 2006 22:02:55 -0000	1.9
***************
*** 24,28 ****
  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  
! */
  package jake2.sound.lwjgl;
  
--- 24,28 ----
  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  
!  */
  package jake2.sound.lwjgl;
  
***************
*** 42,45 ****
--- 42,46 ----
  
  import org.lwjgl.openal.AL10;
+ import org.lwjgl.openal.OpenALException;
  
  /**
***************
*** 50,441 ****
  public class Channel {
  
! 	final static int LISTENER = 0;
! 	final static int FIXED = 1;
! 	final static int DYNAMIC = 2;
! 	final static int MAX_CHANNELS = 32;
! 	private final static FloatBuffer NULLVECTOR = Lib.newFloatBuffer(3);
! 	
! 	private static Channel[] channels = new Channel[MAX_CHANNELS];
! 	private static IntBuffer sources = Lib.newIntBuffer(MAX_CHANNELS);
! 	// a reference of L:WJGLSoundImpl.buffers 
! 	private static IntBuffer buffers;
! 	private static Map looptable = new Hashtable(MAX_CHANNELS);
  
- 	private static boolean isInitialized = false;
- 	private static int numChannels;
-     
      // stream handling
      private static boolean streamingEnabled = false;
      private static int streamQueue = 0;
- 		
- 	// sound attributes
- 	private int type;
- 	private int entnum;
- 	private int entchannel;
- 	private int bufferId;
- 	private int sourceId;
- 	private float volume;
- 	private float rolloff;
- 	private float[] origin = {0, 0, 0};
  
! 	// update flags
! 	private boolean autosound;
! 	private boolean active;
! 	private boolean modified;
! 	private boolean bufferChanged;
! 	private boolean volumeChanged;
  
! 	private Channel(int sourceId) {
! 		this.sourceId = sourceId;
! 		clear();
! 		volumeChanged = false;
! 		volume = 1.0f;
! 	}
  
! 	private void clear() {
! 		entnum = entchannel = bufferId = -1;
! 		bufferChanged = false;
! 		rolloff = 0;
! 		autosound = false;
! 		active = false;
! 		modified = false;
! 	}
! 	
! 	private static IntBuffer tmp = Lib.newIntBuffer(1);
  
! 	static int init(IntBuffer buffers) {
! 		Channel.buffers = buffers;
! 	    // create channels
! 		int sourceId;
! 		for (int i = 0; i < MAX_CHANNELS; i++) {
! 			
! 			AL10.alGenSources(tmp);
! 			sourceId = tmp.get(0);
! 			
!             // can't generate more sources 
! 			if (sourceId <= 0) break;
! 			
! 			sources.put(i, sourceId);
  
! 			channels[i] = new Channel(sourceId);
! 			numChannels++;
! 			
! 			// set default values for AL sources
! 			AL10.alSourcef (sourceId, AL10.AL_GAIN, 1.0f);
! 			AL10.alSourcef (sourceId, AL10.AL_PITCH, 1.0f);
! 			AL10.alSourcei (sourceId, AL10.AL_SOURCE_ABSOLUTE,  AL10.AL_TRUE);
! 			AL10.nalSourcefv(sourceId, AL10.AL_VELOCITY, NULLVECTOR, 0);
! 			AL10.alSourcei (sourceId, AL10.AL_LOOPING, AL10.AL_FALSE);
! 			AL10.alSourcef (sourceId, AL10.AL_REFERENCE_DISTANCE, 200.0f);
! 			AL10.alSourcef (sourceId, AL10.AL_MIN_GAIN, 0.0005f);
! 			AL10.alSourcef (sourceId, AL10.AL_MAX_GAIN, 1.0f);
! 		}
! 		isInitialized = true;
! 		return numChannels;
! 	}
! 	
! 	static void reset() {
! 		for (int i = 0; i < numChannels; i++) {
! 			AL10.alSourceStop(sources.get(i));
! 			AL10.alSourcei(sources.get(i), AL10.AL_BUFFER, 0);
! 			channels[i].clear();
! 		}
  	}
! 	
! 	static void shutdown() {
! 		AL10.alDeleteSources(sources);
! 		numChannels = 0;
! 		isInitialized = false;
  	}
! 	
      static void enableStreaming() {
!         if (streamingEnabled) return;
!         
!         // use the last source
!         numChannels--;
!         streamingEnabled = true;
!         streamQueue = 0;
  
!         int source = channels[numChannels].sourceId;
!         AL10.alSourcei (source, AL10.AL_SOURCE_RELATIVE,  AL10.AL_TRUE);
!         AL10.alSourcef(source, AL10.AL_GAIN, 1.0f);
!         channels[numChannels].volumeChanged = true;
  
!         Com.DPrintf("streaming enabled\n");
      }
  
      static void disableStreaming() {
!         if (!streamingEnabled) return;
!         unqueueStreams();
!         int source = channels[numChannels].sourceId;
!         AL10.alSourcei (source, AL10.AL_SOURCE_ABSOLUTE,  AL10.AL_TRUE);
  
!         // free the last source
!         numChannels++;
!         streamingEnabled = false;
!         Com.DPrintf("streaming disabled\n");
      }
!     
      static void unqueueStreams() {
!         if (!streamingEnabled) return;
!         int source = channels[numChannels].sourceId;
  
!         // stop streaming
!         AL10.alSourceStop(source);
!         int count = AL10.alGetSourcei(source, AL10.AL_BUFFERS_QUEUED);
!         Com.DPrintf("unqueue " + count + " buffers\n");
!         while (count-- > 0) {
!             AL10.alSourceUnqueueBuffers(source, tmp);
!         }
!         streamQueue = 0;
      }
  
      static void updateStream(ByteBuffer samples, int count, int format, int rate) {
!         enableStreaming();
!         int source = channels[numChannels].sourceId;
!         int processed = AL10.alGetSourcei(source, AL10.AL_BUFFERS_PROCESSED);
!         
!         boolean playing = (AL10.alGetSourcei(source, AL10.AL_SOURCE_STATE) == AL10.AL_PLAYING);
!         boolean interupted = !playing && streamQueue > 2;
!         
!         IntBuffer buffer = tmp;
!         if (interupted) {
!             unqueueStreams();
!             buffer.put(0, buffers.get(Sound.MAX_SFX + streamQueue++));
!             Com.DPrintf("queue " + (streamQueue - 1) + '\n');
!         } else if (processed < 2) {
!             // check queue overrun
!             if (streamQueue >= Sound.STREAM_QUEUE) return;
!             buffer.put(0, buffers.get(Sound.MAX_SFX + streamQueue++));
!             Com.DPrintf("queue " + (streamQueue - 1) + '\n');
!         } else {
!             // reuse the buffer
!             AL10.alSourceUnqueueBuffers(source, buffer);
!         }
  
!         samples.position(0);
!         samples.limit(count);
!         AL10.alBufferData(buffer.get(0), format, samples, rate);
!         AL10.alSourceQueueBuffers(source, buffer);
!         
!         if (streamQueue > 1 && !playing) {
!             Com.DPrintf("start sound\n");
!             AL10.alSourcePlay(source);
!         }
!     }
!     
! 	static void addPlaySounds() {
! 		while (Channel.assign(PlaySound.nextPlayableSound()));
  	}
- 	
- 	private static boolean assign(PlaySound ps) {
- 	    if (ps == null) return false;
- 		Channel ch = null;
- 		int i;
- 		for (i = 0; i < numChannels; i++) {
- 			ch = channels[i];
  
! 			if (ps.entchannel != 0 && ch.entnum == ps.entnum && ch.entchannel == ps.entchannel) {
! 				// always override sound from same entity
! 				if (ch.bufferId != ps.bufferId) {
! 				    AL10.alSourceStop(ch.sourceId);
! 				}
! 				break;
! 			}
  
! 			// don't let monster sounds override player sounds
! 			if ((ch.entnum == Globals.cl.playernum+1) && (ps.entnum != Globals.cl.playernum+1) && ch.bufferId != -1)
! 				continue;
  
! 			// looking for a free AL source
! 			if (!ch.active) {
! 				break;
! 			}
  		}
! 		
! 		if (i == numChannels)
! 		    return false;
! 		
! 		ch.type = ps.type;
! 		if (ps.type == Channel.FIXED)
! 		    Math3D.VectorCopy(ps.origin, ch.origin);
! 		ch.entnum = ps.entnum;
! 		ch.entchannel = ps.entchannel;
! 		ch.bufferChanged = (ch.bufferId != ps.bufferId);			
! 		ch.bufferId = ps.bufferId;
! 		ch.rolloff = ps.attenuation * 2;
! 		ch.volumeChanged = (ch.volume != ps.volume);
! 		ch.volume = ps.volume;
  		ch.active = true;
  		ch.modified = true;
! 		return true;
  	}
! 	
! 	private static Channel pickForLoop(int bufferId, float attenuation) {
!         Channel ch;
!         for (int i = 0; i < numChannels; i++) {
!             ch = channels[i];
!             // looking for a free AL source
!             if (!ch.active) {
!                 ch.entnum = 0;
!                 ch.entchannel = 0;
!         		ch.bufferChanged = (ch.bufferId != bufferId);			
!                 ch.bufferId = bufferId;
!            		ch.volumeChanged = (ch.volume != 1.0f);
!            		ch.volume = 1.0f;
!            	    ch.rolloff = attenuation * 2;
!                 ch.active = true;
!                 ch.modified = true;
!                 return ch;
!             }
!         }
!         return null;
      }
- 	
- 	private static FloatBuffer sourceOriginBuffer = Lib.newFloatBuffer(3);
  
! 	//stack variable
! 	private static float[] entityOrigin = {0, 0, 0};
!  
! 	static void playAllSounds(FloatBuffer listenerOrigin) {
! 		FloatBuffer sourceOrigin = sourceOriginBuffer;
! 		Channel ch;
! 		int sourceId;
! 		int state;
  
! 		for (int i = 0; i < numChannels; i++) {
! 			ch = channels[i];
! 			if (ch.active) {
! 				sourceId = ch.sourceId;
! 				switch (ch.type) {
! 					case Channel.LISTENER:
! 					    sourceOrigin.put(0, listenerOrigin.get(0));
! 						sourceOrigin.put(1, listenerOrigin.get(1));
! 						sourceOrigin.put(2, listenerOrigin.get(2));
! 						break;
! 					case Channel.DYNAMIC:
! 						CL_ents.GetEntitySoundOrigin(ch.entnum, entityOrigin);
! 						convertVector(entityOrigin, sourceOrigin);
! 						break;
! 					case Channel.FIXED:
! 						convertVector(ch.origin, sourceOrigin);
! 						break;
! 				}
  
! 				if (ch.modified) {
! 					if (ch.bufferChanged) {
! 						AL10.alSourcei(sourceId, AL10.AL_BUFFER, ch.bufferId);
! 					}
! 					if (ch.volumeChanged) {
! 						AL10.alSourcef (sourceId, AL10.AL_GAIN, ch.volume);
! 					}
! 					AL10.alSourcef (sourceId, AL10.AL_ROLLOFF_FACTOR, ch.rolloff);
! 					AL10.nalSourcefv(sourceId, AL10.AL_POSITION, sourceOrigin, 0);
! 					AL10.alSourcePlay(sourceId);
! 					ch.modified = false;
! 				} else {
! 					state = AL10.alGetSourcei(sourceId, AL10.AL_SOURCE_STATE);
! 					if (state == AL10.AL_PLAYING) {
! 						AL10.nalSourcefv(sourceId, AL10.AL_POSITION, sourceOrigin, 0);
! 					} else {
! 						ch.clear();
! 					}
! 				}
! 				ch.autosound = false;
  			}
  		}
  	}
! 	
! 	/*
! 	 * 	adddLoopSounds
! 	 * 	Entities with a ->sound field will generated looped sounds
! 	 * 	that are automatically started, stopped, and merged together
! 	 * 	as the entities are sent to the client
! 	 */
! 	static void addLoopSounds() {
! 		
! 		if ((Globals.cl_paused.value != 0.0f) || (Globals.cls.state != Globals.ca_active) || !Globals.cl.sound_prepped) {
! 			removeUnusedLoopSounds();
! 			return;
! 		}
! 		
! 		Channel ch;
! 		sfx_t	sfx;
! 		sfxcache_t sc;
! 		int num;
! 		entity_state_t ent;
! 		Object key;
! 		int sound = 0;
  
! 		for (int i=0 ; i<Globals.cl.frame.num_entities ; i++) {
! 			num = (Globals.cl.frame.parse_entities + i)&(Defines.MAX_PARSE_ENTITIES-1);
! 			ent = Globals.cl_parse_entities[num];
! 			sound = ent.sound;
  
! 			if (sound == 0) continue;
  
! 			key = new Integer(ent.number);
! 			ch = (Channel)looptable.get(key);
  
! 			if (ch != null) {
! 				// keep on looping
! 				ch.autosound = true;
! 				Math3D.VectorCopy(ent.origin, ch.origin);
! 				continue;
! 			}
  
! 			sfx = Globals.cl.sound_precache[sound];
! 			if (sfx == null)
! 				continue;		// bad sound effect
  
! 			sc = sfx.cache;
! 			if (sc == null)
! 				continue;
  
! 			// allocate a channel
! 			ch = Channel.pickForLoop(buffers.get(sfx.bufferId), 6);
! 			if (ch == null)
! 				break;
! 				
! 			ch.type = FIXED;
! 			Math3D.VectorCopy(ent.origin, ch.origin);
! 			ch.autosound = true;
! 			
! 			looptable.put(key, ch);
! 			AL10.alSourcei(ch.sourceId, AL10.AL_LOOPING, AL10.AL_TRUE);
! 		}
  
! 		removeUnusedLoopSounds();
  
! 	}
! 	
! 	private static void removeUnusedLoopSounds() {
! 		Channel ch;
! 		// stop unused loopsounds
! 		for (Iterator iter = looptable.values().iterator(); iter.hasNext();) {
! 			ch = (Channel)iter.next();
! 			if (!ch.autosound) {
! 				AL10.alSourceStop(ch.sourceId);
! 				AL10.alSourcei(ch.sourceId, AL10.AL_LOOPING, AL10.AL_FALSE);
! 				iter.remove();
! 				ch.clear();
! 			}
! 		}
! 	}
  
! 	static void convertVector(float[] from, FloatBuffer to) {
! 		to.put(0, from[0]);
! 		to.put(1, from[2]);
! 		to.put(2, -from[1]);
  	}
  
! 	static void convertOrientation(float[] forward, float[] up, FloatBuffer orientation) {
! 		orientation.put(0, forward[0]);
! 		orientation.put(1, forward[2]);
! 		orientation.put(2, -forward[1]);
! 		orientation.put(3, up[0]);
! 		orientation.put(4, up[2]);
! 		orientation.put(5, -up[1]);
  	}
  
  }
--- 51,445 ----
  public class Channel {
  
!     final static int LISTENER = 0;
!     final static int FIXED = 1;
!     final static int DYNAMIC = 2;
!     final static int MAX_CHANNELS = 32;
!     private final static FloatBuffer NULLVECTOR = Lib.newFloatBuffer(3);
! 
!     private static Channel[] channels = new Channel[MAX_CHANNELS];
!     private static IntBuffer sources = Lib.newIntBuffer(MAX_CHANNELS);
!     // a reference of L:WJGLSoundImpl.buffers 
!     private static IntBuffer buffers;
!     private static Map looptable = new Hashtable(MAX_CHANNELS);
! 
!     private static int numChannels;
  
      // stream handling
      private static boolean streamingEnabled = false;
      private static int streamQueue = 0;
  
!     // sound attributes
!     private int type;
!     private int entnum;
!     private int entchannel;
!     private int bufferId;
!     private int sourceId;
!     private float volume;
!     private float rolloff;
!     private float[] origin = {0, 0, 0};
  
!     // update flags
!     private boolean autosound;
!     private boolean active;
!     private boolean modified;
!     private boolean bufferChanged;
!     private boolean volumeChanged;
  
!     private Channel(int sourceId) {
! 	this.sourceId = sourceId;
! 	clear();
! 	volumeChanged = false;
! 	volume = 1.0f;
!     }
  
!     private void clear() {
! 	entnum = entchannel = bufferId = -1;
! 	bufferChanged = false;
! 	rolloff = 0;
! 	autosound = false;
! 	active = false;
! 	modified = false;
!     }
  
!     private static IntBuffer tmp = Lib.newIntBuffer(1);
! 
!     static int init(IntBuffer buffers) {
! 	Channel.buffers = buffers;
! 	// create channels
! 	int sourceId;
! 	for (int i = 0; i < MAX_CHANNELS; i++) {
! 
! 	    AL10.alGenSources(tmp);
! 	    sourceId = tmp.get(0);
! 
! 	    // can't generate more sources 
! 	    if (sourceId <= 0) break;
! 
! 	    sources.put(i, sourceId);
! 
! 	    channels[i] = new Channel(sourceId);
! 	    numChannels++;
! 
! 	    // set default values for AL sources
! 	    AL10.alSourcef (sourceId, AL10.AL_GAIN, 1.0f);
! 	    AL10.alSourcef (sourceId, AL10.AL_PITCH, 1.0f);
! 	    AL10.alSourcei (sourceId, AL10.AL_SOURCE_RELATIVE,  AL10.AL_FALSE);
! 	    AL10.alSource(sourceId, AL10.AL_VELOCITY, NULLVECTOR);
! 	    AL10.alSourcei (sourceId, AL10.AL_LOOPING, AL10.AL_FALSE);
! 	    AL10.alSourcef (sourceId, AL10.AL_REFERENCE_DISTANCE, 200.0f);
! 	    AL10.alSourcef (sourceId, AL10.AL_MIN_GAIN, 0.0005f);
! 	    AL10.alSourcef (sourceId, AL10.AL_MAX_GAIN, 1.0f);
  	}
! 	return numChannels;
!     }
! 
!     static void reset() {
! 	for (int i = 0; i < numChannels; i++) {
! 	    AL10.alSourceStop(sources.get(i));
! 	    AL10.alSourcei(sources.get(i), AL10.AL_BUFFER, 0);
! 	    channels[i].clear();
  	}
!     }
! 
!     static void shutdown() {
! 	AL10.alDeleteSources(sources);
! 	numChannels = 0;
!     }
! 
      static void enableStreaming() {
! 	if (streamingEnabled) return;
  
! 	// use the last source
! 	numChannels--;
! 	streamingEnabled = true;
! 	streamQueue = 0;
  
! 	int source = channels[numChannels].sourceId;
! 	AL10.alSourcei (source, AL10.AL_SOURCE_RELATIVE,  AL10.AL_TRUE);
! 	AL10.alSourcef(source, AL10.AL_GAIN, 1.0f);
! 	channels[numChannels].volumeChanged = true;
! 
! 	Com.DPrintf("streaming enabled\n");
      }
  
      static void disableStreaming() {
! 	if (!streamingEnabled) return;
! 	unqueueStreams();
! 	int source = channels[numChannels].sourceId;
! 	AL10.alSourcei (source, AL10.AL_SOURCE_RELATIVE,  AL10.AL_FALSE);
  
! 	// free the last source
! 	numChannels++;
! 	streamingEnabled = false;
! 	Com.DPrintf("streaming disabled\n");
      }
! 
      static void unqueueStreams() {
! 	if (!streamingEnabled) return;
! 	int source = channels[numChannels].sourceId;
  
! 	// stop streaming
! 	AL10.alSourceStop(source);
! 	int count = AL10.alGetSourcei(source, AL10.AL_BUFFERS_QUEUED);
! 	Com.DPrintf("unqueue " + count + " buffers\n");
! 	while (count-- > 0) {
! 	    AL10.alSourceUnqueueBuffers(source, tmp);
! 	}
! 	streamQueue = 0;
      }
  
      static void updateStream(ByteBuffer samples, int count, int format, int rate) {
! 	enableStreaming();
! 	int source = channels[numChannels].sourceId;
! 	int processed = AL10.alGetSourcei(source, AL10.AL_BUFFERS_PROCESSED);
  
! 	boolean playing = (AL10.alGetSourcei(source, AL10.AL_SOURCE_STATE) == AL10.AL_PLAYING);
! 	boolean interupted = !playing && streamQueue > 2;
! 
! 	IntBuffer buffer = tmp;
! 	if (interupted) {
! 	    unqueueStreams();
! 	    buffer.put(0, buffers.get(Sound.MAX_SFX + streamQueue++));
! 	    Com.DPrintf("queue " + (streamQueue - 1) + '\n');
! 	} else if (processed < 2) {
! 	    // check queue overrun
! 	    if (streamQueue >= Sound.STREAM_QUEUE) return;
! 	    buffer.put(0, buffers.get(Sound.MAX_SFX + streamQueue++));
! 	    Com.DPrintf("queue " + (streamQueue - 1) + '\n');
! 	} else {
! 	    // reuse the buffer
! 	    AL10.alSourceUnqueueBuffers(source, buffer);
  	}
  
! 	samples.position(0);
! 	samples.limit(count);
! 	AL10.alBufferData(buffer.get(0), format, samples, rate);
! 	AL10.alSourceQueueBuffers(source, buffer);
  
! 	if (streamQueue > 1 && !playing) {
! 	    Com.DPrintf("start sound\n");
! 	    AL10.alSourcePlay(source);
! 	}
!     }
  
!     static void addPlaySounds() {
! 	while (Channel.assign(PlaySound.nextPlayableSound()));
!     }
! 
!     private static boolean assign(PlaySound ps) {
! 	if (ps == null) return false;
! 	Channel ch = null;
! 	int i;
! 	for (i = 0; i < numChannels; i++) {
! 	    ch = channels[i];
! 
! 	    if (ps.entchannel != 0 && ch.entnum == ps.entnum && ch.entchannel == ps.entchannel) {
! 		// always override sound from same entity
! 		if (ch.bufferId != ps.bufferId) {
! 		    AL10.alSourceStop(ch.sourceId);
  		}
! 		break;
! 	    }
! 
! 	    // don't let monster sounds override player sounds
! 	    if ((ch.entnum == Globals.cl.playernum+1) && (ps.entnum != Globals.cl.playernum+1) && ch.bufferId != -1)
! 		continue;
! 
! 	    // looking for a free AL source
! 	    if (!ch.active) {
! 		break;
! 	    }
! 	}
! 
! 	if (i == numChannels)
! 	    return false;
! 
! 	ch.type = ps.type;
! 	if (ps.type == Channel.FIXED)
! 	    Math3D.VectorCopy(ps.origin, ch.origin);
! 	ch.entnum = ps.entnum;
! 	ch.entchannel = ps.entchannel;
! 	ch.bufferChanged = (ch.bufferId != ps.bufferId);			
! 	ch.bufferId = ps.bufferId;
! 	ch.rolloff = ps.attenuation * 2;
! 	ch.volumeChanged = (ch.volume != ps.volume);
! 	ch.volume = ps.volume;
! 	ch.active = true;
! 	ch.modified = true;
! 	return true;
!     }
! 
!     private static Channel pickForLoop(int bufferId, float attenuation) {
! 	Channel ch;
! 	for (int i = 0; i < numChannels; i++) {
! 	    ch = channels[i];
! 	    // looking for a free AL source
! 	    if (!ch.active) {
! 		ch.entnum = 0;
! 		ch.entchannel = 0;
! 		ch.bufferChanged = (ch.bufferId != bufferId);			
! 		ch.bufferId = bufferId;
! 		ch.volumeChanged = (ch.volume != 1.0f);
! 		ch.volume = 1.0f;
! 		ch.rolloff = attenuation * 2;
  		ch.active = true;
  		ch.modified = true;
! 		return ch;
! 	    }
  	}
! 	return null;
      }
  
!     private static FloatBuffer sourceOriginBuffer = Lib.newFloatBuffer(3);
  
!     //stack variable
!     private static float[] entityOrigin = {0, 0, 0};
  
!     static void playAllSounds(FloatBuffer listenerOrigin) {
! 	FloatBuffer sourceOrigin = sourceOriginBuffer;
! 	Channel ch;
! 	int sourceId;
! 	int state;
! 
! 	for (int i = 0; i < numChannels; i++) {
! 	    ch = channels[i];
! 	    if (ch.active) {
! 		sourceId = ch.sourceId;
! 		switch (ch.type) {
! 		case Channel.LISTENER:
! 		    sourceOrigin.put(0, listenerOrigin.get(0));
! 		    sourceOrigin.put(1, listenerOrigin.get(1));
! 		    sourceOrigin.put(2, listenerOrigin.get(2));
! 		    break;
! 		case Channel.DYNAMIC:
! 		    CL_ents.GetEntitySoundOrigin(ch.entnum, entityOrigin);
! 		    convertVector(entityOrigin, sourceOrigin);
! 		    break;
! 		case Channel.FIXED:
! 		    convertVector(ch.origin, sourceOrigin);
! 		    break;
! 		}
! 
! 		if (ch.modified) {
! 		    if (ch.bufferChanged) {
! 			try {
! 			    AL10.alSourcei(sourceId, AL10.AL_BUFFER, ch.bufferId);
! 			} catch (OpenALException e) {
! 			    // fallback for buffer changing
! 			    AL10.alSourceStop(sourceId);
! 			    AL10.alSourcei(sourceId, AL10.AL_BUFFER, ch.bufferId);
  			}
+ 		    }
+ 		    if (ch.volumeChanged) {
+ 			AL10.alSourcef (sourceId, AL10.AL_GAIN, ch.volume);
+ 		    }
+ 		    AL10.alSourcef (sourceId, AL10.AL_ROLLOFF_FACTOR, ch.rolloff);
+ 		    AL10.alSource(sourceId, AL10.AL_POSITION, sourceOrigin);
+ 		    AL10.alSourcePlay(sourceId);
+ 		    ch.modified = false;
+ 		} else {
+ 		    state = AL10.alGetSourcei(sourceId, AL10.AL_SOURCE_STATE);
+ 		    if (state == AL10.AL_PLAYING) {
+ 			AL10.alSource(sourceId, AL10.AL_POSITION, sourceOrigin);
+ 		    } else {
+ 			ch.clear();
+ 		    }
  		}
+ 		ch.autosound = false;
+ 	    }
  	}
!     }
  
!     /*
!      * 	adddLoopSounds
!      * 	Entities with a ->sound field will generated looped sounds
!      * 	that are automatically started, stopped, and merged together
!      * 	as the entities are sent to the client
!      */
!     static void addLoopSounds() {
  
! 	if ((Globals.cl_paused.value != 0.0f) || (Globals.cls.state != Globals.ca_active) || !Globals.cl.sound_prepped) {
! 	    removeUnusedLoopSounds();
! 	    return;
! 	}
  
! 	Channel ch;
! 	sfx_t	sfx;
! 	sfxcache_t sc;
! 	int num;
! 	entity_state_t ent;
! 	Object key;
! 	int sound = 0;
  
! 	for (int i=0 ; i<Globals.cl.frame.num_entities ; i++) {
! 	    num = (Globals.cl.frame.parse_entities + i)&(Defines.MAX_PARSE_ENTITIES-1);
! 	    ent = Globals.cl_parse_entities[num];
! 	    sound = ent.sound;
  
! 	    if (sound == 0) continue;
  
! 	    key = new Integer(ent.number);
! 	    ch = (Channel)looptable.get(key);
  
! 	    if (ch != null) {
! 		// keep on looping
! 		ch.autosound = true;
! 		Math3D.VectorCopy(ent.origin, ch.origin);
! 		continue;
! 	    }
  
! 	    sfx = Globals.cl.sound_precache[sound];
! 	    if (sfx == null)
! 		continue;		// bad sound effect
  
! 	    sc = sfx.cache;
! 	    if (sc == null)
! 		continue;
  
! 	    // allocate a channel
! 	    ch = Channel.pickForLoop(buffers.get(sfx.bufferId), 6);
! 	    if (ch == null)
! 		break;
! 
! 	    ch.type = FIXED;
! 	    Math3D.VectorCopy(ent.origin, ch.origin);
! 	    ch.autosound = true;
! 
! 	    looptable.put(key, ch);
! 	    AL10.alSourcei(ch.sourceId, AL10.AL_LOOPING, AL10.AL_TRUE);
  	}
  
! 	removeUnusedLoopSounds();
! 
!     }
! 
!     private static void removeUnusedLoopSounds() {
! 	Channel ch;
! 	// stop unused loopsounds
! 	for (Iterator iter = looptable.values().iterator(); iter.hasNext();) {
! 	    ch = (Channel)iter.next();
! 	    if (!ch.autosound) {
! 		AL10.alSourceStop(ch.sourceId);
! 		AL10.alSourcei(ch.sourceId, AL10.AL_LOOPING, AL10.AL_FALSE);
! 		iter.remove();
! 		ch.clear();
! 	    }
  	}
+     }
+ 
+     static void convertVector(float[] from, FloatBuffer to) {
+ 	to.put(0, from[0]);
+ 	to.put(1, from[2]);
+ 	to.put(2, -from[1]);
+     }
+ 
+     static void convertOrientation(float[] forward, float[] up, FloatBuffer orientation) {
+ 	orientation.put(0, forward[0]);
+ 	orientation.put(1, forward[2]);
+ 	orientation.put(2, -forward[1]);
+ 	orientation.put(3, up[0]);
+ 	orientation.put(4, up[2]);
+ 	orientation.put(5, -up[1]);
+     }
  
  }

Index: LWJGLSoundImpl.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/sound/lwjgl/LWJGLSoundImpl.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** LWJGLSoundImpl.java	4 Dec 2005 17:27:34 -0000	1.8
--- LWJGLSoundImpl.java	26 Oct 2006 22:02:55 -0000	1.9
***************
*** 16,26 ****
  
  import java.nio.*;
- import java.util.Random;
- 
  import org.lwjgl.LWJGLException;
  import org.lwjgl.openal.*;
! import org.lwjgl.openal.eax.EAX;
! import org.lwjgl.openal.eax.EAX20;
! import org.lwjgl.openal.eax.EAXListenerProperties;
  
[...1095 lines suppressed...]
! 		Com.Printf("(%2db) %6i : %s\n", new Vargs(3).add(sc.width * 8).add(size).add(sfx.name));
! 	    } else {
! 		if (sfx.name.charAt(0) == '*')
! 		    Com.Printf("  placeholder : " + sfx.name + "\n");
! 		else
! 		    Com.Printf("  not loaded  : " + sfx.name + "\n");
! 	    }
  	}
! 	Com.Printf("Total resident: " + total + "\n");
!     }
  
!     void SoundInfo_f() {
! 
! 	Com.Printf("%5d stereo\n", new Vargs(1).add(1));
! 	Com.Printf("%5d samples\n", new Vargs(1).add(22050));
! 	Com.Printf("%5d samplebits\n", new Vargs(1).add(16));
! 	Com.Printf("%5d speed\n", new Vargs(1).add(44100));
!     }
  
  }