java-game-lib-cvs Mailing List for Lightweight Java Game Library

Update of /cvsroot/java-game-lib/LWJGL/res
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26618

Added Files:
	Missing_you.mod resources.txt 
Log Message:
added mod file
added resource description file

--- NEW FILE: Missing_you.mod ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: resources.txt ---
The following files are included in the resource archive:
Wave1.WAV - from openal.org cvs
Wave2.WAV - from openal.org cvs
Wave3.WAV - from openal.org cvs
Wave4.WAV - from openal.org cvs
stereo.wav - from openal.org cvs
mono.wav - from openal.org cvs
Footsteps.wav - from openal.org cvs
ding.wav - from openal.org cvs
left.wav - sampled by matzon
right.wav - sampled by matzon
center.wav - sampled by matzon
Missing_you.mod - Missing You, by Doh (Nicolas Desessart, http://doh.av7.net)

Update of /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/fmod
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25368/java/org/lwjgl/fmod

Modified Files:
	FMOD.java FMusic.java FSound.java 
Log Message:
FMusic done, including callbacks!
Added synctest to fmod, showing how to use FMusic

Index: FMusic.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/fmod/FMusic.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- FMusic.java	23 May 2004 14:03:05 -0000	1.1
+++ FMusic.java	31 May 2004 12:42:06 -0000	1.2
@@ -32,7 +32,9 @@
 package org.lwjgl.fmod;
 
 import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
 import java.nio.IntBuffer;
+import java.util.ArrayList;
 
 import org.lwjgl.fmod.callbacks.FMusicCallback;
 
@@ -107,27 +109,38 @@
    * </i>
    * </p>
    * 
-   * @param name_or_data Name of song or data containing song to load (if loading from memory and not file). On PlayStation 2 data must be 16 byte aligned if loading from memory
+   * @param data containing song to load. On PlayStation 2 data must be 16 byte aligned if loading from memory
    * @param offset Optional. 0 by default. If > 0, this value is used to specify an offset in a file, so fmod will seek before opening
    * @param length Optional. 0 by default. If > 0, this value is used to specify the length of a memory block when using FSOUND_LOADMEMORY, or it is the length of a file or file segment if the offset parameter is used. On PlayStation 2 this must be 16 byte aligned for memory loading
    * @param mode Mode for opening song. With module files, only FSOUND_LOADMEMORY, FSOUND_NONBLOCKING, FSOUND_LOOP_NORMAL, or FSOUND_LOOP_OFF are supported. For FSB files, FSOUND_2D, FSOUND_HW3D, FSOUND_FORCEMONO also work
    * @param sampleList Optional. Buffer of sample indicies to load. Leave as Null if you want all samples to be loaded (default behaviour). See Remarks for more on this
    * @return On success, a FMusicModule instance is returned. On failure, Null is returned
    */
-  public static FMusicModule FMUSIC_LoadSongEx(ByteBuffer name_or_data, int offset, int length, int mode, IntBuffer sampleList) {
-    long result = 0;
-    
-  	if((mode & FSound.FSOUND_LOADMEMORY) == FSound.FSOUND_LOADMEMORY) {
-  		result = nFMUSIC_LoadSongEx(name_or_data, name_or_data.position(), offset, length, mode, (sampleList != null) ? sampleList : null, (sampleList != null) ? sampleList.position() : 0, (sampleList != null) ? sampleList.remaining() : 0);
-    } else {
-      byte[] data = new byte[name_or_data.remaining()];
-      result = nFMUSIC_LoadSongEx(new String(data), offset, length, mode, (sampleList != null) ? sampleList : null, (sampleList != null) ? sampleList.position() : 0, (sampleList != null) ? sampleList.remaining() : 0);
-    }
+  public static FMusicModule FMUSIC_LoadSongEx(ByteBuffer data, int offset, int length, int mode, IntBuffer sampleList) {
+    long result = nFMUSIC_LoadSongEx(data, data.position(), offset, length, mode, (sampleList != null) ? sampleList : null, (sampleList != null) ? sampleList.position() : 0, (sampleList != null) ? sampleList.remaining() : 0);
     if(result != FMUSIC_TYPE_NONE) {
      return new FMusicModule(result); 
     }
     return null;
   }
+  
+  /**
+   * @see #FMUSIC_LoadSongEx(ByteBuffer, int, int, int, IntBuffer)
+   * @param name of song
+   * @param offset Optional. 0 by default. If > 0, this value is used to specify an offset in a file, so fmod will seek before opening
+   * @param length Optional. 0 by default. If > 0, this value is used to specify the length of a memory block when using FSOUND_LOADMEMORY, or it is the length of a file or file segment if the offset parameter is used. On PlayStation 2 this must be 16 byte aligned for memory loading
+   * @param mode Mode for opening song. With module files, only FSOUND_LOADMEMORY, FSOUND_NONBLOCKING, FSOUND_LOOP_NORMAL, or FSOUND_LOOP_OFF are supported. For FSB files, FSOUND_2D, FSOUND_HW3D, FSOUND_FORCEMONO also work
+   * @param sampleList Optional. Buffer of sample indicies to load. Leave as Null if you want all samples to be loaded (default behaviour). See Remarks for more on this
+   * @return On success, a FMusicModule instance is returned. On failure, Null is returned
+   */
+  public static FMusicModule FMUSIC_LoadSongEx(String name, int offset, int length, int mode, IntBuffer sampleList) {
+    long result = nFMUSIC_LoadSongEx(name, offset, length, mode, (sampleList != null) ? sampleList : null, (sampleList != null) ? sampleList.position() : 0, (sampleList != null) ? sampleList.remaining() : 0);
+
+    if(result != FMUSIC_TYPE_NONE) {
+     return new FMusicModule(result); 
+    }
+    return null;
+  }  
   private static native long nFMUSIC_LoadSongEx(ByteBuffer data, int dataOffset, int offset, int length, int mode, IntBuffer sampleList, int bufferOffset, int remaining);
   private static native long nFMUSIC_LoadSongEx(String name, int offset, int length, int mode, IntBuffer sampleList, int bufferOffset, int remaining);
   
@@ -148,8 +161,10 @@
    */
   public static boolean FMUSIC_FreeSong(FMusicModule module) {
     // when freeing a song, we automatically deregister any callbacks
-    FMOD.registerCallback(FMOD.FMUSIC_CALLBACK, module.moduleHandle, null, null);
-    
+    FMOD.registerCallback(FMOD.FMUSIC_INSTCALLBACK, module.moduleHandle, null, null);
+    FMOD.registerCallback(FMOD.FMUSIC_ORDERCALLBACK, module.moduleHandle, null, null);
+    FMOD.registerCallback(FMOD.FMUSIC_ROWCALLBACK, module.moduleHandle, null, null);
+    FMOD.registerCallback(FMOD.FMUSIC_ZXXCALLBACK, module.moduleHandle, null, null);
     return nFMUSIC_FreeSong(module.moduleHandle); 
   }
   private static native boolean nFMUSIC_FreeSong(long module);
@@ -204,10 +219,10 @@
    * @return On success, true is returned. On failure, false is returned
    */
   public static boolean FMUSIC_SetZxxCallback(FMusicModule module, FMusicCallback callback) {
-    FMOD.registerCallback(FMOD.FMUSIC_CALLBACK, module.moduleHandle, module, callback);
-    return nFMUSIC_SetZxxCallback(module.moduleHandle, callback);
+    FMOD.registerCallback(FMOD.FMUSIC_ZXXCALLBACK, module.moduleHandle, module, callback);
+    return nFMUSIC_SetZxxCallback(module.moduleHandle);
   }
-  private static native boolean nFMUSIC_SetZxxCallback(long module, FMusicCallback callback);
+  private static native boolean nFMUSIC_SetZxxCallback(long module);
   
   /**
    * Sets a user callback to occur on every row divisible by the rowstep parameter, played from a MOD, S3M, XM or IT file.
@@ -231,10 +246,10 @@
    * @return On success, true is returned. On failure, false is returned
    */
   public static boolean FMUSIC_SetRowCallback(FMusicModule module, FMusicCallback callback, int rowstep) {
-    FMOD.registerCallback(FMOD.FMUSIC_CALLBACK, module.moduleHandle, module, callback);
-    return nFMUSIC_SetRowCallback(module.moduleHandle, callback, rowstep);
+    FMOD.registerCallback(FMOD.FMUSIC_ROWCALLBACK, module.moduleHandle, module, callback);
+    return nFMUSIC_SetRowCallback(module.moduleHandle, rowstep);
   }
-  private static native boolean nFMUSIC_SetRowCallback(long module, FMusicCallback callback, int rowstep);
+  private static native boolean nFMUSIC_SetRowCallback(long module, int rowstep);
   
   /**
    * Sets a user callback to occur on every order divisible by the orderstep parameter, played from a MOD, S3M, XM or IT file
@@ -258,10 +273,10 @@
    * @return On success, true is returned. On failure, false is returned
    */
   public static boolean FMUSIC_SetOrderCallback(FMusicModule module, FMusicCallback callback, int orderstep) {
-    FMOD.registerCallback(FMOD.FMUSIC_CALLBACK, module.moduleHandle, module, callback);
-    return nFMUSIC_SetOrderCallback(module.moduleHandle, callback, orderstep); 
+    FMOD.registerCallback(FMOD.FMUSIC_ORDERCALLBACK, module.moduleHandle, module, callback);
+    return nFMUSIC_SetOrderCallback(module.moduleHandle, orderstep); 
   }
-  private static native boolean nFMUSIC_SetOrderCallback(long module, FMusicCallback callback, int orderstep);
+  private static native boolean nFMUSIC_SetOrderCallback(long module, int orderstep);
   
   /**
    * Sets a user callback to occur every time a instrument is played, triggered from a MOD, S3M, XM or IT file.
@@ -285,10 +300,10 @@
    * @return On success, true is returned. On failure, false is returned
    */
   public static boolean FMUSIC_SetInstCallback(FMusicModule module, FMusicCallback callback, int instrument) {
-    FMOD.registerCallback(FMOD.FMUSIC_CALLBACK, module.moduleHandle, module, callback);
-    return nFMUSIC_SetInstCallback(module.moduleHandle, callback, instrument);
+    FMOD.registerCallback(FMOD.FMUSIC_INSTCALLBACK, module.moduleHandle, module, callback);
+    return nFMUSIC_SetInstCallback(module.moduleHandle, instrument);
   }
-  private static native boolean nFMUSIC_SetInstCallback(long module, FMusicCallback callback, int instrument);
+  private static native boolean nFMUSIC_SetInstCallback(long module, int instrument);
   
   /**
    * Replaces a mod's sample with a sample definition specified.
@@ -712,10 +727,12 @@
    * @param module Module to get the open state from
    * @return On success, userdata set by FMUSIC_SetUserData is returned. On failure, Null is returned.
    */
-  public static ByteBuffer FMUSIC_GetUserData(FMusicModule module) {
-    return nFMUSIC_GetUserData(module.moduleHandle);
+  public static ByteBuffer FMUSIC_GetUserData(FMusicModule module, int capacity) {
+    ByteBuffer buffer = nFMUSIC_GetUserData(module.moduleHandle, capacity);
+    buffer.order(ByteOrder.nativeOrder());
+    return buffer;
   }
-  private static native ByteBuffer nFMUSIC_GetUserData(long module);  
+  private static native ByteBuffer nFMUSIC_GetUserData(long module, int capacity);  
   
   /**
    * This is the callback rutine called by the native implementation whenever a
@@ -724,10 +741,64 @@
    * @param handle Handle to native object being monitored
    * @param param parameter passed to callback
    */
-  private static void music_callback(long modulehandle, int param) {
-    // locate out callback and call it back
-  	FMOD.WrappedCallback wCallback = (FMOD.WrappedCallback) FMOD.getCallback(FMOD.FSOUND_DSPCALLBACK, modulehandle);   
-    FMusicCallback callback = (FMusicCallback) wCallback.callback;  
-    callback.FMUSIC_CALLBACK((FMusicModule) wCallback.handled, param);
+  public static void music_instcallback(long modulehandle, int param) {
+    // we got a callback - notify everybody
+    ArrayList handlers = FMOD.getCallbacks(FMOD.FMUSIC_INSTCALLBACK, modulehandle);
+    for(int i=0; i<handlers.size(); i++) {
+    	FMOD.WrappedCallback wCallback = (FMOD.WrappedCallback) handlers.get(i);   
+    	FMusicCallback callback = (FMusicCallback) wCallback.callback;  
+    	callback.FMUSIC_CALLBACK((FMusicModule) wCallback.handled, param);
+    }
+  }
+  
+  /**
+   * This is the callback rutine called by the native implementation whenever a
+   * register callback is notified.
+   * 
+   * @param handle Handle to native object being monitored
+   * @param param parameter passed to callback
+   */
+  public static void music_ordercallback(long modulehandle, int param) {
+    // we got a callback - notify everybody
+    ArrayList handlers = FMOD.getCallbacks(FMOD.FMUSIC_ORDERCALLBACK, modulehandle);
+    for(int i=0; i<handlers.size(); i++) {
+      FMOD.WrappedCallback wCallback = (FMOD.WrappedCallback) handlers.get(i);   
+      FMusicCallback callback = (FMusicCallback) wCallback.callback;  
+      callback.FMUSIC_CALLBACK((FMusicModule) wCallback.handled, param);
+    }
   }
+  
+  /**
+   * This is the callback rutine called by the native implementation whenever a
+   * register callback is notified.
+   * 
+   * @param handle Handle to native object being monitored
+   * @param param parameter passed to callback
+   */
+  public static void music_rowcallback(long modulehandle, int param) {
+    // we got a callback - notify everybody
+    ArrayList handlers = FMOD.getCallbacks(FMOD.FMUSIC_ROWCALLBACK, modulehandle);
+    for(int i=0; i<handlers.size(); i++) {
+      FMOD.WrappedCallback wCallback = (FMOD.WrappedCallback) handlers.get(i);   
+      FMusicCallback callback = (FMusicCallback) wCallback.callback;  
+      callback.FMUSIC_CALLBACK((FMusicModule) wCallback.handled, param);
+    }
+  }   
+  
+  /**
+   * This is the callback rutine called by the native implementation whenever a
+   * register callback is notified.
+   * 
+   * @param handle Handle to native object being monitored
+   * @param param parameter passed to callback
+   */
+  public static void music_zxxcallback(long modulehandle, int param) {
+    // we got a callback - notify everybody
+    ArrayList handlers = FMOD.getCallbacks(FMOD.FMUSIC_ZXXCALLBACK, modulehandle);
+    for(int i=0; i<handlers.size(); i++) {
+      FMOD.WrappedCallback wCallback = (FMOD.WrappedCallback) handlers.get(i);   
+      FMusicCallback callback = (FMusicCallback) wCallback.callback;  
+      callback.FMUSIC_CALLBACK((FMusicModule) wCallback.handled, param);
+    }
+  }   
 }

Index: FSound.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/fmod/FSound.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- FSound.java	23 May 2004 17:14:44 -0000	1.2
+++ FSound.java	31 May 2004 12:42:07 -0000	1.3
@@ -34,6 +34,7 @@
 import java.nio.ByteBuffer;
 import java.nio.FloatBuffer;
 import java.nio.IntBuffer;
+import java.util.ArrayList;
 
 import org.lwjgl.fmod.callbacks.FSoundCloseCallback;
 import org.lwjgl.fmod.callbacks.FSoundDSPCallback;
@@ -354,13 +355,18 @@
 	public static void FSOUND_File_SetCallbacks(
       FSoundOpenCallback open, FSoundCloseCallback close, FSoundReadCallback read,
       FSoundSeekCallback seek, FSoundTellCallback tell) {
-    FMOD.registerCallback(FMOD.FSOUND_OPENCALLBACK, -1, null, open);
-    FMOD.registerCallback(FMOD.FSOUND_CLOSECALLBACK, -1, null, open);
-    FMOD.registerCallback(FMOD.FSOUND_READCALLBACK, -1, null, open);
-    FMOD.registerCallback(FMOD.FSOUND_SEEKCALLBACK, -1, null, open);
-    FMOD.registerCallback(FMOD.FSOUND_TELLCALLBACK, -1, null, open);
     
-    nFSOUND_File_SetCallbacks();
+    if(open != null && close != null && read != null && seek != null && tell != null) {
+    	FMOD.registerCallback(FMOD.FSOUND_OPENCALLBACK, -1, null, open);
+    	FMOD.registerCallback(FMOD.FSOUND_CLOSECALLBACK, -1, null, open);
+    	FMOD.registerCallback(FMOD.FSOUND_READCALLBACK, -1, null, open);
+    	FMOD.registerCallback(FMOD.FSOUND_SEEKCALLBACK, -1, null, open);
+    	FMOD.registerCallback(FMOD.FSOUND_TELLCALLBACK, -1, null, open);
+    	
+    	nFSOUND_File_SetCallbacks();
+    } else {
+    	throw new IllegalArgumentException("Cannot supply null callback");
+    }
   }
   private static native void nFSOUND_File_SetCallbacks();
 
@@ -922,26 +928,39 @@
    * 0 or above - The absolute index into the sample pool. The pool will grow as the index gets larger. If a slot is already used it will be replaced.
    * FSOUND_FREE - Let FSOUND select an arbitrary sample slot.
    * FSOUND_UNMANAGED - Dont have this sample managed within fsounds sample management system
-   * @param name_or_data Name of sound file or pointer to memory image to load.
+   * @param data ByteBuffer of memory image to load.
    * @param inputmode Description of the data format, OR in the bits defined in FSOUND_MODES to describe the data being loaded.
    * @param offset Optional. 0 by default. If > 0, this value is used to specify an offset in a file, so fmod will seek before opening. length must also be specified if this value is used.
    * @param length Optional. 0 by default. If > 0, this value is used to specify the length of a memory block when using FSOUND_LOADMEMORY, or it is the length of a file or file segment if the offset parameter is used. On PlayStation 2 this must be 16 byte aligned for memory loading.
    * @return On success, a sample is returned. On failure, NULL is returned.
    */
-  public static FSoundSample FSOUND_Sample_Load(int index, ByteBuffer name_or_data, int inputmode, int offset, int length) {
-    long result = 0;
-    
-    if((inputmode & FSound.FSOUND_LOADMEMORY) == FSound.FSOUND_LOADMEMORY) {
-      result = nFSOUND_Sample_Load(index, name_or_data, name_or_data.position(), inputmode, offset, length);
-    } else {
-      byte[] data = new byte[name_or_data.remaining()];
-      result = nFSOUND_Sample_Load(index, new String(data), inputmode, offset, length);
-    }
+  public static FSoundSample FSOUND_Sample_Load(int index, ByteBuffer data, int inputmode, int offset, int length) {
+    long result = nFSOUND_Sample_Load(index, data, data.position(), inputmode, offset, length);
     if(result != 0) {
      return new FSoundSample(result); 
     }
     return null;
   }
+  
+  /**
+   * @see #FSOUND_Sample_Load(int, ByteBuffer, int, int, int)
+   * @param index Sample pool index. See remarks for more on the sample pool.
+   * 0 or above - The absolute index into the sample pool. The pool will grow as the index gets larger. If a slot is already used it will be replaced.
+   * FSOUND_FREE - Let FSOUND select an arbitrary sample slot.
+   * FSOUND_UNMANAGED - Dont have this sample managed within fsounds sample management system
+   * @param name Name of sound file.
+   * @param inputmode Description of the data format, OR in the bits defined in FSOUND_MODES to describe the data being loaded.
+   * @param offset Optional. 0 by default. If > 0, this value is used to specify an offset in a file, so fmod will seek before opening. length must also be specified if this value is used.
+   * @param length Optional. 0 by default. If > 0, this value is used to specify the length of a memory block when using FSOUND_LOADMEMORY, or it is the length of a file or file segment if the offset parameter is used. On PlayStation 2 this must be 16 byte aligned for memory loading.
+   * @return On success, a sample is returned. On failure, NULL is returned.
+   */
+  public static FSoundSample FSOUND_Sample_Load(int index, String name, int inputmode, int offset, int length) {
+    long result = nFSOUND_Sample_Load(index, name, inputmode, offset, length);
+    if(result != 0) {
+     return new FSoundSample(result); 
+    }
+    return null;
+  }  
   private static native long nFSOUND_Sample_Load(int index, ByteBuffer data, int dataOffset, int inputmode, int offset, int length);    
   private static native long nFSOUND_Sample_Load(int index, String name, int inputmode, int offset, int length);
   
@@ -3508,9 +3527,13 @@
    * @param param parameter passed to callback
    */
   private static void dsp_callback(long dspHandle, ByteBuffer originalbuffer, ByteBuffer newbuffer, int length) {
-    // locate out callback and call it back
-    FSoundDSPCallback callback = (FSoundDSPCallback) ((FMOD.WrappedCallback) FMOD.getCallback(FMOD.FSOUND_DSPCALLBACK, dspHandle)).callback;
-    callback.FSOUND_DSPCALLBACK(originalbuffer, newbuffer, length);
+    // we got a callback - notify everybody
+    ArrayList handlers = FMOD.getCallbacks(FMOD.FSOUND_DSPCALLBACK, dspHandle);
+    for(int i=0; i<handlers.size(); i++) {
+      FMOD.WrappedCallback wCallback = (FMOD.WrappedCallback) handlers.get(i);   
+      FSoundDSPCallback callback = (FSoundDSPCallback) wCallback.callback;  
+      callback.FSOUND_DSPCALLBACK(originalbuffer, newbuffer, length);
+    }    
   }
   
   /**
@@ -3521,10 +3544,13 @@
    * @param param parameter passed to callback
    */
   private static void stream_callback(long streamHandle, ByteBuffer buff, int length) {
-    // locate out callback and call it back
-  	FMOD.WrappedCallback wCallback = (FMOD.WrappedCallback) FMOD.getCallback(FMOD.FSOUND_STREAMCALLBACK, streamHandle);   
-    FSoundStreamCallback callback = (FSoundStreamCallback) wCallback.callback;
-    callback.FSOUND_STREAMCALLBACK((FSoundStream) wCallback.handled, buff, length);
+    // we got a callback - notify everybody
+    ArrayList handlers = FMOD.getCallbacks(FMOD.FSOUND_STREAMCALLBACK, streamHandle);
+    for(int i=0; i<handlers.size(); i++) {
+      FMOD.WrappedCallback wCallback = (FMOD.WrappedCallback) handlers.get(i);   
+      FSoundStreamCallback callback = (FSoundStreamCallback) wCallback.callback;  
+      callback.FSOUND_STREAMCALLBACK((FSoundStream) wCallback.handled, buff, length);
+    }
   }
   
   /**
@@ -3535,10 +3561,13 @@
    * @param param parameter passed to callback
    */
   private static void end_callback(long streamHandle) {
-    // locate out callback and call it back
-    FMOD.WrappedCallback wCallback = (FMOD.WrappedCallback) FMOD.getCallback(FMOD.FSOUND_ENDCALLBACK, streamHandle);   
-    FSoundStreamCallback callback = (FSoundStreamCallback) wCallback.callback;
-    callback.FSOUND_STREAMCALLBACK((FSoundStream) wCallback.handled, null, 0);
+    // we got a callback - notify everybody
+    ArrayList handlers = FMOD.getCallbacks(FMOD.FSOUND_ENDCALLBACK, streamHandle);
+    for(int i=0; i<handlers.size(); i++) {
+      FMOD.WrappedCallback wCallback = (FMOD.WrappedCallback) handlers.get(i);   
+      FSoundStreamCallback callback = (FSoundStreamCallback) wCallback.callback;  
+      callback.FSOUND_STREAMCALLBACK((FSoundStream) wCallback.handled, null, 0);
+    }
   }
   
   /**
@@ -3549,10 +3578,13 @@
    * @param param parameter passed to callback
    */
   private static void sync_callback(long streamHandle, ByteBuffer buff, int lenght) {
-    // locate out callback and call it back
-    FMOD.WrappedCallback wCallback = (FMOD.WrappedCallback) FMOD.getCallback(FMOD.FSOUND_SYNCCALLBACK, streamHandle);   
-    FSoundStreamCallback callback = (FSoundStreamCallback) wCallback.callback;
-    callback.FSOUND_STREAMCALLBACK((FSoundStream) wCallback.handled, buff, lenght);
+    // we got a callback - notify everybody
+    ArrayList handlers = FMOD.getCallbacks(FMOD.FSOUND_SYNCCALLBACK, streamHandle);
+    for(int i=0; i<handlers.size(); i++) {
+      FMOD.WrappedCallback wCallback = (FMOD.WrappedCallback) handlers.get(i);   
+      FSoundStreamCallback callback = (FSoundStreamCallback) wCallback.callback;  
+      callback.FSOUND_STREAMCALLBACK((FSoundStream) wCallback.handled, buff, lenght);
+    }
   }
   
   /**
@@ -3563,9 +3595,10 @@
    * @param param parameter passed to callback
    */
   private static int open_callback(String name) {
-    // locate out callback and call it back
-    FMOD.WrappedCallback wCallback = (FMOD.WrappedCallback) FMOD.getCallback(FMOD.FSOUND_OPENCALLBACK, -1);   
-    FSoundOpenCallback callback = (FSoundOpenCallback) wCallback.callback;
+    // we got a callback - notify THE handler
+    ArrayList handlers = FMOD.getCallbacks(FMOD.FSOUND_OPENCALLBACK, -1);
+    FMOD.WrappedCallback wCallback = (FMOD.WrappedCallback) handlers.get(0);   
+    FSoundOpenCallback callback = (FSoundOpenCallback) wCallback.callback;  
     return callback.FSOUND_OPENCALLBACK(name);
   }  
   
@@ -3577,9 +3610,10 @@
    * @param param parameter passed to callback
    */
   private static void close_callback(int handle) {
-    // locate out callback and call it back
-    FMOD.WrappedCallback wCallback = (FMOD.WrappedCallback) FMOD.getCallback(FMOD.FSOUND_CLOSECALLBACK, -1);   
-    FSoundCloseCallback callback = (FSoundCloseCallback) wCallback.callback;
+    // we got a callback - notify THE handler
+    ArrayList handlers = FMOD.getCallbacks(FMOD.FSOUND_CLOSECALLBACK, -1);
+    FMOD.WrappedCallback wCallback = (FMOD.WrappedCallback) handlers.get(0);   
+    FSoundCloseCallback callback = (FSoundCloseCallback) wCallback.callback;  
     callback.FSOUND_CLOSECALLBACK(handle);
   }  
   
@@ -3591,9 +3625,10 @@
    * @param param parameter passed to callback
    */
   private static int read_callback(ByteBuffer buffer, int size, int handle) {
-    // locate out callback and call it back
-    FMOD.WrappedCallback wCallback = (FMOD.WrappedCallback) FMOD.getCallback(FMOD.FSOUND_CLOSECALLBACK, -1);   
-    FSoundReadCallback callback = (FSoundReadCallback) wCallback.callback;
+    // we got a callback - notify THE handler
+    ArrayList handlers = FMOD.getCallbacks(FMOD.FSOUND_READCALLBACK, -1);
+    FMOD.WrappedCallback wCallback = (FMOD.WrappedCallback) handlers.get(0);   
+    FSoundReadCallback callback = (FSoundReadCallback) wCallback.callback;  
     return callback.FSOUND_READCALLBACK(buffer, size, handle);
   }  
   
@@ -3605,9 +3640,10 @@
    * @param param parameter passed to callback
    */
   private static int seek_callback(int handle, int pos, int mode) {
-    // locate out callback and call it back
-    FMOD.WrappedCallback wCallback = (FMOD.WrappedCallback) FMOD.getCallback(FMOD.FSOUND_CLOSECALLBACK, -1);   
-    FSoundSeekCallback callback = (FSoundSeekCallback) wCallback.callback;
+    // we got a callback - notify THE handler
+    ArrayList handlers = FMOD.getCallbacks(FMOD.FSOUND_SEEKCALLBACK, -1);
+    FMOD.WrappedCallback wCallback = (FMOD.WrappedCallback) handlers.get(0);   
+    FSoundSeekCallback callback = (FSoundSeekCallback) wCallback.callback;  
     return callback.FSOUND_SEEKCALLBACK(handle, pos, mode);
   } 
   
@@ -3619,9 +3655,10 @@
    * @param param parameter passed to callback
    */
   private static int tell_callback(int handle) {
-    // locate out callback and call it back
-    FMOD.WrappedCallback wCallback = (FMOD.WrappedCallback) FMOD.getCallback(FMOD.FSOUND_CLOSECALLBACK, -1);   
-    FSoundTellCallback callback = (FSoundTellCallback) wCallback.callback;
+    // we got a callback - notify THE handler
+    ArrayList handlers = FMOD.getCallbacks(FMOD.FSOUND_TELLCALLBACK, -1);
+    FMOD.WrappedCallback wCallback = (FMOD.WrappedCallback) handlers.get(0);   
+    FSoundTellCallback callback = (FSoundTellCallback) wCallback.callback;  
     return callback.FSOUND_TELLCALLBACK(handle);
   }  
   // ----------------------------------------------------------  

Index: FMOD.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/fmod/FMOD.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- FMOD.java	23 May 2004 17:14:44 -0000	1.2
+++ FMOD.java	31 May 2004 12:42:05 -0000	1.3
@@ -33,9 +33,12 @@
 
 import java.io.File;
 import java.nio.FloatBuffer;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.StringTokenizer;
 
+import org.lwjgl.Sys;
+
 /**
  * $Id$
  * <br>
@@ -45,7 +48,7 @@
 public class FMOD {
   
 	/** Array of hashmaps for callbacks */
-  private static HashMap[] callbacks = new HashMap[14];
+  private static HashMap[] callbacks = new HashMap[17];
    
   /** FMOD System level clear dsp unit */
   static FSoundDSPUnit fmodClearUnit;
@@ -66,46 +69,56 @@
   static FloatBuffer fmodFFTBuffer;  
   
   /** Type defining the music callback entries in callback hashmap array */
-  public static final int FMUSIC_CALLBACK = 0;
+  public static final int FMUSIC_INSTCALLBACK = 0;
+  
+  /** Type defining the music callback entries in callback hashmap array */
+  public static final int FMUSIC_ORDERCALLBACK = 1;
+  
+  /** Type defining the music callback entries in callback hashmap array */
+  public static final int FMUSIC_ROWCALLBACK = 2;
+
+  /** Type defining the music callback entries in callback hashmap array */
+  public static final int FMUSIC_ZXXCALLBACK = 3;
+  
   
   /** Type defining the dsp callback entries in callback hashmap array */
-  public static final int FSOUND_DSPCALLBACK = 1;
+  public static final int FSOUND_DSPCALLBACK = 4;
   
   /** Type defining the stream callback entries in callback hashmap array */
-  public static final int FSOUND_STREAMCALLBACK = 2;
+  public static final int FSOUND_STREAMCALLBACK = 5;
   
   /** Type defining the alloc callback entries in callback hashmap array */
-  public static final int FSOUND_ALLOCCALLBACK = 3;
+  public static final int FSOUND_ALLOCCALLBACK = 6;
   
   /** Type defining the realloc callback entries in callback hashmap array */
-  public static final int FSOUND_REALLOCCALLBACK = 4;
+  public static final int FSOUND_REALLOCCALLBACK = 7;
   
   /** Type defining the free callback entries in callback hashmap array */
-  public static final int FSOUND_FREECALLBACK = 5;
+  public static final int FSOUND_FREECALLBACK = 8;
   
   /** Type defining the open callback entries in callback hashmap array */
-  public static final int FSOUND_OPENCALLBACK = 6;
+  public static final int FSOUND_OPENCALLBACK = 9;
   
   /** Type defining the close callback entries in callback hashmap array */
-  public static final int FSOUND_CLOSECALLBACK = 7;
+  public static final int FSOUND_CLOSECALLBACK = 10;
   
   /** Type defining the metadata callback entries in callback hashmap array */
-  public static final int FSOUND_METADATACALLBACK = 8;
+  public static final int FSOUND_METADATACALLBACK = 11;
   
   /** Type defining the read callback entries in callback hashmap array */
-  public static final int FSOUND_READCALLBACK = 9;
+  public static final int FSOUND_READCALLBACK = 12;
   
   /** Type defining the seek callback entries in callback hashmap array */
-  public static final int FSOUND_SEEKCALLBACK = 10;
+  public static final int FSOUND_SEEKCALLBACK = 13;
   
   /** Type defining the tell callback entries in callback hashmap array */
-  public static final int FSOUND_TELLCALLBACK = 11;
+  public static final int FSOUND_TELLCALLBACK = 14;
   
   /** Type defining the "end" callback entries in callback hashmap array */
-  public static final int FSOUND_ENDCALLBACK = 12;
+  public static final int FSOUND_ENDCALLBACK = 15;
   
   /** Type defining the "sync" callback entries in callback hashmap array */
-  public static final int FSOUND_SYNCCALLBACK = 13;  
+  public static final int FSOUND_SYNCCALLBACK = 16;  
 
   /** Have we been created? */
   protected static boolean created;  
@@ -304,10 +317,23 @@
    * @param callbackHandler Object to register as the call back handler
    */
   static void registerCallback(int type, long handle, Object handled, Object callbackHandler) {
+    Long callbackID = new Long(handle);
+    ArrayList callbackList = (ArrayList) callbacks[type].get(callbackID);
+
+    if (callbackList == null ) {
+      if (callbackHandler == null) {
+        Sys.log("No callbackhandlers registered for handle: " + handle);
+      } else {
+      	callbackList = new ArrayList();
+        callbacks[type].put(callbackID, callbackList);
+      }
+    }
+    
+    // are we going to add or remove from the list?
     if(callbackHandler == null) {
-    	callbacks[type].remove(new Long(handle)); 
+    	callbacks[type].remove(callbackID);
     } else {
-    	callbacks[type].put(new Long(handle), new FMOD.WrappedCallback(handled, callbackHandler));
+    	callbackList.add(new FMOD.WrappedCallback(handled, callbackHandler));
     }
   }
   
@@ -316,8 +342,8 @@
    * @param handle Handle to native object being monitored
    * @return Call back handler, or null if no such handler
    */
-  static WrappedCallback getCallback(int type, long handle) {
-   return (WrappedCallback) callbacks[type].get(new Long(handle));
+  static ArrayList getCallbacks(int type, long handle) {
+   return (ArrayList) callbacks[type].get(new Long(handle));
   }
 
   /**

Update of /cvsroot/java-game-lib/LWJGL/src/native/common/fmod
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25368/native/common/fmod

Modified Files:
	extfmod.cpp extfmod.h org_lwjgl_fmod_FMOD.cpp 
	org_lwjgl_fmod_FMusic.cpp 
Log Message:
FMusic done, including callbacks!
Added synctest to fmod, showing how to use FMusic

Index: extfmod.h
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/fmod/extfmod.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- extfmod.h	23 May 2004 19:45:00 -0000	1.2
+++ extfmod.h	31 May 2004 12:42:09 -0000	1.3
@@ -34,14 +34,30 @@
 #define _EXT_FMOD_H
 
 #include <jni.h>
-#include "common_tools.h"
+#include "../common_tools.h"
 
 #include "fmoddyn.h"
 #include "fmod_errors.h"
 
+void fmod_create(JNIEnv *env, char*);
+void fmod_destroy();
+
 extern FMOD_INSTANCE * fmod_instance;
 
-void fmod_create(char*);
-void fmod_destroy();
+// Setup for callback. The callbacks don't have access to a JNIEnv pointer, so we have to provide
+// one. Unfortunately we cannot cache one, since JNIEnv er thread local copies. We can however
+// aquire one, using AttachCurrent<ThreadAsDaemon>. However we need a VM instance for that.
+// so we supply 1 VM instance for use by threads (in common_tools) (VM instances are shared across threads), and
+// 1 JNIEnv pointer per thread. At this time, 2 threads have been identified - the Stream thread
+// and the mixer thread.
+extern JNIEnv *mixer_jnienv;
+extern JNIEnv *stream_jnienv;
+
+// FMusic cached fields
+extern jmethodID music_instcallback;
+extern jmethodID music_ordercallback;
+extern jmethodID music_rowcallback;
+extern jmethodID music_zxxcallback;
+extern jclass fmusic;
 
 #endif

Index: extfmod.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/fmod/extfmod.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- extfmod.cpp	23 May 2004 19:45:00 -0000	1.3
+++ extfmod.cpp	31 May 2004 12:42:09 -0000	1.4
@@ -41,6 +41,17 @@
 /** Instance of fmod  */
 FMOD_INSTANCE * fmod_instance = NULL;
 
+// jnienvs
+JNIEnv *mixer_jnienv;
+JNIEnv *stream_jnienv;
+
+// FMusic cached fields
+jmethodID music_instcallback;
+jmethodID music_ordercallback;
+jmethodID music_rowcallback;
+jmethodID music_zxxcallback;
+jclass fmusic;
+
 #ifdef _WIN32
 /**
  * DLL entry point for Windows. Called when Java loads the .dll
@@ -55,8 +66,16 @@
  *
  * @param path path to try to load dll
  */
-void fmod_create(char* path) {
+void fmod_create(JNIEnv *env, char* path) {
   fmod_instance = FMOD_CreateInstance(path);
+  
+  if (fmod_instance != NULL) {
+    fmusic = env->FindClass("org/lwjgl/fmod/FMusic");
+    music_instcallback = env->GetStaticMethodID(fmusic, "music_instcallback", "(JI)V");
+    music_ordercallback = env->GetStaticMethodID(fmusic, "music_ordercallback", "(JI)V");
+    music_rowcallback = env->GetStaticMethodID(fmusic, "music_rowcallback", "(JI)V");
+    music_zxxcallback = env->GetStaticMethodID(fmusic, "music_zxxcallback", "(JI)V");
+  }
 }
 
 /**

Index: org_lwjgl_fmod_FMOD.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/fmod/org_lwjgl_fmod_FMOD.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- org_lwjgl_fmod_FMOD.cpp	23 May 2004 19:45:00 -0000	1.2
+++ org_lwjgl_fmod_FMOD.cpp	31 May 2004 12:42:09 -0000	1.3
@@ -55,7 +55,7 @@
 		jstring path = (jstring) env->GetObjectArrayElement(paths, i);
 		char *path_str = (char *) env->GetStringUTFChars(path, NULL);
 		printfDebug("Trying to load fmod_instance from %s\n", path_str);
-		fmod_create(path_str);
+		fmod_create(env, path_str);
 		env->ReleaseStringUTFChars(path, path_str);
 
 		if(fmod_instance != NULL) {

Index: org_lwjgl_fmod_FMusic.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/fmod/org_lwjgl_fmod_FMusic.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- org_lwjgl_fmod_FMusic.cpp	23 May 2004 19:45:00 -0000	1.2
+++ org_lwjgl_fmod_FMusic.cpp	31 May 2004 12:42:09 -0000	1.3
@@ -33,6 +33,12 @@
 #include "org_lwjgl_fmod_FMusic.h"
 #include "extfmod.h"
 
+// callback
+void F_CALLBACKAPI fmusic_instcallback(FMUSIC_MODULE *mod, unsigned char param);
+void F_CALLBACKAPI fmusic_ordercallback(FMUSIC_MODULE *mod, unsigned char param);
+void F_CALLBACKAPI fmusic_rowcallback(FMUSIC_MODULE *mod, unsigned char param);
+void F_CALLBACKAPI fmusic_zxxcallback(FMUSIC_MODULE *mod, unsigned char param);
+
 /*
  * Class:     org_lwjgl_fmod_FMusic
  * Method:    nFMUSIC_LoadSong
@@ -130,32 +136,26 @@
  * Method:    nFMUSIC_SetZxxCallback
  * Signature: (JLorg/lwjgl/fmod_instance/FMusicCallback;)Z
  */
-JNIEXPORT jboolean JNICALL Java_org_lwjgl_fmod_FMusic_nFMUSIC_1SetZxxCallback
-  (JNIEnv *env, jclass clazz, jlong, jobject){
-    throwFMODException(env, "missing implementation");
-    return false;
-  }
+JNIEXPORT jboolean JNICALL Java_org_lwjgl_fmod_FMusic_nFMUSIC_1SetZxxCallback(JNIEnv *env, jclass clazz, jlong module){
+  return fmod_instance->FMUSIC_SetZxxCallback((FMUSIC_MODULE*)module, fmusic_zxxcallback);
+}
 
 /*
  * Class:     org_lwjgl_fmod_FMusic
  * Method:    nFMUSIC_SetRowCallback
  * Signature: (JLorg/lwjgl/fmod_instance/FMusicCallback;I)Z
  */
-JNIEXPORT jboolean JNICALL Java_org_lwjgl_fmod_FMusic_nFMUSIC_1SetRowCallback
-  (JNIEnv *env, jclass clazz, jlong, jobject, jint){
-    throwFMODException(env, "missing implementation");
-    return false;
-  }
+JNIEXPORT jboolean JNICALL Java_org_lwjgl_fmod_FMusic_nFMUSIC_1SetRowCallback(JNIEnv *env, jclass clazz, jlong module, jint row) {
+  return fmod_instance->FMUSIC_SetRowCallback((FMUSIC_MODULE*)module, fmusic_rowcallback, row);
+}
 
 /*
  * Class:     org_lwjgl_fmod_FMusic
  * Method:    nFMUSIC_SetOrderCallback
  * Signature: (JLorg/lwjgl/fmod_instance/FMusicCallback;I)Z
  */
-JNIEXPORT jboolean JNICALL Java_org_lwjgl_fmod_FMusic_nFMUSIC_1SetOrderCallback
-  (JNIEnv *env, jclass clazz, jlong, jobject, jint){
-    throwFMODException(env, "missing implementation");
-    return false;
+JNIEXPORT jboolean JNICALL Java_org_lwjgl_fmod_FMusic_nFMUSIC_1SetOrderCallback(JNIEnv *env, jclass clazz, jlong module, jint order) {
+    return fmod_instance->FMUSIC_SetOrderCallback((FMUSIC_MODULE*)module, fmusic_ordercallback, order);
   }
 
 /*
@@ -163,11 +163,9 @@
  * Method:    nFMUSIC_SetInstCallback
  * Signature: (JLorg/lwjgl/fmod_instance/FMusicCallback;I)Z
  */
-JNIEXPORT jboolean JNICALL Java_org_lwjgl_fmod_FMusic_nFMUSIC_1SetInstCallback
-  (JNIEnv *env, jclass clazz, jlong, jobject, jint){
-    throwFMODException(env, "missing implementation");
-    return false;
-  }
+JNIEXPORT jboolean JNICALL Java_org_lwjgl_fmod_FMusic_nFMUSIC_1SetInstCallback(JNIEnv *env, jclass clazz, jlong module, jint inst){
+  return fmod_instance->FMUSIC_SetInstCallback((FMUSIC_MODULE*)module, fmusic_instcallback, inst);
+}
 
 /*
  * Class:     org_lwjgl_fmod_FMusic
@@ -184,11 +182,10 @@
  * Method:    nFMUSIC_SetUserData
  * Signature: (JLjava/nio/ByteBuffer;I)Z
  */
-JNIEXPORT jboolean JNICALL Java_org_lwjgl_fmod_FMusic_nFMUSIC_1SetUserData
-  (JNIEnv *env, jclass clazz, jlong module, jobject data, jint offset){
-    throwFMODException(env, "missing implementation");
-    return false;
-  }
+JNIEXPORT jboolean JNICALL Java_org_lwjgl_fmod_FMusic_nFMUSIC_1SetUserData(JNIEnv *env, jclass clazz, jlong module, jobject data, jint offset) {
+  void *userdata = offset + (char*) env->GetDirectBufferAddress(data);
+  return fmod_instance->FMUSIC_SetUserData((FMUSIC_MODULE *) module, userdata);
+}
 
 /*
  * Class:     org_lwjgl_fmod_FMusic
@@ -486,8 +483,54 @@
  * Method:    nFMUSIC_GetUserData
  * Signature: (J)Ljava/nio/ByteBuffer;
  */
-JNIEXPORT jobject JNICALL Java_org_lwjgl_fmod_FMusic_nFMUSIC_1GetUserData
-  (JNIEnv *env, jclass clazz, jlong module) {
-    throwFMODException(env, "missing implementation");
-    return NULL;
-  }
+JNIEXPORT jobject JNICALL Java_org_lwjgl_fmod_FMusic_nFMUSIC_1GetUserData(JNIEnv *env, jclass clazz, jlong module, jint capacity) {
+  void* data = (void*) fmod_instance->FMUSIC_GetUserData((FMUSIC_MODULE *) module);
+  return env->NewDirectByteBuffer(data, capacity);
+}
+
+/**
+ * This attaches the mixer thread as a daemon thread, and sets its
+ * priority to max value
+ */
+void attachMixerThread() {
+  jvm->AttachCurrentThreadAsDaemon((void**) &mixer_jnienv, NULL);
+  
+  // set to high priority
+  // ==============================
+  // get current thread
+  jclass threadClass = mixer_jnienv->FindClass("java/lang/Thread");
+  jmethodID currentThread = mixer_jnienv->GetStaticMethodID(threadClass, "currentThread", "()Ljava/lang/Thread;");
+  jobject myThread = mixer_jnienv->CallStaticObjectMethod(threadClass, currentThread);
+  
+  // get value of high priority
+  jfieldID highPriority = mixer_jnienv->GetStaticFieldID(threadClass, "MAX_PRIORITY", "I");
+  jint highPriorityValue = mixer_jnienv->GetStaticIntField(threadClass, highPriority);
+  
+  // call set priority
+  jmethodID priority = mixer_jnienv->GetMethodID(threadClass, "setPriority", "(I)V");
+  mixer_jnienv->CallVoidMethod(myThread, priority, highPriorityValue);
+  // ------------------------------
+}
+
+// FMusic callbacks
+// =======================================
+void F_CALLBACKAPI fmusic_instcallback(FMUSIC_MODULE *mod, unsigned char param) {
+  if (mixer_jnienv == NULL) { attachMixerThread(); }
+  mixer_jnienv->CallStaticVoidMethod(fmusic, music_instcallback, (jlong) mod, (jint) param);
+}
+
+void F_CALLBACKAPI fmusic_ordercallback(FMUSIC_MODULE *mod, unsigned char param) {
+  if (mixer_jnienv == NULL) { attachMixerThread(); }
+  mixer_jnienv->CallStaticVoidMethod(fmusic, music_ordercallback, (jlong) mod, (jint) param);
+}
+
+void F_CALLBACKAPI fmusic_rowcallback(FMUSIC_MODULE *mod, unsigned char param) {
+  if (mixer_jnienv == NULL) { attachMixerThread(); }
+  mixer_jnienv->CallStaticVoidMethod(fmusic, music_rowcallback, (jlong) mod, (jint) param);
+}
+
+void F_CALLBACKAPI fmusic_zxxcallback(FMUSIC_MODULE *mod, unsigned char param) {
+  if (mixer_jnienv == NULL) { attachMixerThread(); }
+  mixer_jnienv->CallStaticVoidMethod(fmusic, music_zxxcallback, (jlong) mod, (jint) param);
+}
+// ------------------------------------------
\ No newline at end of file

Update of /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/test/fmod
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25368/java/org/lwjgl/test/fmod

Modified Files:
	MusicPlayer.java 
Added Files:
	SyncTest.java 
Log Message:
FMusic done, including callbacks!
Added synctest to fmod, showing how to use FMusic

Index: MusicPlayer.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/test/fmod/MusicPlayer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- MusicPlayer.java	23 May 2004 14:03:07 -0000	1.1
+++ MusicPlayer.java	31 May 2004 12:42:08 -0000	1.2
@@ -38,7 +38,11 @@
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
 
-import org.lwjgl.fmod.*;
+import org.lwjgl.fmod.FMOD;
+import org.lwjgl.fmod.FMODException;
+import org.lwjgl.fmod.FMusic;
+import org.lwjgl.fmod.FMusicModule;
+import org.lwjgl.fmod.FSound;
 
 /**
  * $Id$
@@ -74,12 +78,18 @@
     }
     
     System.out.println("Loading " + args[0]);
+    
+    // choose either way of loading...
+    
+    // using name (path)
     FMusicModule module = FMusic.FMUSIC_LoadSong(args[0]);
-    //ByteBuffer buffer = ByteBuffer.allocateDirect(11).order(ByteOrder.nativeOrder());
-    //buffer.put("razorbck.it".getBytes());
-    //buffer.flip();
-    //FMusicModule module = FMusic.FMUSIC_LoadSongEx(getData(args[0]), 0, 0, 0, null);
-    //FMusicModule module = FMusic.FMUSIC_LoadSongEx(buffer, 0, 0, 0, null);
+    
+    // using name (path), extended mode
+    //FMusicModule module = FMusic.FMUSIC_LoadSongEx(args[0], 0, 0, 0, null);
+    
+    // using memory buffers
+    //ByteBuffer data = getData(args[0]);
+    //FMusicModule module = FMusic.FMUSIC_LoadSongEx(data, 0, data.remaining(), FSound.FSOUND_LOADMEMORY, null);
     
     if(module != null) {
       System.out.println("Loaded. Playing module of type: " + FMusic.FMUSIC_GetType(module));
@@ -96,6 +106,7 @@
       FMusic.FMUSIC_FreeSong(module);
     } else {
     	System.out.println("Unable to play: " + args[0]);
+      System.out.println("Error: " + FMOD.FMOD_ErrorString(FSound.FSOUND_GetError()));
     }
     
     FSound.FSOUND_Close();
@@ -104,39 +115,40 @@
   
   /**
    * Reads the file into a ByteBuffer
-   *
-   * @param filename Name of file to load
+   * 
+   * @param filename
+   *          Name of file to load
    * @return ByteBuffer containing file data
    */
   static protected ByteBuffer getData(String filename) {
-      ByteBuffer buffer = null;
+    ByteBuffer buffer = null;
 
-      System.out.println("Attempting to load: " + filename);
-      
-      try {
-          BufferedInputStream bis = new BufferedInputStream(MusicPlayer.class.getClassLoader().getResourceAsStream(filename));
-          ByteArrayOutputStream baos = new ByteArrayOutputStream();
-          
-          int bufferLength = 4096;
-          byte[] readBuffer = new byte[bufferLength];
-          int read = -1;
-          
-          while((read = bis.read(readBuffer, 0, bufferLength)) != -1) {
-              baos.write(readBuffer, 0, read);
-          }
-          
-          //done reading, close
-          bis.close();
-          
-          // if ogg vorbis data, we need to pass it unmodified to alBufferData
-          buffer = ByteBuffer.allocateDirect(baos.size());
-          buffer.order(ByteOrder.nativeOrder());
-          buffer.put(baos.toByteArray());
-          buffer.flip();
-          System.out.println("loaded " + buffer.remaining() + " bytes");
-      } catch (Exception ioe) {
-          ioe.printStackTrace();
+    System.out.println("Attempting to load: " + filename);
+
+    try {
+      BufferedInputStream bis = new BufferedInputStream(StreamPlayer.class.getClassLoader().getResourceAsStream(filename));
+      ByteArrayOutputStream baos = new ByteArrayOutputStream();
+
+      int bufferLength = 4096;
+      byte[] readBuffer = new byte[bufferLength];
+      int read = -1;
+
+      while ((read = bis.read(readBuffer, 0, bufferLength)) != -1) {
+        baos.write(readBuffer, 0, read);
       }
-      return buffer;
+
+      //done reading, close
+      bis.close();
+
+      // if ogg vorbis data, we need to pass it unmodified to alBufferData
+      buffer = ByteBuffer.allocateDirect(baos.size());
+      buffer.order(ByteOrder.nativeOrder());
+      buffer.put(baos.toByteArray());
+      buffer.flip();
+      System.out.println("loaded " + buffer.remaining() + " bytes");
+    } catch (Exception ioe) {
+      ioe.printStackTrace();
+    }
+    return buffer;
   }  
 }

--- NEW FILE: SyncTest.java ---
/* 
 * Copyright (c) 2004 LWJGL Project
 * All rights reserved.
 * 
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions are 
 * met:
 * 
 * * Redistributions of source code must retain the above copyright 
 *   notice, this list of conditions and the following disclaimer.
 *
 * * Redistributions in binary form must reproduce the above copyright
 *   notice, this list of conditions and the following disclaimer in the
 *   documentation and/or other materials provided with the distribution.
 *
 * * Neither the name of 'LWJGL' nor the names of 
 *   its contributors may be used to endorse or promote products derived 
 *   from this software without specific prior written permission.
 * 
 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
 * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
 * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR 
 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
 * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING 
 * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
package org.lwjgl.test.fmod;

import java.io.File;
import java.io.IOException;
import java.nio.ByteBuffer;

import org.lwjgl.BufferUtils;
import org.lwjgl.Sys;
import org.lwjgl.fmod.FMOD;
import org.lwjgl.fmod.FMODException;
import org.lwjgl.fmod.FMusic;
import org.lwjgl.fmod.FMusicModule;
import org.lwjgl.fmod.FSound;
import org.lwjgl.fmod.callbacks.FMusicCallback;

/**
 * $Id: SyncTest.java,v 1.1 2004/05/31 12:42:09 matzon Exp $ <br>
 * 
 * @author Brian Matzon <br...@ma...>
 * @version $Revision: 1.1 $
 */
public class SyncTest {
  
  /** Path to file to play */
  private String filePath;
  
  /** Module instance loaded */
  private FMusicModule module;
  
  /** Whether test is running */
  private boolean running = true;
  
  /** Current row */
  private int row;
  
  /** Current order */
  private int order;
  
  /** Number of orders in the song */
  private int numOrders;
  
	/**
	 * Creates a new SyncTest
	 * @param string
	 */
	public SyncTest(String filePath) {
    this.filePath = filePath;
    
    // create thread to exit when a key has been pressed
    Thread t = new Thread() {
      public void run() {
        try {
         System.in.read();
        } catch (IOException ioe) {
        }
        running = false;
      }      
    };
    t.setDaemon(true);
    t.start();
	}

  /**
   * 
   * @param args
   */
	public static void main(String[] args) {

    // check for file existance
    File file = new File(args[0]);
    if (!file.exists()) {
      System.out.println("No such file: " + args[0]);
      return;
    }
    
    // initialize FMOD
    try {
      System.out.println("Initializing FMOD");
			FMOD.create();
		} catch (FMODException fmode) {
			fmode.printStackTrace();
			return;
		}
    
    // start actual test
    SyncTest sync = new SyncTest(args[0]);
    sync.executeTest();
	}
  
  /**
   * Executes the test
   */
  public void executeTest() {
    // do setup
    setup();
    
    // if we have a module - get going
    if (module != null) {
      // high priority... - might otherwise skip
      Sys.setProcessPriority(Sys.HIGH_PRIORITY);
      
      // go go go!
    	run();
    }
    
    // we're done - clean up
    destroy();
  }
  
  /**
   * Setup FMOD
   */
  private void setup() {
    if (!FSound.FSOUND_Init(44100, 32, 0)) {
      System.out.println("Failed to initialize FMOD");
      System.out.println("Error: " + FMOD.FMOD_ErrorString(FSound.FSOUND_GetError()));
      return;
    }
    
    // load module
    System.out.println("Loading " + filePath);
    module = FMusic.FMUSIC_LoadSong(filePath); 
    
    if (module == null) {
     System.out.println("Unable to load " + filePath + ": " + FMOD.FMOD_ErrorString(FSound.FSOUND_GetError()));
     return;
    }
    
    // get number of orders
    numOrders = FMusic.FMUSIC_GetNumOrders(module);
    
    // install order callback
    FMusic.FMUSIC_SetOrderCallback(module, new FMusicCallback() {
      public void FMUSIC_CALLBACK(FMusicModule module, int param) {
        order = param;
      }
    }, 1);
    
    // install row callback
    // will be called once PER CHANNEL! - but since we only set the row
    // no harm is done :)
    FMusic.FMUSIC_SetRowCallback(module, new FMusicCallback() {
      public void FMUSIC_CALLBACK(FMusicModule module, int param) {
        row = param;
      }
    }, 1);
    
    // try to add some userdata
    ByteBuffer buffer = BufferUtils.createByteBuffer(24);
    buffer.putInt(1).putInt(2).putInt(3).putInt(4).putInt(5).putInt(6).rewind();
    FMusic.FMUSIC_SetUserData(module, buffer);
  }
  
  /**
   * Update status of module - spew it out in console
   */
  private void update() {
    // mark as not running when finished
    if(FMusic.FMUSIC_IsFinished(module)) {
      running = false;
    }

    int patternLength = FMusic.FMUSIC_GetPatternLength(module, order);
    int time = FMusic.FMUSIC_GetTime(module) / 1000;
    int time2 = FMusic.FMUSIC_GetTime(module) % 1000 / 10;
    double cpu = Math.round(FSound.FSOUND_GetCPUUsage() * 100.0) / 100.0;
    
    System.out.println("O: " +
        ((order < 10) ? "0" : "") + order + "/" + numOrders + " | R: " 
        + ((row < 10) ? "0" : "") + row + "/" + patternLength + " | T: "
        + time + "." 
        + ((time2 < 10) ? "0" : "") + time2 + " | BPM: " + FMusic.FMUSIC_GetBPM(module) + " | Play: " + FMusic.FMUSIC_IsFinished(module) 
        + " | C: " + FSound.FSOUND_GetChannelsPlaying() + " | CPU: " + cpu);    
  }
  
  /**
   * Runs the actual test - that is, play | update ad nausea 
   */
  private void run() {
    // play
    FMusic.FMUSIC_PlaySong(module);
    
    // loop, printing update, if we actually changed row
    int lastRow = row;
    while(running) {
      if(lastRow != row) {
        lastRow = row;        
      	update();
      } else {
      	Thread.yield();
      }
    }
  }
  
  // clean up our own mess
  private void destroy() {
    if(module != null) {
      // retrieve userdata
      ByteBuffer buffer = FMusic.FMUSIC_GetUserData(module, 24);
      
      // should contain 1,2,3,4,5,6
      for(int i=0; i<6; i++) {
      	System.out.println(buffer.getInt());
      }      
      
      FMusic.FMUSIC_FreeSong(module);
    }
    FSound.FSOUND_Close();
    FMOD.destroy();     
  }
}

Update of /cvsroot/java-game-lib/LWJGL/src/native/common
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24994

Modified Files:
	common_tools.cpp common_tools.h 
Log Message:
expose VM

Index: common_tools.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/common_tools.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- common_tools.cpp	23 May 2004 18:57:02 -0000	1.20
+++ common_tools.cpp	31 May 2004 12:39:03 -0000	1.21
@@ -42,6 +42,7 @@
 
 static bool debug = false;
 static const char* VERSION = "0.9pre";
+JavaVM *jvm;
 
 jstring getVersionString(JNIEnv *env) {
 	return env->NewStringUTF(VERSION);
@@ -207,3 +208,10 @@
   jmethodID getBoolean = env->GetStaticMethodID(booleanClass, "getBoolean", "(Ljava/lang/String;)Z");
   return env->CallStaticBooleanMethod(booleanClass, getBoolean, property)? true : false;
 }
+
+JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *reserved) {
+  jvm = vm;
+  return JNI_VERSION_1_4;
+}
+JNIEXPORT void JNICALL JNI_OnUnload(JavaVM *vm, void *reserved) {
+}
\ No newline at end of file

Index: common_tools.h
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/common_tools.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- common_tools.h	23 May 2004 13:50:08 -0000	1.15
+++ common_tools.h	31 May 2004 12:39:03 -0000	1.16
@@ -43,6 +43,9 @@
 #include <jni.h>
 #include "org_lwjgl_Sys.h"
 
+// shared VM instance
+extern JavaVM *jvm;
+
 // Must be x * max_event_size + 1
 #define EVENT_BUFFER_SIZE (25 * 4 + 1)
 

Update of /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/input
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13511/src/java/org/lwjgl/input

Modified Files:
	Mouse.java 
Log Message:
Tiny javadoc adjustment

Index: Mouse.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/input/Mouse.java,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -d -r1.55 -r1.56
--- Mouse.java	25 May 2004 15:19:16 -0000	1.55
+++ Mouse.java	26 May 2004 22:53:40 -0000	1.56
@@ -480,7 +480,7 @@
 
 	/**
 	 * Retrieves the absolute position. If the Window has been created
-	 * x will be clamped to 0 - Window.getWidth().
+	 * x will be clamped to 0...Window.getWidth() - 1.
 	 * 
 	 * @return Absolute x axis position of mouse
 	 */
@@ -490,7 +490,7 @@
 
 	/**
 	 * Retrieves the absolute position. If the Window has been created
-	 * y will be clamped to 0 - Window.getHeight().
+	 * y will be clamped to 0...Window.getHeight() -1.
 	 *
 	 * @return Absolute y axis position of mouse
 	 */

Update of /cvsroot/java-game-lib/LWJGL/src/native/win32
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8823/src/native/win32

Modified Files:
	org_lwjgl_opengl_Window.cpp 
Log Message:
No longer uses ARB pixel formats when samples == 0

Index: org_lwjgl_opengl_Window.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/win32/org_lwjgl_opengl_Window.cpp,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- org_lwjgl_opengl_Window.cpp	14 May 2004 12:52:39 -0000	1.32
+++ org_lwjgl_opengl_Window.cpp	26 May 2004 14:41:12 -0000	1.33
@@ -499,7 +499,7 @@
 	// of multisamples we want. If the extension is present we'll delete the existing
 	// rendering context and start over, using the ARB extension instead to pick the context.
 	extgl_InitWGL(env);
-	if (extgl_Extensions.WGL_ARB_pixel_format) {
+	if (extgl_Extensions.WGL_ARB_pixel_format && samples > 0) {
 		wglMakeCurrent(NULL, NULL);
 		wglDeleteContext(hglrc);
 		closeWindow();

Update of /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/input
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22274/src/java/org/lwjgl/input

Modified Files:
	Mouse.java 
Log Message:


Index: Mouse.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/input/Mouse.java,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -d -r1.54 -r1.55
--- Mouse.java	5 May 2004 14:28:37 -0000	1.54
+++ Mouse.java	25 May 2004 15:19:16 -0000	1.55
@@ -357,14 +357,14 @@
 			// clamp x, y
 			if (x < 0) {
 				x = 0;
-			} else if (x > Window.getWidth()) {
-				x = Window.getWidth();
+			} else if (x >= Window.getWidth()) {
+				x = Window.getWidth() - 1;
 			}
 
 			if (y < 0) {
 				y = 0;
-			} else if (y > Window.getHeight()) {
-				y = Window.getHeight();
+			} else if (y >= Window.getHeight()) {
+				y = Window.getHeight() - 1;
 			}
 		}
 		if (readBuffer != null) read();

Update of /cvsroot/java-game-lib/LWJGL/src/native/common/fmod
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32461/src/native/common/fmod

Modified Files:
	extfmod.cpp extfmod.h org_lwjgl_fmod_FMOD.cpp 
	org_lwjgl_fmod_FMusic.cpp org_lwjgl_fmod_FSound.cpp 
Log Message:
Renamed fmod to fmod_instance

Index: extfmod.h
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/fmod/extfmod.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- extfmod.h	23 May 2004 14:03:07 -0000	1.1
+++ extfmod.h	23 May 2004 19:45:00 -0000	1.2
@@ -34,14 +34,14 @@
 #define _EXT_FMOD_H
 
 #include <jni.h>
-#include "../common_tools.h"
+#include "common_tools.h"
 
 #include "fmoddyn.h"
 #include "fmod_errors.h"
 
-extern FMOD_INSTANCE * fmod;
+extern FMOD_INSTANCE * fmod_instance;
 
 void fmod_create(char*);
 void fmod_destroy();
 
-#endif
\ No newline at end of file
+#endif

Index: extfmod.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/fmod/extfmod.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- extfmod.cpp	23 May 2004 14:46:07 -0000	1.2
+++ extfmod.cpp	23 May 2004 19:45:00 -0000	1.3
@@ -39,7 +39,7 @@
 #include "extfmod.h"
 
 /** Instance of fmod  */
-FMOD_INSTANCE * fmod = NULL;
+FMOD_INSTANCE * fmod_instance = NULL;
 
 #ifdef _WIN32
 /**
@@ -56,14 +56,14 @@
  * @param path path to try to load dll
  */
 void fmod_create(char* path) {
-  fmod = FMOD_CreateInstance(path);
+  fmod_instance = FMOD_CreateInstance(path);
 }
 
 /**
  * Destroys the fmod instance
  */
 void fmod_destroy() {
-  if (fmod != NULL) {
-    FMOD_FreeInstance(fmod);
+  if (fmod_instance != NULL) {
+    FMOD_FreeInstance(fmod_instance);
   }
 }

Index: org_lwjgl_fmod_FSound.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/fmod/org_lwjgl_fmod_FSound.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- org_lwjgl_fmod_FSound.cpp	23 May 2004 14:46:07 -0000	1.2
+++ org_lwjgl_fmod_FSound.cpp	23 May 2004 19:45:00 -0000	1.3
@@ -38,7 +38,7 @@
 * Signature: ()V
 */
 JNIEXPORT void JNICALL Java_org_lwjgl_fmod_FSound_FSOUND_1Close(JNIEnv * env, jclass clazz) {
-  fmod->FSOUND_Close();
+  fmod_instance->FSOUND_Close();
 }
 
 
@@ -58,7 +58,7 @@
 */
 JNIEXPORT jboolean JNICALL Java_org_lwjgl_fmod_FSound_FSOUND_1Init
[...1276 lines suppressed...]
+  return fmod_instance->FSOUND_Reverb_GetProperties((FSOUND_REVERB_PROPERTIES*) prop);
 }
 
 /*
@@ -1744,7 +1744,7 @@
 * Signature: (IJ)Z
 */
 JNIEXPORT jboolean JNICALL Java_org_lwjgl_fmod_FSound_nFSOUND_1Reverb_1SetChannelProperties(JNIEnv * env, jclass clazz, jint channel, jlong prop) {
-  return fmod->FSOUND_Reverb_SetChannelProperties(channel, (FSOUND_REVERB_CHANNELPROPERTIES*) prop);
+  return fmod_instance->FSOUND_Reverb_SetChannelProperties(channel, (FSOUND_REVERB_CHANNELPROPERTIES*) prop);
 }
 
 /*
@@ -1753,5 +1753,5 @@
 * Signature: (IJ)Z
 */
 JNIEXPORT jboolean JNICALL Java_org_lwjgl_fmod_FSound_nFSOUND_1Reverb_1GetChannelProperties(JNIEnv * env, jclass clazz, jint channel, jlong prop) {
-  return fmod->FSOUND_Reverb_GetChannelProperties(channel, (FSOUND_REVERB_CHANNELPROPERTIES*) prop);
+  return fmod_instance->FSOUND_Reverb_GetChannelProperties(channel, (FSOUND_REVERB_CHANNELPROPERTIES*) prop);
 }

Index: org_lwjgl_fmod_FMOD.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/fmod/org_lwjgl_fmod_FMOD.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- org_lwjgl_fmod_FMOD.cpp	23 May 2004 14:03:07 -0000	1.1
+++ org_lwjgl_fmod_FMOD.cpp	23 May 2004 19:45:00 -0000	1.2
@@ -50,19 +50,19 @@
  * Signature: ()V
  */
 JNIEXPORT void JNICALL Java_org_lwjgl_fmod_FMOD_nCreate(JNIEnv *env, jclass clazz, jobjectArray paths) {
-  jsize pathcount = env->GetArrayLength(paths);
+	jsize pathcount = env->GetArrayLength(paths);
 	for(int i=0;i<pathcount;i++) {
 		jstring path = (jstring) env->GetObjectArrayElement(paths, i);
 		char *path_str = (char *) env->GetStringUTFChars(path, NULL);
-		printfDebug("Trying to load fmod from %s\n", path_str);
-    fmod_create(path_str);
-    env->ReleaseStringUTFChars(path, path_str);
-    
-    if(fmod != NULL) {
-      return;
-    }
-  }
-  throwFMODException(env, "Unable to load fmod library");
+		printfDebug("Trying to load fmod_instance from %s\n", path_str);
+		fmod_create(path_str);
+		env->ReleaseStringUTFChars(path, path_str);
+
+		if(fmod_instance != NULL) {
+			return;
+		}
+	}
+	throwFMODException(env, "Unable to load fmod library");
 }
 
 /*
@@ -81,4 +81,4 @@
  */
 JNIEXPORT jstring JNICALL Java_org_lwjgl_fmod_FMOD_FMOD_1ErrorString(JNIEnv *env, jclass clazz, jint errorcode) {
   return env->NewStringUTF(FMOD_ErrorString(errorcode));  
-}
\ No newline at end of file
+}

Index: org_lwjgl_fmod_FMusic.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/fmod/org_lwjgl_fmod_FMusic.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- org_lwjgl_fmod_FMusic.cpp	23 May 2004 14:03:07 -0000	1.1
+++ org_lwjgl_fmod_FMusic.cpp	23 May 2004 19:45:00 -0000	1.2
@@ -40,7 +40,7 @@
  */
 JNIEXPORT jlong JNICALL Java_org_lwjgl_fmod_FMusic_nFMUSIC_1LoadSong(JNIEnv *env, jclass clazz, jstring name) {
   const char* filename = (const char*) (env->GetStringUTFChars(name, 0));
-  return (jlong) fmod->FMUSIC_LoadSong(filename);
+  return (jlong) fmod_instance->FMUSIC_LoadSong(filename);
 }
 
 /*
@@ -56,7 +56,7 @@
       sampleData = sampleListOffset + (int *) env->GetDirectBufferAddress(sampleList);
     }
     
-    return (jlong) fmod->FMUSIC_LoadSongEx(songData, offset, length, mode, sampleData, samplelistnum);
+    return (jlong) fmod_instance->FMUSIC_LoadSongEx(songData, offset, length, mode, sampleData, samplelistnum);
   }
   
 /*
@@ -71,7 +71,7 @@
     if(sampleList != NULL) {
       sampleData = sampleListOffset + (int *) env->GetDirectBufferAddress(sampleList);
     }
-    return (jlong) fmod->FMUSIC_LoadSongEx(filename, offset, length, mode, sampleData, samplelistnum);
+    return (jlong) fmod_instance->FMUSIC_LoadSongEx(filename, offset, length, mode, sampleData, samplelistnum);
   }
   
 
@@ -82,7 +82,7 @@
  */
 JNIEXPORT jint JNICALL Java_org_lwjgl_fmod_FMusic_nFMUSIC_1GetOpenState
   (JNIEnv *env, jclass clazz, jlong module){
-    return fmod->FMUSIC_GetOpenState((FMUSIC_MODULE *) module);
+    return fmod_instance->FMUSIC_GetOpenState((FMUSIC_MODULE *) module);
   }
 
 /*
@@ -92,7 +92,7 @@
  */
 JNIEXPORT jboolean JNICALL Java_org_lwjgl_fmod_FMusic_nFMUSIC_1FreeSong
   (JNIEnv *env, jclass clazz, jlong module){
-    return fmod->FMUSIC_FreeSong((FMUSIC_MODULE *) module);
+    return fmod_instance->FMUSIC_FreeSong((FMUSIC_MODULE *) module);
   }
 
 /*
@@ -102,7 +102,7 @@
  */
 JNIEXPORT jboolean JNICALL Java_org_lwjgl_fmod_FMusic_nFMUSIC_1PlaySong
   (JNIEnv *env, jclass clazz, jlong module){
-    return fmod->FMUSIC_PlaySong((FMUSIC_MODULE *) module);
+    return fmod_instance->FMUSIC_PlaySong((FMUSIC_MODULE *) module);
   }
 
 /*
@@ -112,7 +112,7 @@
  */
 JNIEXPORT jboolean JNICALL Java_org_lwjgl_fmod_FMusic_nFMUSIC_1StopSong
   (JNIEnv *env, jclass clazz, jlong module){
-    return fmod->FMUSIC_StopSong((FMUSIC_MODULE *) module);
+    return fmod_instance->FMUSIC_StopSong((FMUSIC_MODULE *) module);
   }
 
 /*
@@ -122,13 +122,13 @@
  */
 JNIEXPORT void JNICALL Java_org_lwjgl_fmod_FMusic_FMUSIC_1StopAllSongs
   (JNIEnv *env, jclass clazz){
-    return fmod->FMUSIC_StopAllSongs();
+    return fmod_instance->FMUSIC_StopAllSongs();
   }
 
 /*
  * Class:     org_lwjgl_fmod_FMusic
  * Method:    nFMUSIC_SetZxxCallback
- * Signature: (JLorg/lwjgl/fmod/FMusicCallback;)Z
+ * Signature: (JLorg/lwjgl/fmod_instance/FMusicCallback;)Z
  */
 JNIEXPORT jboolean JNICALL Java_org_lwjgl_fmod_FMusic_nFMUSIC_1SetZxxCallback
   (JNIEnv *env, jclass clazz, jlong, jobject){
@@ -139,7 +139,7 @@
 /*
  * Class:     org_lwjgl_fmod_FMusic
  * Method:    nFMUSIC_SetRowCallback
- * Signature: (JLorg/lwjgl/fmod/FMusicCallback;I)Z
+ * Signature: (JLorg/lwjgl/fmod_instance/FMusicCallback;I)Z
  */
 JNIEXPORT jboolean JNICALL Java_org_lwjgl_fmod_FMusic_nFMUSIC_1SetRowCallback
   (JNIEnv *env, jclass clazz, jlong, jobject, jint){
@@ -150,7 +150,7 @@
 /*
  * Class:     org_lwjgl_fmod_FMusic
  * Method:    nFMUSIC_SetOrderCallback
- * Signature: (JLorg/lwjgl/fmod/FMusicCallback;I)Z
+ * Signature: (JLorg/lwjgl/fmod_instance/FMusicCallback;I)Z
  */
 JNIEXPORT jboolean JNICALL Java_org_lwjgl_fmod_FMusic_nFMUSIC_1SetOrderCallback
   (JNIEnv *env, jclass clazz, jlong, jobject, jint){
@@ -161,7 +161,7 @@
 /*
  * Class:     org_lwjgl_fmod_FMusic
  * Method:    nFMUSIC_SetInstCallback
- * Signature: (JLorg/lwjgl/fmod/FMusicCallback;I)Z
+ * Signature: (JLorg/lwjgl/fmod_instance/FMusicCallback;I)Z
  */
 JNIEXPORT jboolean JNICALL Java_org_lwjgl_fmod_FMusic_nFMUSIC_1SetInstCallback
   (JNIEnv *env, jclass clazz, jlong, jobject, jint){
@@ -176,7 +176,7 @@
  */
 JNIEXPORT jboolean JNICALL Java_org_lwjgl_fmod_FMusic_nFMUSIC_1SetSample
   (JNIEnv *env, jclass clazz, jlong module, jint sampno, jlong sample){
-    return fmod->FMUSIC_SetSample((FMUSIC_MODULE *) module, sampno, (FSOUND_SAMPLE *) sample);
+    return fmod_instance->FMUSIC_SetSample((FMUSIC_MODULE *) module, sampno, (FSOUND_SAMPLE *) sample);
   }
 
 /*
@@ -197,7 +197,7 @@
  */
 JNIEXPORT jboolean JNICALL Java_org_lwjgl_fmod_FMusic_nFMUSIC_1OptimizeChannels
   (JNIEnv *env, jclass clazz, jlong module, jint max, jint min){
-    return fmod->FMUSIC_OptimizeChannels((FMUSIC_MODULE *) module, max, min);
+    return fmod_instance->FMUSIC_OptimizeChannels((FMUSIC_MODULE *) module, max, min);
   }
 
 /*
@@ -207,7 +207,7 @@
  */
 JNIEXPORT jboolean JNICALL Java_org_lwjgl_fmod_FMusic_FMUSIC_1SetReverb
   (JNIEnv *env, jclass clazz, jboolean reverb){
-    return fmod->FMUSIC_SetReverb(reverb);
+    return fmod_instance->FMUSIC_SetReverb(reverb);
   }
 
 /*
@@ -217,7 +217,7 @@
  */
 JNIEXPORT jboolean JNICALL Java_org_lwjgl_fmod_FMusic_nFMUSIC_1SetLooping
   (JNIEnv *env, jclass clazz, jlong module, jboolean looping){
-    return fmod->FMUSIC_SetLooping((FMUSIC_MODULE *) module, looping);
+    return fmod_instance->FMUSIC_SetLooping((FMUSIC_MODULE *) module, looping);
   }
 
 /*
@@ -227,7 +227,7 @@
  */
 JNIEXPORT jboolean JNICALL Java_org_lwjgl_fmod_FMusic_nFMUSIC_1SetOrder
   (JNIEnv *env, jclass clazz, jlong module, jint order){
-    return fmod->FMUSIC_SetOrder((FMUSIC_MODULE *) module, order);
+    return fmod_instance->FMUSIC_SetOrder((FMUSIC_MODULE *) module, order);
   }
 
 /*
@@ -237,7 +237,7 @@
  */
 JNIEXPORT jboolean JNICALL Java_org_lwjgl_fmod_FMusic_nFMUSIC_1SetPaused
   (JNIEnv *env, jclass clazz, jlong module, jboolean paused){
-    return fmod->FMUSIC_SetPaused((FMUSIC_MODULE *) module, paused);
+    return fmod_instance->FMUSIC_SetPaused((FMUSIC_MODULE *) module, paused);
   }
 
 /*
@@ -247,7 +247,7 @@
  */
 JNIEXPORT jboolean JNICALL Java_org_lwjgl_fmod_FMusic_nFMUSIC_1SetMasterVolume
   (JNIEnv *env, jclass clazz, jlong module, jint volume){
-    return fmod->FMUSIC_SetMasterVolume((FMUSIC_MODULE *) module, volume);
+    return fmod_instance->FMUSIC_SetMasterVolume((FMUSIC_MODULE *) module, volume);
   }
 
 /*
@@ -257,7 +257,7 @@
  */
 JNIEXPORT jboolean JNICALL Java_org_lwjgl_fmod_FMusic_nFMUSIC_1SetMasterSpeed
   (JNIEnv *env, jclass clazz, jlong module, jfloat speed){
-    return fmod->FMUSIC_SetMasterSpeed((FMUSIC_MODULE *) module, speed);
+    return fmod_instance->FMUSIC_SetMasterSpeed((FMUSIC_MODULE *) module, speed);
   }
 
 /*
@@ -267,7 +267,7 @@
  */
 JNIEXPORT jboolean JNICALL Java_org_lwjgl_fmod_FMusic_nFMUSIC_1SetPanSeperation
   (JNIEnv *env, jclass clazz, jlong module, jfloat pan){
-    return fmod->FMUSIC_SetPanSeperation((FMUSIC_MODULE *) module, pan);
+    return fmod_instance->FMUSIC_SetPanSeperation((FMUSIC_MODULE *) module, pan);
   }
 
 /*
@@ -277,7 +277,7 @@
  */
 JNIEXPORT jstring JNICALL Java_org_lwjgl_fmod_FMusic_nFMUSIC_1GetName
   (JNIEnv *env, jclass clazz, jlong module) {
-    const char * name = fmod->FMUSIC_GetName((FMUSIC_MODULE *) module);
+    const char * name = fmod_instance->FMUSIC_GetName((FMUSIC_MODULE *) module);
     return env->NewStringUTF(name);
   }
 
@@ -288,7 +288,7 @@
  */
 JNIEXPORT jint JNICALL Java_org_lwjgl_fmod_FMusic_nFMUSIC_1GetType
   (JNIEnv *env, jclass clazz, jlong module){
-    return fmod->FMUSIC_GetType((FMUSIC_MODULE *) module);
+    return fmod_instance->FMUSIC_GetType((FMUSIC_MODULE *) module);
   }
 
 /*
@@ -298,7 +298,7 @@
  */
 JNIEXPORT jint JNICALL Java_org_lwjgl_fmod_FMusic_nFMUSIC_1GetNumOrders
   (JNIEnv *env, jclass clazz, jlong module){
-    return fmod->FMUSIC_GetNumOrders((FMUSIC_MODULE *) module);
+    return fmod_instance->FMUSIC_GetNumOrders((FMUSIC_MODULE *) module);
   }
 
 /*
@@ -308,7 +308,7 @@
  */
 JNIEXPORT jint JNICALL Java_org_lwjgl_fmod_FMusic_nFMUSIC_1GetNumPatterns
   (JNIEnv *env, jclass clazz, jlong module){
-    return fmod->FMUSIC_GetNumPatterns((FMUSIC_MODULE *) module);
+    return fmod_instance->FMUSIC_GetNumPatterns((FMUSIC_MODULE *) module);
   }
 
 /*
@@ -318,7 +318,7 @@
  */
 JNIEXPORT jint JNICALL Java_org_lwjgl_fmod_FMusic_nFMUSIC_1GetNumInstruments
   (JNIEnv *env, jclass clazz, jlong module){
-    return fmod->FMUSIC_GetNumInstruments((FMUSIC_MODULE *) module);
+    return fmod_instance->FMUSIC_GetNumInstruments((FMUSIC_MODULE *) module);
   }
 
 /*
@@ -328,7 +328,7 @@
  */
 JNIEXPORT jint JNICALL Java_org_lwjgl_fmod_FMusic_nFMUSIC_1GetNumSamples
   (JNIEnv *env, jclass clazz, jlong module){
-    return fmod->FMUSIC_GetNumSamples((FMUSIC_MODULE *) module);
+    return fmod_instance->FMUSIC_GetNumSamples((FMUSIC_MODULE *) module);
   }
 
 /*
@@ -338,7 +338,7 @@
  */
 JNIEXPORT jint JNICALL Java_org_lwjgl_fmod_FMusic_nFMUSIC_1GetNumChannels
   (JNIEnv *env, jclass clazz, jlong module){
-    return fmod->FMUSIC_GetNumChannels((FMUSIC_MODULE *) module);
+    return fmod_instance->FMUSIC_GetNumChannels((FMUSIC_MODULE *) module);
   }
 
 /*
@@ -348,7 +348,7 @@
  */
 JNIEXPORT jlong JNICALL Java_org_lwjgl_fmod_FMusic_nFMUSIC_1GetSample
   (JNIEnv *env, jclass clazz, jlong module, jint sampleno){
-    return (jlong) fmod->FMUSIC_GetSample((FMUSIC_MODULE *) module, sampleno);
+    return (jlong) fmod_instance->FMUSIC_GetSample((FMUSIC_MODULE *) module, sampleno);
   }
 
 /*
@@ -358,7 +358,7 @@
  */
 JNIEXPORT jint JNICALL Java_org_lwjgl_fmod_FMusic_nFMUSIC_1GetPatternLength
   (JNIEnv *env, jclass clazz, jlong module, jint orderno){
-    return fmod->FMUSIC_GetPatternLength((FMUSIC_MODULE *) module, orderno);
+    return fmod_instance->FMUSIC_GetPatternLength((FMUSIC_MODULE *) module, orderno);
   }
 
 /*
@@ -368,7 +368,7 @@
  */
 JNIEXPORT jboolean JNICALL Java_org_lwjgl_fmod_FMusic_nFMUSIC_1IsFinished
   (JNIEnv *env, jclass clazz, jlong module){
-    return fmod->FMUSIC_IsFinished((FMUSIC_MODULE *) module);
+    return fmod_instance->FMUSIC_IsFinished((FMUSIC_MODULE *) module);
   }
 
 /*
@@ -378,7 +378,7 @@
  */
 JNIEXPORT jboolean JNICALL Java_org_lwjgl_fmod_FMusic_nFMUSIC_1IsPlaying
   (JNIEnv *env, jclass clazz, jlong module){
-    return fmod->FMUSIC_IsPlaying((FMUSIC_MODULE *) module);
+    return fmod_instance->FMUSIC_IsPlaying((FMUSIC_MODULE *) module);
   }
 
 /*
@@ -388,7 +388,7 @@
  */
 JNIEXPORT jint JNICALL Java_org_lwjgl_fmod_FMusic_nFMUSIC_1GetMasterVolume
   (JNIEnv *env, jclass clazz, jlong module){
-    return fmod->FMUSIC_GetMasterVolume((FMUSIC_MODULE *) module);
+    return fmod_instance->FMUSIC_GetMasterVolume((FMUSIC_MODULE *) module);
   }
 
 /*
@@ -398,7 +398,7 @@
  */
 JNIEXPORT jint JNICALL Java_org_lwjgl_fmod_FMusic_nFMUSIC_1GetGlobalVolume
   (JNIEnv *env, jclass clazz, jlong module){
-    return fmod->FMUSIC_GetGlobalVolume((FMUSIC_MODULE *) module);
+    return fmod_instance->FMUSIC_GetGlobalVolume((FMUSIC_MODULE *) module);
   }
 
 /*
@@ -408,7 +408,7 @@
  */
 JNIEXPORT jint JNICALL Java_org_lwjgl_fmod_FMusic_nFMUSIC_1GetOrder
   (JNIEnv *env, jclass clazz, jlong module){
-    return fmod->FMUSIC_GetOrder((FMUSIC_MODULE *) module);
+    return fmod_instance->FMUSIC_GetOrder((FMUSIC_MODULE *) module);
   }
 
 /*
@@ -418,7 +418,7 @@
  */
 JNIEXPORT jint JNICALL Java_org_lwjgl_fmod_FMusic_nFMUSIC_1GetPattern
   (JNIEnv *env, jclass clazz, jlong module){
-    return fmod->FMUSIC_GetPattern((FMUSIC_MODULE *) module);
+    return fmod_instance->FMUSIC_GetPattern((FMUSIC_MODULE *) module);
   }
 
 /*
@@ -428,7 +428,7 @@
  */
 JNIEXPORT jint JNICALL Java_org_lwjgl_fmod_FMusic_nFMUSIC_1GetSpeed
   (JNIEnv *env, jclass clazz, jlong module){
-    return fmod->FMUSIC_GetSpeed((FMUSIC_MODULE *) module);
+    return fmod_instance->FMUSIC_GetSpeed((FMUSIC_MODULE *) module);
   }
 
 /*
@@ -438,7 +438,7 @@
  */
 JNIEXPORT jint JNICALL Java_org_lwjgl_fmod_FMusic_nFMUSIC_1GetBPM
   (JNIEnv *env, jclass clazz, jlong module){
-    return fmod->FMUSIC_GetBPM((FMUSIC_MODULE *) module);
+    return fmod_instance->FMUSIC_GetBPM((FMUSIC_MODULE *) module);
   }
 
 /*
@@ -448,7 +448,7 @@
  */
 JNIEXPORT jint JNICALL Java_org_lwjgl_fmod_FMusic_nFMUSIC_1GetRow
   (JNIEnv *env, jclass clazz, jlong module){
-    return fmod->FMUSIC_GetRow((FMUSIC_MODULE *) module);
+    return fmod_instance->FMUSIC_GetRow((FMUSIC_MODULE *) module);
   }
 
 /*
@@ -458,7 +458,7 @@
  */
 JNIEXPORT jboolean JNICALL Java_org_lwjgl_fmod_FMusic_nFMUSIC_1GetPaused
   (JNIEnv *env, jclass clazz, jlong module){
-    return fmod->FMUSIC_GetPaused((FMUSIC_MODULE *) module);
+    return fmod_instance->FMUSIC_GetPaused((FMUSIC_MODULE *) module);
   }
 
 /*
@@ -468,7 +468,7 @@
  */
 JNIEXPORT jint JNICALL Java_org_lwjgl_fmod_FMusic_nFMUSIC_1GetTime
   (JNIEnv *env, jclass clazz, jlong module){
-    return fmod->FMUSIC_GetTime((FMUSIC_MODULE *) module);
+    return fmod_instance->FMUSIC_GetTime((FMUSIC_MODULE *) module);
   }
 
 /*
@@ -478,7 +478,7 @@
  */
 JNIEXPORT jint JNICALL Java_org_lwjgl_fmod_FMusic_nFMUSIC_1GetRealChannel
   (JNIEnv *env, jclass clazz, jlong module, jint modchannel){
-    return fmod->FMUSIC_GetRealChannel((FMUSIC_MODULE *) module, modchannel);
+    return fmod_instance->FMUSIC_GetRealChannel((FMUSIC_MODULE *) module, modchannel);
   }
 
 /*

Update of /cvsroot/java-game-lib/LWJGL/src/native/common
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24974/src/native/common

Modified Files:
	Makefile.am 
Log Message:
Fixed bug in Window.cpp

Index: Makefile.am
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/Makefile.am,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- Makefile.am	26 Feb 2004 21:51:58 -0000	1.20
+++ Makefile.am	23 May 2004 19:08:03 -0000	1.21
@@ -1,19 +1,22 @@
-noinst_LTLIBRARIES = libcommon.la
+noinst_LTLIBRARIES = libcommon.la libtools.la
 
 SUBDIRS = arb ati ext nv
 
 libcommon_la_SOURCES = $(COMMON)
 libcommon_la_LIBADD = $(DEP_LIBS)
 libcommon_la_DEPENDENCIES = $(DEP_LIBS)
-DEP_LIBS=arb/libarb.la ati/libati.la ext/libext.la nv/libnv.la
+libtools_la_SOURCES = $(TOOLS)
+DEP_LIBS=libtools.la arb/libarb.la ati/libati.la ext/libext.la nv/libnv.la
+
+TOOLS = \
+  common_tools.cpp \
+  common_tools.h
 
 COMMON = \
   extal.cpp \
   extal.h \
   extgl.cpp \
   extgl.h \
-  common_tools.cpp \
-  common_tools.h \
   org_lwjgl_Display.h \
   org_lwjgl_Sys.h \
   org_lwjgl_input_GamePad.h \

Update of /cvsroot/java-game-lib/LWJGL/src/native/common/fmod
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24974/src/native/common/fmod

Added Files:
	Makefile.am 
Log Message:
Fixed bug in Window.cpp

--- NEW FILE: Makefile.am ---
lib_LTLIBRARIES = liblwjgl-fmod.la
liblwjgl_fmod_la_SOURCES = $(FMOD_SOURCE)
liblwjgl_fmod_la_LIBADD = $(DEP_LIBS)
liblwjgl_fmod_la_DEPENDENCIES = $(DEP_LIBS)
INCLUDES = -I..
DEP_LIBS = ../libtools.la

FMOD_SOURCE = extfmod.cpp \
              org_lwjgl_fmod_FMOD.cpp \
              org_lwjgl_fmod_FMusic.cpp \
              org_lwjgl_fmod_FSound.cpp

Update of /cvsroot/java-game-lib/LWJGL/src/native/linux
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24974/src/native/linux

Modified Files:
	org_lwjgl_opengl_Window.cpp 
Log Message:
Fixed bug in Window.cpp

Index: org_lwjgl_opengl_Window.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/linux/org_lwjgl_opengl_Window.cpp,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -d -r1.45 -r1.46
--- org_lwjgl_opengl_Window.cpp	11 May 2004 20:34:47 -0000	1.45
+++ org_lwjgl_opengl_Window.cpp	23 May 2004 19:08:16 -0000	1.46
@@ -504,6 +504,8 @@
 		return false;
 	}
 	bool window_created = createWindow(env, screen, vis_info, title, x, y, width, height, fscreen, undecorated);
+	if (isDebugEnabled())
+		dumpVisualInfo(vis_info);
 	XFree(vis_info);
 	if (!window_created) {
 		glXDestroyContext(getDisplay(), context);
@@ -512,8 +514,6 @@
 	}
 	glx_window = glXCreateWindow(getDisplay(), configs[0], getCurrentWindow(), NULL);
 	makeCurrent();
-	if (isDebugEnabled())
-		dumpVisualInfo(vis_info);
 	XFree(configs);
 	if (!checkXError(env)) {
 		glXDestroyWindow(getDisplay(), glx_window);

Update of /cvsroot/java-game-lib/LWJGL/src/native/common/ext
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22601/src/native/common/ext

Modified Files:
	org_lwjgl_opengl_EXTBlendEquationSeparate.cpp 
Log Message:
Improved stability of ext_ResetClass and ext_InitializeClass

Index: org_lwjgl_opengl_EXTBlendEquationSeparate.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/ext/org_lwjgl_opengl_EXTBlendEquationSeparate.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- org_lwjgl_opengl_EXTBlendEquationSeparate.cpp	18 May 2004 20:57:35 -0000	1.1
+++ org_lwjgl_opengl_EXTBlendEquationSeparate.cpp	23 May 2004 18:57:04 -0000	1.2
@@ -59,4 +59,4 @@
 	jclass clazz = ext_ResetClass(env, "org/lwjgl/opengl/EXTBlendEquationSeparate");
 	if (extgl_Extensions.GL_EXT_blend_equation_separate)
 		extgl_InitializeClass(env, clazz, ext_set, "GL_EXT_blend_equation_separate", num_functions, functions);
-}
\ No newline at end of file
+}

Update of /cvsroot/java-game-lib/LWJGL/src/native/common
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22601/src/native/common

Modified Files:
	common_tools.cpp extgl.cpp 
Log Message:
Improved stability of ext_ResetClass and ext_InitializeClass

Index: extgl.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/extgl.cpp,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- extgl.cpp	18 May 2004 20:55:56 -0000	1.36
+++ extgl.cpp	23 May 2004 18:57:04 -0000	1.37
@@ -726,7 +726,6 @@
 	extgl_InitSupportedExtensions(env, ext_set);
 
 	//extgl_InitEXTNurbsTesselator(env, ext_set);
-
 	/* first load the extensions */
 	extgl_InitARBBufferObject(env, ext_set);
 	extgl_InitARBImaging(env, ext_set);
@@ -781,7 +780,7 @@
 	extgl_InitATIVertexAttribArrayObject(env, ext_set);
 	extgl_InitATIVertexStreams(env, ext_set);
 
-   /* now load core opengl */
+	/* now load core opengl */
 	extgl_InitOpenGL1_2(env, ext_set);
 	extgl_InitOpenGL1_3(env, ext_set);
 	extgl_InitOpenGL1_4(env, ext_set);

Index: common_tools.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/common_tools.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- common_tools.cpp	23 May 2004 13:50:08 -0000	1.19
+++ common_tools.cpp	23 May 2004 18:57:02 -0000	1.20
@@ -132,7 +132,7 @@
 		return;
 	jstring ext_string = env->NewStringUTF(ext);
 	if (ext_string == NULL) {
-		printf("Could not allocate java string from %s\n", ext);
+		printfDebug("Could not allocate java string from %s\n", ext);
 		return;
 	}
 	env->CallBooleanMethod(ext_set, id, ext_string);
@@ -144,6 +144,8 @@
 
 jclass ext_ResetClass(JNIEnv *env, const char *class_name) {
 	jclass clazz = env->FindClass(class_name);
+	if (clazz == NULL)
+		return NULL;
 	jint result = env->UnregisterNatives(clazz);
 	if (result != 0)
 		printfDebug("Could not unregister natives for class %s\n", class_name);
@@ -165,6 +167,8 @@
 }
 
 bool ext_InitializeClass(JNIEnv *env, jclass clazz, jobject ext_set, const char *ext_name, ExtGetProcAddressPROC gpa, int num_functions, JavaMethodAndExtFunction *functions) {
+	if (clazz == NULL)
+		return false;
 	JNINativeMethod *methods = (JNINativeMethod *)malloc(num_functions*sizeof(JNINativeMethod));
 	for (int i = 0; i < num_functions; i++) {
 		JavaMethodAndExtFunction *function = functions + i;

Update of /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/fmod
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31505/java/org/lwjgl/fmod

Modified Files:
	FMOD.java FSound.java 
Log Message:
miscellaneous javadoc fixes

Index: FMOD.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/fmod/FMOD.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- FMOD.java	23 May 2004 14:03:05 -0000	1.1
+++ FMOD.java	23 May 2004 17:14:44 -0000	1.2
@@ -277,8 +277,6 @@
 
 	/**
    * Native method to create FMOD instance
-   * 
-   * @return true if the FMOD creation process succeeded
    */
   protected static native void nCreate(String[] paths);
   

Index: FSound.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/fmod/FSound.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- FSound.java	23 May 2004 14:03:06 -0000	1.1
+++ FSound.java	23 May 2004 17:14:44 -0000	1.2
@@ -345,7 +345,11 @@
    * PlayStation 2 NOTE! This function takes IOP function pointers, not EE pointers! It is for custom IOP file systems not EE based ones.
    * This function can only be called after FSOUND_Init on PlayStation 2, not before
    * </p>
-   * @param callback
+   * @param open Open callback
+   * @param close Close callback
+   * @param read Read callback
+   * @param seek Seek callback
+   * @param tell Tell callback
    */
 	public static void FSOUND_File_SetCallbacks(
       FSoundOpenCallback open, FSoundCloseCallback close, FSoundReadCallback read,
@@ -916,13 +920,13 @@
    * </p> 
    * @param index Sample pool index. See remarks for more on the sample pool.
    * 0 or above - The absolute index into the sample pool. The pool will grow as the index gets larger. If a slot is already used it will be replaced.
-   * FSOUND_FREE - Let FSOUND select an arbitrary sample slot. 
+   * FSOUND_FREE - Let FSOUND select an arbitrary sample slot.
    * FSOUND_UNMANAGED - Dont have this sample managed within fsounds sample management system
-   * @param data Name of sound file or ByteBuffer to memory image to load.
-   * @param inputmode Description of the data format, OR in the bits defined in FSOUND_MODES to describe the data being loaded
-   * @param offset Optional. 0 by default. If &lt; 0, this value is used to specify an offset in a file, so fmod will seek before opening. length must also be specified if this value is used
-   * @param length Optional. 0 by default. If &lt; 0, this value is used to specify the length of a memory block when using FSOUND_LOADMEMORY, or it is the length of a file or file segment if the offset parameter is used. On PlayStation 2 this must be 16 byte aligned for memory loading
-   * @return
+   * @param name_or_data Name of sound file or pointer to memory image to load.
+   * @param inputmode Description of the data format, OR in the bits defined in FSOUND_MODES to describe the data being loaded.
+   * @param offset Optional. 0 by default. If > 0, this value is used to specify an offset in a file, so fmod will seek before opening. length must also be specified if this value is used.
+   * @param length Optional. 0 by default. If > 0, this value is used to specify the length of a memory block when using FSOUND_LOADMEMORY, or it is the length of a file or file segment if the offset parameter is used. On PlayStation 2 this must be 16 byte aligned for memory loading.
+   * @return On success, a sample is returned. On failure, NULL is returned.
    */
   public static FSoundSample FSOUND_Sample_Load(int index, ByteBuffer name_or_data, int inputmode, int offset, int length) {
     long result = 0;
@@ -955,7 +959,7 @@
    * @param sample sample definition
    * @param offset Offset in BYTES to the position you want to lock in the sample buffer.
    * @param length Number of BYTES you want to lock in the sample buffer.
-   * @param Sample lock object to contain lock info
+   * @param lock lock object to contain lock info
    * @return On success, true is is returned. On failure, false is returned.
    */
   public static boolean FSOUND_Sample_Lock(FSoundSample sample, int offset, int length, FSoundSampleLock lock) {
@@ -1396,7 +1400,7 @@
    * @param surround Toggle value - TRUE enables surround sound on the channel, FALSE disables it. 
    * @return On success, TRUE is returned. On failure, FALSE is returned
    */
-  public static native boolean FSOUND_SetSurround(int channel, boolean sorround);  
+  public static native boolean FSOUND_SetSurround(int channel, boolean surround);  
   
   /**
    * Sets a channels volume linearly.
@@ -1518,7 +1522,7 @@
    * @param offset The offset in SAMPLES from the start of the sound for the position to be set to.
    * @return On success, TRUE is returned. On failure, FALSE is returned.
    */
-  public static native boolean FSOUND_SetCurrentPosition(int channel, int pos);  
+  public static native boolean FSOUND_SetCurrentPosition(int channel, int offset);  
   
   /**
    * Returns the current playcursor position of the specified channel
@@ -1581,7 +1585,7 @@
    * <b>Remarks</b>
    * This works for all channel types, whereas setting it will not work.
    * </p>
-   * @param The channel number/handle to get the loop mode from.
+   * @param channel The channel number/handle to get the loop mode from.
    * @return On success, the loop mode is returned. On failure, 0 is returned.
    */
   public static native int FSOUND_GetLoopMode(int channel);
@@ -1712,7 +1716,7 @@
    * Returns the current min and max distance for a channel
    * 
    * @param channel Channel number/handle to retrieve min and max distance from.
-   * @param min_max_dist FloatBuffer to store min/max -distance.
+   * @param minmax FloatBuffer to store min/max -distance.
    * @return On success, TRUE is returned. On failure, FALSE is returned.
    */
   public static boolean FSOUND_3D_GetMinMaxDistance(int channel, FloatBuffer minmax) {
@@ -1925,7 +1929,7 @@
    * NOTE: FMOD will always try to use native NTSCSI support to communicate with CD devices before trying to use ASPI. If FMOD is using ASPI then it can only access the first CD device it finds.
    * </p>
    * 
-   * @param name_or_data Name of the file to open, or pointer to data if FSOUND_LOADMEMORY is used.
+   * @param name Name of the file to open, or pointer to data if FSOUND_LOADMEMORY is used.
    * @param mode Simple description of how to play the file. For all formats except raw PCM,
    * FSOUND_LOOP*, FSOUND_HW3D, FSOUND_HW2D, FSOUND_2D, FSOUND_LOADMEMORY, FSOUND_LOADRAW, FSOUND_MPEGACCURATE, FSOUND_NONBLOCKING flags are the only ones supported.
    * @param offset Optional. 0 by default. If > 0, this value is used to specify an offset in a file, so fmod will seek before opening. length must also be specified if this value is used.
@@ -1939,6 +1943,16 @@
     }
     return null;    
   }
+  
+  /**
+   * @see #FSOUND_Stream_Open(String, int, int, int)
+   * @param data data when FSOUND_LOADMEMORY is used.
+   * @param mode Simple description of how to play the file. For all formats except raw PCM,
+   * FSOUND_LOOP*, FSOUND_HW3D, FSOUND_HW2D, FSOUND_2D, FSOUND_LOADMEMORY, FSOUND_LOADRAW, FSOUND_MPEGACCURATE, FSOUND_NONBLOCKING flags are the only ones supported.
+   * @param offset Optional. 0 by default. If > 0, this value is used to specify an offset in a file, so fmod will seek before opening. length must also be specified if this value is used.
+   * @param length Optional. 0 by default. If > 0, this value is used to specify the length of a memory block when using FSOUND_LOADMEMORY, or it is the length of a file or file segment if the offset parameter is used. On PlayStation 2 this must be 16 byte aligned for memory loading.
+   * @return On success, a reference to an opened stream is returned. On failure, NULL is returned. 
+   */  
   public static FSoundStream FSOUND_Stream_Open(ByteBuffer data, int mode, int offset, int length) {
     long result = nFSOUND_Stream_Open(data, data.position(), mode, offset, length);
     if(result != 0) {
@@ -2070,9 +2084,10 @@
    * 'lenbytes' may be rounded down to the nearest sample alignment in bytes. Ie if you specified 1001 bytes for a 16bit stereo sample stream, len would return 1000 in the callback. (250 samples * 4 bytes per sample)
    * PlayStation 2 IMPORTANT! : if FSOUND_SendData is NOT called from the stream callback the IOP will hang because it is waiting for this command to be executed before it can unlock its buffer.
    * </p>
-   * @param stream The stream to add a sync point to.
-   * @param pcmoffset Offset in SAMPLES (not bytes).
-   * @param name The name of the syncpoint, which will be passed into the sync callback when it is triggered.
+   * @param callbackHandler FSoundStreamCallback to be called back
+   * @param lenbytes Size of the data in BYTES the callback will require to be written to the buffer.
+   * @param mode Description of the raw sample data being opened. see FSOUND_MODES for a description of these modes.
+   * @param samplerate Rate of playback. Be careful you dont set the sample rate too high so that the stream servicer (ie the harddisk) may not keep up.
    * @return On success, a sync point handle is returned. On failure, NULL is returned.
    */
   public static FSoundStream FSOUND_Stream_Create(FSoundStreamCallback callbackHandler, int lenbytes, int mode, int samplerate) {
@@ -2291,8 +2306,9 @@
    * <b>Remarks</b>
    * Do not attempt to modify or free any pointers returned by this function.
    * If this function returns successfully, "value" will contain a pointer to a piece of tag-field-specific data - do not assume it will always point to a null-terminated ASCII string.
-   * @param point handle to the sync point to retrieve information from
-   * @param pcmoffset An IntBuffer that will receive the sync point offset in pcm SAMPLES. A value of NULL will be ignored 
+   * @param stream The stream to get the tag field from.
+   * @param num The number of the tag field to retrieve.
+   * @param field TagField to receive data
    * @return On success, TRUE is returned. On failure, FALSE is returned. 
    */
   public static boolean FSOUND_Stream_GetTagField(FSoundStream stream, int num, FSoundTagField field) {
@@ -2848,8 +2864,15 @@
    * system units take cpu-wise, by turning them on and off and seeing how they affect 
    * performance.
    * </p>
-   * @param stream to have its position set
-   * @param index The index of the stream within the FSB file   
+   * @param callbackHandler This is a reference to your DSP Unit callback, of type FSOUND_DSPCALLBACK.
+   * The prototype for a callback is declared in the following fashion.
+   * Callbacks must return a pointer to the buffer you work on, so that
+   * the next dsp unit can work on it. 
+   * See the definition of FSOUND_DSPCALLBACK for more.
+   * @param priority Order in the priority chain. Valid numbers are 0 to 1000, 0 being
+   * highest priority (first), with 1000 being lowest priority (last).
+   * Note that FSOUNDs soundeffects mixers and copy routines are considered
+   * part of this DSP unit chain which you can play with. 
    * @return On success, a new valid DSP unit is returned. On failure, NULL is returned.
    */
   public static FSoundDSPUnit FSOUND_DSP_Create(FSoundDSPCallback callbackHandler, int priority) {
@@ -3132,7 +3155,7 @@
    * </p>
    * 
    * @param channel Channel number/handle to disable all fx for 
-   * @param fx A single fx enum value to enable certain effects. 
+   * @param fxtype A single fx enum value to enable certain effects. 
    * @return On success, an FX id is returned. On failure, -1 is returned 
    */
   public static native int FSOUND_FX_Enable(int channel, int fxtype);  
@@ -3381,7 +3404,11 @@
    * To counter this you might adjust the playback frequency of the channel you are playing the record sample on while it plays, using FSOUND_GetCurrentPosition and FSOUND_Record_GetPosition as calibration points.
    * In the recording sample there is an example of trying to play back sound as it records, and the mechanism to try and keep the 2 cursors a safe distance from each other is employed.
    * </p>
-   * @param reverb reference to a FSoundReverbProperties.
+   * @param sample The sample to record into.
+   * @param loop TRUE or FALSE flag whether the recorder should keep recording once it has hit the end,
+   * and start from the start again, therefore creating a continuous recording session into that
+   * sample buffer. Looping the recording buffer is good for realtime processing of recorded
+   * information, as you can record and playback the sample at the same time.
    * @return TRUE or FALSE flag whether the recorder should keep recording once it has hit the end, 
    * and start from the start again, therefore creating a continuous recording session into that 
    * sample buffer. Looping the recording buffer is good for realtime processing of recorded

Update of /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/openal
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31505/java/org/lwjgl/openal

Modified Files:
	AL.java 
Log Message:
miscellaneous javadoc fixes

Index: AL.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/openal/AL.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- AL.java	5 May 2004 14:28:39 -0000	1.23
+++ AL.java	23 May 2004 17:14:44 -0000	1.24
@@ -84,7 +84,6 @@
 	 * Native method to create AL instance
 	 * 
 	 * @param oalPaths Array of strings containing paths to search for OpenAL library
-	 * @return true if the AL creation process succeeded
 	 */
 	protected static native void nCreate(String[] oalPaths) throws LWJGLException;
 

Update of /cvsroot/java-game-lib/LWJGL
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16980

Modified Files:
	build.xml 
Log Message:
build fmod archives too
add lwjgl-fmod to binary distribution

Index: build.xml
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/build.xml,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- build.xml	23 May 2004 14:46:06 -0000	1.23
+++ build.xml	23 May 2004 16:07:33 -0000	1.24
@@ -39,6 +39,13 @@
 		<include name="org/lwjgl/util/**"/>
 	</fileset>
 	
+	<!-- Files to include in the lwjgl_fmod.jar file -->
+	<fileset id="lwjgl_fmod.fileset" dir="${lwjgl.bin}">
+		<exclude name="**.*"/>
+		<include name="org/lwjgl/fmod/**"/>
+	</fileset>
+	
+	
 	<!-- Files to make Javadoc from -->
 	<fileset id="lwjgl.javadoc.fileset" dir="${lwjgl.src}/java">
 		<include name="**/*.java" />
@@ -57,6 +64,7 @@
 	<patternset id="lwjgl-win32.fileset">
 		<patternset refid="lwjgl-common.fileset"/>
 		<include name="lwjgl.dll"/>
+		<include name="lwjgl-fmod.dll"/>		
 		<include name="lwjglaudio.dll"/>
 	</patternset>  
   
@@ -64,6 +72,7 @@
 	<patternset id="lwjgl-linux.fileset">
 		<patternset refid="lwjgl-common.fileset"/>
 		<include name="liblwjgl.so"/>
+		<include name="liblwjgl-fmod.so"/>		
 		<include name="libopenal.so"/>
 	</patternset>  
 	
@@ -71,6 +80,7 @@
 	<patternset id="lwjgl-macosx.fileset">
 		<patternset refid="lwjgl-common.fileset"/>
 		<include name="liblwjgl.jnilib"/>
+		<include name="liblwjgl-fmod.jnilib"/>		
 		<include name="openal.dylib"/>
 	</patternset>	
 	
@@ -156,6 +166,7 @@
 		<javac srcdir="${lwjgl.src}/java/" destdir="${lwjgl.bin}" includes="org/lwjgl/openal/**" source="1.4" taskname="openal"/>
 		<javac srcdir="${lwjgl.src}/java/" destdir="${lwjgl.bin}" includes="org/lwjgl/opengl/**" source="1.4" taskname="opengl"/>
 		<javac srcdir="${lwjgl.src}/java/" destdir="${lwjgl.bin}" includes="org/lwjgl/vector/**" source="1.4" taskname="vector"/>
+		<javac srcdir="${lwjgl.src}/java/" destdir="${lwjgl.bin}" includes="org/lwjgl/fmod/**" source="1.4" taskname="fmod"/>
 		<javac srcdir="${lwjgl.src}/java/" destdir="${lwjgl.bin}" includes="org/lwjgl/test/**" source="1.4" taskname="test"/>
 		<javac srcdir="${lwjgl.src}/java/" destdir="${lwjgl.bin}" includes="org/lwjgl/util/**" source="1.4" taskname="util"/>
 	</target>
@@ -223,6 +234,11 @@
 		<jar destfile="${lwjgl.lib}/lwjgl_util.jar" taskname="lwjgl_util.jar">
 			<fileset refid="lwjgl_util.fileset"/>
 		</jar>		
+		
+		<!-- Create lwjgl_fmod.jar -->
+		<jar destfile="${lwjgl.lib}/lwjgl_fmod.jar" taskname="lwjgl_fmod.jar">
+			<fileset refid="lwjgl_fmod.fileset"/>
+		</jar>		
 	</target>
   
 	<!-- Creates the Javadoc -->
@@ -230,7 +246,7 @@
 		<javadoc destdir="${lwjgl.docs}/javadoc" author="true" version="true" use="true" source="1.4" windowtitle="LWJGL API">
 			<fileset refid="lwjgl.javadoc.fileset"/>
 			<doctitle><![CDATA[<h1>Lightweight Java Game Toolkit</h1>]]></doctitle>
-			<bottom><![CDATA[<i>Copyright &#169; 2003 lwjgl.org. All Rights Reserved.</i>]]></bottom>
+			<bottom><![CDATA[<i>Copyright &#169; 2003-2004 lwjgl.org. All Rights Reserved.</i>]]></bottom>
 		</javadoc>
 	</target>  
   
@@ -283,7 +299,7 @@
 			<class name="org.lwjgl.fmod.FMOD"/>
 			<class name="org.lwjgl.fmod.FMusic"/>
 			<class name="org.lwjgl.fmod.FSound"/>
-                </javah>
+		</javah>
 	</target>
   
 	<!-- Creates a versioned distribution for all supported platforms -->

Update of /cvsroot/java-game-lib/LWJGL/src/native/linux
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10485/src/native/linux

Modified Files:
	org_lwjgl_input_Cursor.cpp 
Log Message:
Added a tool to simplify creating dynamically loaded native stubs

Index: org_lwjgl_input_Cursor.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/linux/org_lwjgl_input_Cursor.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- org_lwjgl_input_Cursor.cpp	12 Apr 2004 00:33:00 -0000	1.10
+++ org_lwjgl_input_Cursor.cpp	23 May 2004 15:35:09 -0000	1.11
@@ -75,7 +75,7 @@
 	}
 	Cursor cursor = XcursorImagesLoadCursor(disp, cursor_images);
 	XcursorImagesDestroy(cursor_images);
-	return cursor;
+	return (jlong)cursor;
 }
 
 /*

Update of /cvsroot/java-game-lib/LWJGL
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10485

Added Files:
	SignatureDump.java 
Log Message:
Added a tool to simplify creating dynamically loaded native stubs

--- NEW FILE: SignatureDump.java ---
import java.lang.reflect.*;

public final class SignatureDump {
	public final static void main(String[] args) {
		String class_name = args[0];
		try {
			Class clazz = Class.forName(class_name);
			Method[] methods = clazz.getDeclaredMethods();
			System.out.println("\tJavaMethodAndExtFunction functions[] = {");
			for (int i = 0; i < methods.length; i++) {
				Method method = methods[i];
				int modifiers = method.getModifiers();
				if (!Modifier.isNative(modifiers))
					continue;
				System.out.print("\t\t");
				System.out.print("{\"");
				System.out.print(method.getName());
				System.out.print("\", \"");
				System.out.print(getMethodSignature(method));
				System.out.print("\", (void*)&");
				System.out.print(getMethodMangled(class_name, method));
				System.out.print(", ");
				String gl_name = getExtFunctionName(method);
				if (gl_name != null) {
					System.out.print("\"");
					System.out.print(gl_name);
					System.out.print("\"");
				} else
					System.out.print("NULL");
				System.out.print(", ");
				if (gl_name != null) {
					System.out.print("(void**)&");
					System.out.print(gl_name);
				} else
					System.out.print("NULL");
				System.out.print("}");
                                if (i != methods.length - 1)
					System.out.print(",");
				System.out.println();
			}
			System.out.print("\t};");
			System.out.println();
			System.out.println("\tint num_functions = NUMFUNCTIONS(functions);");
			System.out.print("\tjclass clazz = ext_ResetClass(env, \"");
			String class_name_mangled = clazz.getName().replaceAll("\\.", "/");
			System.out.print(class_name_mangled);
			System.out.println("\");");
			System.out.println("\tif (extgl_Extensions.)");
			System.out.println("\t\text_InitializeClass(env, clazz, ext_set, <ext_name>, num_functions, functions);");
		} catch (ClassNotFoundException e) {
			throw new RuntimeException(e);
		}
	}

	private final static String getExtFunctionName(Method method) {
		String name = method.getName();
		if (name.charAt(0) == 'n')
			name = name.substring(1);
		if (name.endsWith("VBO"))
			return null;
		return name;
	}

	private final static String getMethodMangled(String class_name, Method method) {
                class_name = class_name.replaceAll("\\.", "_");
		String mangled = "Java_" + class_name + "_" + method.getName();
                return mangled;
	}

	private final static String getMethodSignature(Method method) {
		Class[] arg_types = method.getParameterTypes();
		String signature = "(";
		for (int i = 0; i < arg_types.length; i++)
			signature += getTypeSignature(arg_types[i]);
		Class return_type = method.getReturnType();
		signature += ")";
		signature += getTypeSignature(return_type);
		return signature;
	}

	private final static String getTypeSignature(Class type) {
		if (type.equals(Boolean.class))
			return "Z";
		else if (type.equals(int.class))
			return "I";
		else if (type.equals(float.class))
			return "F";
		else if (type.equals(short.class))
			return "S";
		else if (type.equals(double.class))
			return "D";
		else if (type.equals(boolean.class))
			return "Z";
		else if (type.equals(byte.class))
			return "B";
		else if (type.equals(void.class))
			return "V";
		else if (type.equals(char.class))
			throw new RuntimeException();
		else if (type.equals(long.class))
			throw new RuntimeException();
		else if (type.isArray())
			throw new RuntimeException();
		else {
			String type_name = type.getName().replaceAll("\\.", "/");
			return "L" + type_name + ";";
		}
	}
}

Update of /cvsroot/java-game-lib/LWJGL/src/native/common/fmod
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv445/src/native/common/fmod

Modified Files:
	extfmod.cpp org_lwjgl_fmod_FSound.cpp 
Log Message:
Updated headers and fmod for linux

Index: extfmod.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/fmod/extfmod.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- extfmod.cpp	23 May 2004 14:03:07 -0000	1.1
+++ extfmod.cpp	23 May 2004 14:46:07 -0000	1.2
@@ -29,23 +29,26 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+
+#ifdef _WIN32
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
-#include <stdio.h>
+#endif
+
+#include <stdio.h>
 #include "extfmod.h"
 
 /** Instance of fmod  */
 FMOD_INSTANCE * fmod = NULL;
 
-/** Handle to dll */
-HINSTANCE dll_handle;
-
+#ifdef _WIN32
 /**
  * DLL entry point for Windows. Called when Java loads the .dll
  */
-BOOL WINAPI DllMain( HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) {
  dll_handle = hinstDLL;
+BOOL WINAPI DllMain( HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) {
 	return true;
 }
+#endif
 
 /**
  * Creates and loads the FMOD instance
@@ -63,4 +66,4 @@
   if (fmod != NULL) {
     FMOD_FreeInstance(fmod);
   }
-}
\ No newline at end of file
+}

Index: org_lwjgl_fmod_FSound.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/fmod/org_lwjgl_fmod_FSound.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- org_lwjgl_fmod_FSound.cpp	23 May 2004 14:03:07 -0000	1.1
+++ org_lwjgl_fmod_FSound.cpp	23 May 2004 14:46:07 -0000	1.2
@@ -1201,7 +1201,7 @@
 */
 JNIEXPORT jboolean JNICALL Java_org_lwjgl_fmod_FSound_FSOUND_1Stream_1Net_1SetProxy(JNIEnv * env, jclass clazz, jstring proxy) {
   const char * proxyString = env->GetStringUTFChars(proxy, 0);
-  boolean result = fmod->FSOUND_Stream_Net_SetProxy(proxyString);
+  jboolean result = fmod->FSOUND_Stream_Net_SetProxy(proxyString);
   env->ReleaseStringUTFChars(proxy, proxyString);
   return result;
 }
@@ -1754,4 +1754,4 @@
 */
 JNIEXPORT jboolean JNICALL Java_org_lwjgl_fmod_FSound_nFSOUND_1Reverb_1GetChannelProperties(JNIEnv * env, jclass clazz, jint channel, jlong prop) {
   return fmod->FSOUND_Reverb_GetChannelProperties(channel, (FSOUND_REVERB_CHANNELPROPERTIES*) prop);
-}
\ No newline at end of file
+}

Update of /cvsroot/java-game-lib/LWJGL/src/native/common
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv445/src/native/common

Modified Files:
	org_lwjgl_Display.h org_lwjgl_input_Controller.h 
	org_lwjgl_input_Cursor.h org_lwjgl_input_Mouse.h 
	org_lwjgl_opengl_GLContext.h org_lwjgl_opengl_Pbuffer.h 
	org_lwjgl_opengl_Window.h 
Log Message:
Updated headers and fmod for linux

Index: org_lwjgl_input_Mouse.h
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/org_lwjgl_input_Mouse.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- org_lwjgl_input_Mouse.h	12 Apr 2004 00:33:00 -0000	1.15
+++ org_lwjgl_input_Mouse.h	23 May 2004 14:46:07 -0000	1.16
@@ -32,6 +32,7 @@
 /* Inaccessible static: eventState */
 #undef org_lwjgl_input_Mouse_BUFFER_SIZE
 #define org_lwjgl_input_Mouse_BUFFER_SIZE 50L
+/* Inaccessible static: isGrabbed */
 /*
  * Class:     org_lwjgl_input_Mouse
  * Method:    nGetNativeCursorCaps
@@ -103,14 +104,6 @@
  */
 JNIEXPORT void JNICALL Java_org_lwjgl_input_Mouse_nPoll
   (JNIEnv *, jclass, jobject, jobject);
-  
-/*
- * Class:     org_lwjgl_input_Mouse
- * Method:    nGrabMouse
- * Signature: (Z)Z
- */
-JNIEXPORT void JNICALL Java_org_lwjgl_input_Mouse_nGrabMouse
-  (JNIEnv * env, jclass clazz, jboolean grab);
 
 /*
  * Class:     org_lwjgl_input_Mouse
@@ -128,6 +121,14 @@
 JNIEXPORT jint JNICALL Java_org_lwjgl_input_Mouse_nRead
   (JNIEnv *, jclass, jobject, jint);
 
+/*
+ * Class:     org_lwjgl_input_Mouse
+ * Method:    nGrabMouse
+ * Signature: (Z)V
+ */
+JNIEXPORT void JNICALL Java_org_lwjgl_input_Mouse_nGrabMouse
+  (JNIEnv *, jclass, jboolean);
+
 #ifdef __cplusplus
 }
 #endif

Index: org_lwjgl_input_Controller.h
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/org_lwjgl_input_Controller.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- org_lwjgl_input_Controller.h	26 Feb 2004 21:54:05 -0000	1.3
+++ org_lwjgl_input_Controller.h	23 May 2004 14:46:07 -0000	1.4
@@ -7,7 +7,6 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
-/* Inaccessible static: _00024assertionsDisabled */
 /* Inaccessible static: created */
 /* Inaccessible static: buttons */
 /* Inaccessible static: x */
@@ -40,7 +39,6 @@
 /* Inaccessible static: buttonName */
 /* Inaccessible static: buttonMap */
 /* Inaccessible static: initialized */
-/* Inaccessible static: class_000240 */
 /*
  * Class:     org_lwjgl_input_Controller
  * Method:    nPoll

Index: org_lwjgl_opengl_Pbuffer.h
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/org_lwjgl_opengl_Pbuffer.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- org_lwjgl_opengl_Pbuffer.h	2 Mar 2004 01:57:38 -0000	1.5
+++ org_lwjgl_opengl_Pbuffer.h	23 May 2004 14:46:07 -0000	1.6
@@ -8,17 +8,39 @@
 extern "C" {
 #endif
 #undef org_lwjgl_opengl_Pbuffer_PBUFFER_SUPPORTED
-#define org_lwjgl_opengl_Pbuffer_PBUFFER_SUPPORTED 1 << 0
-
+#define org_lwjgl_opengl_Pbuffer_PBUFFER_SUPPORTED 1L
 #undef org_lwjgl_opengl_Pbuffer_RENDER_TEXTURE_SUPPORTED
-#define org_lwjgl_opengl_Pbuffer_RENDER_TEXTURE_SUPPORTED 1 << 1
-
+#define org_lwjgl_opengl_Pbuffer_RENDER_TEXTURE_SUPPORTED 2L
 #undef org_lwjgl_opengl_Pbuffer_RENDER_TEXTURE_RECTANGLE_SUPPORTED
-#define org_lwjgl_opengl_Pbuffer_RENDER_TEXTURE_RECTANGLE_SUPPORTED 1 << 2
-
+#define org_lwjgl_opengl_Pbuffer_RENDER_TEXTURE_RECTANGLE_SUPPORTED 4L
 #undef org_lwjgl_opengl_Pbuffer_RENDER_DEPTH_TEXTURE_SUPPORTED
-#define org_lwjgl_opengl_Pbuffer_RENDER_DEPTH_TEXTURE_SUPPORTED 1 << 3
-
+#define org_lwjgl_opengl_Pbuffer_RENDER_DEPTH_TEXTURE_SUPPORTED 8L
+#undef org_lwjgl_opengl_Pbuffer_MIPMAP_LEVEL
+#define org_lwjgl_opengl_Pbuffer_MIPMAP_LEVEL 8315L
+#undef org_lwjgl_opengl_Pbuffer_CUBE_MAP_FACE
+#define org_lwjgl_opengl_Pbuffer_CUBE_MAP_FACE 8316L
+#undef org_lwjgl_opengl_Pbuffer_TEXTURE_CUBE_MAP_POSITIVE_X
+#define org_lwjgl_opengl_Pbuffer_TEXTURE_CUBE_MAP_POSITIVE_X 8317L
+#undef org_lwjgl_opengl_Pbuffer_TEXTURE_CUBE_MAP_NEGATIVE_X
+#define org_lwjgl_opengl_Pbuffer_TEXTURE_CUBE_MAP_NEGATIVE_X 8318L
+#undef org_lwjgl_opengl_Pbuffer_TEXTURE_CUBE_MAP_POSITIVE_Y
+#define org_lwjgl_opengl_Pbuffer_TEXTURE_CUBE_MAP_POSITIVE_Y 8319L
+#undef org_lwjgl_opengl_Pbuffer_TEXTURE_CUBE_MAP_NEGATIVE_Y
+#define org_lwjgl_opengl_Pbuffer_TEXTURE_CUBE_MAP_NEGATIVE_Y 8320L
+#undef org_lwjgl_opengl_Pbuffer_TEXTURE_CUBE_MAP_POSITIVE_Z
+#define org_lwjgl_opengl_Pbuffer_TEXTURE_CUBE_MAP_POSITIVE_Z 8321L
+#undef org_lwjgl_opengl_Pbuffer_TEXTURE_CUBE_MAP_NEGATIVE_Z
+#define org_lwjgl_opengl_Pbuffer_TEXTURE_CUBE_MAP_NEGATIVE_Z 8322L
+#undef org_lwjgl_opengl_Pbuffer_FRONT_LEFT_BUFFER
+#define org_lwjgl_opengl_Pbuffer_FRONT_LEFT_BUFFER 8323L
+#undef org_lwjgl_opengl_Pbuffer_FRONT_RIGHT_BUFFER
+#define org_lwjgl_opengl_Pbuffer_FRONT_RIGHT_BUFFER 8324L
+#undef org_lwjgl_opengl_Pbuffer_BACK_LEFT_BUFFER
+#define org_lwjgl_opengl_Pbuffer_BACK_LEFT_BUFFER 8325L
+#undef org_lwjgl_opengl_Pbuffer_BACK_RIGHT_BUFFER
+#define org_lwjgl_opengl_Pbuffer_BACK_RIGHT_BUFFER 8326L
+#undef org_lwjgl_opengl_Pbuffer_DEPTH_BUFFER
+#define org_lwjgl_opengl_Pbuffer_DEPTH_BUFFER 8359L
 /* Inaccessible static: currentBuffer */
 /*
  * Class:     org_lwjgl_opengl_Pbuffer
@@ -47,6 +69,7 @@
 /*
  * Class:     org_lwjgl_opengl_Pbuffer
  * Method:    nCreate
+ * Signature: (IIIIIIILjava/nio/IntBuffer;ILjava/nio/IntBuffer;I)I
  */
 JNIEXPORT jint JNICALL Java_org_lwjgl_opengl_Pbuffer_nCreate
   (JNIEnv *, jclass, jint, jint, jint, jint, jint, jint, jint, jobject, jint, jobject, jint);
@@ -70,7 +93,7 @@
 /*
  * Class:     org_lwjgl_opengl_Pbuffer
  * Method:    nBindTexImage
- * Signature: (III)V
+ * Signature: (II)V
  */
 JNIEXPORT void JNICALL Java_org_lwjgl_opengl_Pbuffer_nBindTexImage
   (JNIEnv *, jclass, jint, jint);
@@ -78,7 +101,7 @@
 /*
  * Class:     org_lwjgl_opengl_Pbuffer
  * Method:    nReleaseTexImage
- * Signature: (III)V
+ * Signature: (II)V
  */
 JNIEXPORT void JNICALL Java_org_lwjgl_opengl_Pbuffer_nReleaseTexImage
   (JNIEnv *, jclass, jint, jint);

Index: org_lwjgl_Display.h
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/org_lwjgl_Display.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- org_lwjgl_Display.h	26 Feb 2004 21:54:05 -0000	1.16
+++ org_lwjgl_Display.h	23 May 2004 14:46:06 -0000	1.17
@@ -7,17 +7,11 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
-/* Inaccessible static: _00024assertionsDisabled */
 /* Inaccessible static: created */
 /* Inaccessible static: mode */
 /* Inaccessible static: closeRequested */
-#undef org_lwjgl_Display_PLATFORM_WGL
-#define org_lwjgl_Display_PLATFORM_WGL 0L
-#undef org_lwjgl_Display_PLATFORM_GLX
-#define org_lwjgl_Display_PLATFORM_GLX 1L
-#undef org_lwjgl_Display_PLATFORM_AGL
-#define org_lwjgl_Display_PLATFORM_AGL 2L
-/* Inaccessible static: class_000240 */
+/* Inaccessible static: timeNow */
+/* Inaccessible static: timeThen */
 /*
  * Class:     org_lwjgl_Display
  * Method:    init
@@ -52,14 +46,6 @@
 
 /*
  * Class:     org_lwjgl_Display
- * Method:    getPlatform
- * Signature: ()I
- */
-JNIEXPORT jint JNICALL Java_org_lwjgl_Display_getPlatform
-  (JNIEnv *, jclass);
-
-/*
- * Class:     org_lwjgl_Display
  * Method:    getGammaRampLength
  * Signature: ()I
  */

Index: org_lwjgl_opengl_GLContext.h
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/org_lwjgl_opengl_GLContext.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- org_lwjgl_opengl_GLContext.h	26 Feb 2004 21:54:05 -0000	1.3
+++ org_lwjgl_opengl_GLContext.h	23 May 2004 14:46:07 -0000	1.4
@@ -1,126 +1,135 @@
 /* DO NOT EDIT THIS FILE - it is machine generated */
-#include <jni.h>
+#include <jni.h>
 /* Header for class org_lwjgl_opengl_GLContext */
 
 #ifndef _Included_org_lwjgl_opengl_GLContext
-#define _Included_org_lwjgl_opengl_GLContext
+#define _Included_org_lwjgl_opengl_GLContext
 #ifdef __cplusplus
 extern "C" {
-#endif
-/* Inaccessible static: currentContext */
-/* Inaccessible static: GL_ARB_imaging */
-/* Inaccessible static: GL_ARB_depth_texture */
-/* Inaccessible static: GL_ARB_fragment_program */
-/* Inaccessible static: GL_ARB_fragment_shader */
-/* Inaccessible static: GL_ARB_matrix_palette */
-/* Inaccessible static: GL_ARB_multisample */
-/* Inaccessible static: GL_ARB_multitexture */
-/* Inaccessible static: GL_ARB_occlusion_query */
-/* Inaccessible static: GL_ARB_point_parameters */
-/* Inaccessible static: GL_ARB_point_sprite */
-/* Inaccessible static: GL_ARB_shading_language */
-/* Inaccessible static: GL_ARB_shader_objects */
-/* Inaccessible static: GL_ARB_shadow */
-/* Inaccessible static: GL_ARB_shadow_ambient */
-/* Inaccessible static: GL_ARB_texture_compression */
-/* Inaccessible static: GL_ARB_texture_env_add */
-/* Inaccessible static: GL_ARB_texture_env_dot3 */
-/* Inaccessible static: GL_ARB_texture_env_combine */
-/* Inaccessible static: GL_ARB_texture_env_crossbar */
-/* Inaccessible static: GL_ARB_texture_border_clamp */
-/* Inaccessible static: GL_ARB_texture_cube_map */
-/* Inaccessible static: GL_ARB_texture_mirrored_repeat */
-/* Inaccessible static: GL_ARB_texture_non_power_of_two */
-/* Inaccessible static: GL_ARB_transpose_matrix */
-/* Inaccessible static: GL_ARB_vertex_blend */
-/* Inaccessible static: GL_ARB_vertex_program */
-/* Inaccessible static: GL_ARB_vertex_buffer_object */
-/* Inaccessible static: GL_ARB_vertex_shader */
-/* Inaccessible static: GL_ARB_window_pos */
-/* Inaccessible static: GL_EXT_abgr */
-/* Inaccessible static: GL_EXT_bgra */
-/* Inaccessible static: GL_EXT_blend_function_separate */
-/* Inaccessible static: GL_EXT_blend_subtract */
-/* Inaccessible static: GL_EXT_compiled_vertex_array */
-/* Inaccessible static: GL_EXT_draw_range_elements */
-/* Inaccessible static: GL_EXT_multi_draw_arrays */
-/* Inaccessible static: GL_EXT_fog_coord */
-/* Inaccessible static: GL_EXT_packed_pixels */
-/* Inaccessible static: GL_EXT_point_parameters */
-/* Inaccessible static: GL_EXT_rescale_normal */
-/* Inaccessible static: GL_EXT_secondary_color */
-/* Inaccessible static: GL_EXT_separate_specular_color */
-/* Inaccessible static: GL_EXT_shadow_funcs */
-/* Inaccessible static: GL_EXT_shared_texture_palette */
-/* Inaccessible static: GL_EXT_stencil_two_side */
-/* Inaccessible static: GL_EXT_stencil_wrap */
-/* Inaccessible static: GL_EXT_texture_compression_s3tc */
-/* Inaccessible static: GL_EXT_texture_env_combine */
-/* Inaccessible static: GL_EXT_texture_env_dot3 */
-/* Inaccessible static: GL_EXT_texture_filter_anisotropic */
-/* Inaccessible static: GL_EXT_texture_lod_bias */
-/* Inaccessible static: GL_EXT_texture_rectangle */
-/* Inaccessible static: GL_EXT_vertex_shader */
-/* Inaccessible static: GL_EXT_vertex_weighting */
-/* Inaccessible static: GL_ATI_draw_buffers */
-/* Inaccessible static: GL_ATI_element_array */
-/* Inaccessible static: GL_ATI_envmap_bumpmap */
-/* Inaccessible static: GL_ATI_fragment_shader */
-/* Inaccessible static: GL_ATI_map_object_buffer */
-/* Inaccessible static: GL_ATI_pn_triangles */
-/* Inaccessible static: GL_ATI_texture_float */
-/* Inaccessible static: GL_ATI_texture_mirror_once */
-/* Inaccessible static: GL_ATI_vertex_array_object */
-/* Inaccessible static: GL_ATI_vertex_attrib_array_object */
-/* Inaccessible static: GL_ATI_vertex_streams */
-/* Inaccessible static: GL_ATI_separate_stencil */
-/* Inaccessible static: GL_NV_blend_square */
-/* Inaccessible static: GL_NV_copy_depth_to_color */
-/* Inaccessible static: GL_NV_depth_clamp */
-/* Inaccessible static: GL_NV_evaluators */
-/* Inaccessible static: GL_NV_fence */
-/* Inaccessible static: GL_NV_fragment_program */
-/* Inaccessible static: GL_NV_float_buffer */
-/* Inaccessible static: GL_NV_fog_distance */
-/* Inaccessible static: GL_NV_half_float */
-/* Inaccessible static: GL_NV_light_max_exponent */
-/* Inaccessible static: GL_NV_multisample_filter_hint */
-/* Inaccessible static: GL_NV_occlusion_query */
-/* Inaccessible static: GL_NV_packed_depth_stencil */
-/* Inaccessible static: GL_NV_pixel_data_range */
-/* Inaccessible static: GL_NV_point_sprite */
-/* Inaccessible static: GL_NV_primitive_restart */
-/* Inaccessible static: GL_NV_register_combiners */
-/* Inaccessible static: GL_NV_register_combiners2 */
-/* Inaccessible static: GL_NV_texgen_reflection */
-/* Inaccessible static: GL_NV_texture_compression_vtc */
-/* Inaccessible static: GL_NV_texture_env_combine4 */
-/* Inaccessible static: GL_NV_texture_expand_normal */
-/* Inaccessible static: GL_NV_texture_rectangle */
-/* Inaccessible static: GL_NV_texture_shader */
-/* Inaccessible static: GL_NV_texture_shader2 */
-/* Inaccessible static: GL_NV_texture_shader3 */
-/* Inaccessible static: GL_NV_vertex_array_range */
-/* Inaccessible static: GL_NV_vertex_array_range2 */
-/* Inaccessible static: GL_NV_vertex_program */
-/* Inaccessible static: GL_NV_vertex_program1_1 */
-/* Inaccessible static: GL_NV_vertex_program2 */
-/* Inaccessible static: OpenGL11 */
-/* Inaccessible static: OpenGL12 */
-/* Inaccessible static: OpenGL13 */
-/* Inaccessible static: OpenGL14 */
-/* Inaccessible static: OpenGL15 */
-/* Inaccessible static: class_000240 */
-/* Inaccessible static: class_000241 */
-/*
- * Class:     org_lwjgl_opengl_GLContext
- * Method:    init
- * Signature: (Ljava/util/Set;)V
- */
-JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GLContext_init
+#endif
+/* Inaccessible static: currentContext */
+/* Inaccessible static: GL_ARB_imaging */
+/* Inaccessible static: GL_ARB_depth_texture */
+/* Inaccessible static: GL_ARB_fragment_program */
+/* Inaccessible static: GL_ARB_fragment_program_shadow */
+/* Inaccessible static: GL_ARB_fragment_shader */
+/* Inaccessible static: GL_ARB_matrix_palette */
+/* Inaccessible static: GL_ARB_multisample */
+/* Inaccessible static: GL_ARB_multitexture */
+/* Inaccessible static: GL_ARB_occlusion_query */
+/* Inaccessible static: GL_ARB_point_parameters */
+/* Inaccessible static: GL_ARB_point_sprite */
+/* Inaccessible static: GL_ARB_shading_language_100 */
+/* Inaccessible static: GL_ARB_shader_objects */
+/* Inaccessible static: GL_ARB_shadow */
+/* Inaccessible static: GL_ARB_shadow_ambient */
+/* Inaccessible static: GL_ARB_texture_border_clamp */
+/* Inaccessible static: GL_ARB_texture_compression */
+/* Inaccessible static: GL_ARB_texture_cube_map */
+/* Inaccessible static: GL_ARB_texture_env_add */
+/* Inaccessible static: GL_ARB_texture_env_combine */
+/* Inaccessible static: GL_ARB_texture_env_crossbar */
+/* Inaccessible static: GL_ARB_texture_env_dot3 */
+/* Inaccessible static: GL_ARB_texture_mirrored_repeat */
+/* Inaccessible static: GL_ARB_texture_non_power_of_two */
+/* Inaccessible static: GL_ARB_transpose_matrix */
+/* Inaccessible static: GL_ARB_vertex_blend */
+/* Inaccessible static: GL_ARB_vertex_buffer_object */
+/* Inaccessible static: GL_ARB_vertex_program */
+/* Inaccessible static: GL_ARB_vertex_shader */
+/* Inaccessible static: GL_ARB_window_pos */
+/* Inaccessible static: GL_EXT_abgr */
+/* Inaccessible static: GL_EXT_bgra */
+/* Inaccessible static: GL_EXT_blend_equation_separate */
+/* Inaccessible static: GL_EXT_blend_func_separate */
+/* Inaccessible static: GL_EXT_blend_subtract */
+/* Inaccessible static: GL_EXT_Cg_shader */
+/* Inaccessible static: GL_EXT_compiled_vertex_array */
+/* Inaccessible static: GL_EXT_depth_bounds_test */
+/* Inaccessible static: GL_EXT_draw_range_elements */
+/* Inaccessible static: GL_EXT_fog_coord */
+/* Inaccessible static: GL_EXT_multi_draw_arrays */
+/* Inaccessible static: GL_EXT_packed_pixels */
+/* Inaccessible static: GL_EXT_pixel_buffer_object */
+/* Inaccessible static: GL_EXT_point_parameters */
+/* Inaccessible static: GL_EXT_rescale_normal */
+/* Inaccessible static: GL_EXT_secondary_color */
+/* Inaccessible static: GL_EXT_separate_specular_color */
+/* Inaccessible static: GL_EXT_shadow_funcs */
+/* Inaccessible static: GL_EXT_shared_texture_palette */
+/* Inaccessible static: GL_EXT_stencil_two_side */
+/* Inaccessible static: GL_EXT_stencil_wrap */
+/* Inaccessible static: GL_EXT_texture_compression_s3tc */
+/* Inaccessible static: GL_EXT_texture_env_combine */
+/* Inaccessible static: GL_EXT_texture_env_dot3 */
+/* Inaccessible static: GL_EXT_texture_filter_anisotropic */
+/* Inaccessible static: GL_EXT_texture_lod_bias */
+/* Inaccessible static: GL_EXT_texture_mirror_clamp */
+/* Inaccessible static: GL_EXT_texture_rectangle */
+/* Inaccessible static: GL_EXT_vertex_shader */
+/* Inaccessible static: GL_EXT_vertex_weighting */
+/* Inaccessible static: GL_ATI_draw_buffers */
+/* Inaccessible static: GL_ATI_element_array */
+/* Inaccessible static: GL_ATI_envmap_bumpmap */
+/* Inaccessible static: GL_ATI_fragment_shader */
+/* Inaccessible static: GL_ATI_map_object_buffer */
+/* Inaccessible static: GL_ATI_pn_triangles */
+/* Inaccessible static: GL_ATI_separate_stencil */
+/* Inaccessible static: GL_ATI_texture_float */
+/* Inaccessible static: GL_ATI_texture_mirror_once */
+/* Inaccessible static: GL_ATI_vertex_array_object */
+/* Inaccessible static: GL_ATI_vertex_streams */
+/* Inaccessible static: GL_ATI_vertex_attrib_array_object */
+/* Inaccessible static: GL_NV_blend_square */
+/* Inaccessible static: GL_NV_copy_depth_to_color */
+/* Inaccessible static: GL_NV_depth_clamp */
+/* Inaccessible static: GL_NV_evaluators */
+/* Inaccessible static: GL_NV_fence */
+/* Inaccessible static: GL_NV_float_buffer */
+/* Inaccessible static: GL_NV_fog_distance */
+/* Inaccessible static: GL_NV_fragment_program */
+/* Inaccessible static: GL_NV_fragment_program2 */
+/* Inaccessible static: GL_NV_fragment_program_option */
+/* Inaccessible static: GL_NV_half_float */
+/* Inaccessible static: GL_NV_light_max_exponent */
+/* Inaccessible static: GL_NV_multisample_filter_hint */
+/* Inaccessible static: GL_NV_occlusion_query */
+/* Inaccessible static: GL_NV_packed_depth_stencil */
+/* Inaccessible static: GL_NV_pixel_data_range */
+/* Inaccessible static: GL_NV_point_sprite */
+/* Inaccessible static: GL_NV_primitive_restart */
+/* Inaccessible static: GL_NV_register_combiners */
+/* Inaccessible static: GL_NV_register_combiners2 */
+/* Inaccessible static: GL_NV_texgen_reflection */
+/* Inaccessible static: GL_NV_texture_compression_vtc */
+/* Inaccessible static: GL_NV_texture_env_combine4 */
+/* Inaccessible static: GL_NV_texture_expand_normal */
+/* Inaccessible static: GL_NV_texture_rectangle */
+/* Inaccessible static: GL_NV_texture_shader */
+/* Inaccessible static: GL_NV_texture_shader2 */
+/* Inaccessible static: GL_NV_texture_shader3 */
+/* Inaccessible static: GL_NV_vertex_array_range */
+/* Inaccessible static: GL_NV_vertex_array_range2 */
+/* Inaccessible static: GL_NV_vertex_program */
+/* Inaccessible static: GL_NV_vertex_program1_1 */
+/* Inaccessible static: GL_NV_vertex_program2 */
+/* Inaccessible static: GL_NV_vertex_program2_option */
+/* Inaccessible static: GL_NV_vertex_program3 */
+/* Inaccessible static: OpenGL11 */
+/* Inaccessible static: OpenGL12 */
+/* Inaccessible static: OpenGL13 */
+/* Inaccessible static: OpenGL14 */
+/* Inaccessible static: OpenGL15 */
+/* Inaccessible static: class_00024org_00024lwjgl_00024opengl_00024GLContext */
+/*
+ * Class:     org_lwjgl_opengl_GLContext
+ * Method:    init
+ * Signature: (Ljava/util/Set;)V
+ */
+JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GLContext_init
   (JNIEnv *, jclass, jobject);
-
+
 #ifdef __cplusplus
 }
-#endif
-#endif
+#endif
+#endif

Index: org_lwjgl_input_Cursor.h
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/org_lwjgl_input_Cursor.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- org_lwjgl_input_Cursor.h	12 Apr 2004 00:33:00 -0000	1.8
+++ org_lwjgl_input_Cursor.h	23 May 2004 14:46:07 -0000	1.9
@@ -7,13 +7,10 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
-/* Inaccessible static: _00024assertionsDisabled */
-/* Inaccessible static: initialized */
-/* Inaccessible static: class_000240 */
 /*
  * Class:     org_lwjgl_input_Cursor
  * Method:    nCreateCursor
- * Signature: (IIIIILjava/nio/IntBuffer;I)J
+ * Signature: (IIIIILjava/nio/IntBuffer;ILjava/nio/IntBuffer;I)J
  */
 JNIEXPORT jlong JNICALL Java_org_lwjgl_input_Cursor_nCreateCursor
   (JNIEnv *, jclass, jint, jint, jint, jint, jint, jobject, jint, jobject, jint);

Index: org_lwjgl_opengl_Window.h
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/org_lwjgl_opengl_Window.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- org_lwjgl_opengl_Window.h	4 Apr 2004 12:48:52 -0000	1.16
+++ org_lwjgl_opengl_Window.h	23 May 2004 14:46:07 -0000	1.17
@@ -7,17 +7,17 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
-/* Inaccessible static: _00024assertionsDisabled */
 /* Inaccessible static: x */
 /* Inaccessible static: y */
 /* Inaccessible static: width */
 /* Inaccessible static: height */
 /* Inaccessible static: title */
 /* Inaccessible static: fullscreen */
-/* Inaccessible static: vsync */
 /* Inaccessible static: vbo_tracker */
 /* Inaccessible static: context */
-/* Inaccessible static: class_000240 */
+/* Inaccessible static: createdMouse */
+/* Inaccessible static: createdKeyboard */
+/* Inaccessible static: createdController */
 /*
  * Class:     org_lwjgl_opengl_Window
  * Method:    nSetTitle
@@ -100,28 +100,12 @@
 
 /*
  * Class:     org_lwjgl_opengl_Window
- * Method:    nIsVSyncEnabled
- * Signature: ()Z
- */
-JNIEXPORT jboolean JNICALL Java_org_lwjgl_opengl_Window_nIsVSyncEnabled
-  (JNIEnv *, jclass);
-
-/*
- * Class:     org_lwjgl_opengl_Window
  * Method:    nSetVSyncEnabled
  * Signature: (Z)V
  */
 JNIEXPORT void JNICALL Java_org_lwjgl_opengl_Window_nSetVSyncEnabled
   (JNIEnv *, jclass, jboolean);
 
-/*
- * Class:     org_lwjgl_opengl_Window
- * Method:    nReshape
- * Signature: (IIII)V
-JNIEXPORT void JNICALL Java_org_lwjgl_opengl_Window_nReshape
-  (JNIEnv *, jclass, jint, jint, jint, jint);
- */
-
 #ifdef __cplusplus
 }
 #endif

Update of /cvsroot/java-game-lib/LWJGL
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv445

Modified Files:
	build.xml 
Log Message:
Updated headers and fmod for linux

Index: build.xml
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/build.xml,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- build.xml	23 May 2004 14:39:54 -0000	1.22
+++ build.xml	23 May 2004 14:46:06 -0000	1.23
@@ -279,6 +279,11 @@
 			<class name="org.lwjgl.opengl.Window"/>
 			<class name="org.lwjgl.opengl.Pbuffer"/>
 		</javah>    
+		<javah classpath="${lwjgl.bin}" destdir="${lwjgl.src.headers}/fmod" force="yes">
+			<class name="org.lwjgl.fmod.FMOD"/>
+			<class name="org.lwjgl.fmod.FMusic"/>
+			<class name="org.lwjgl.fmod.FSound"/>
+                </javah>
 	</target>
   
 	<!-- Creates a versioned distribution for all supported platforms -->

Update of /cvsroot/java-game-lib/LWJGL/src/native
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv445/src/native

Modified Files:
	configure.in 
Log Message:
Updated headers and fmod for linux

Index: configure.in
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/configure.in,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -d -r1.50 -r1.51
--- configure.in	20 Jan 2004 08:37:17 -0000	1.50
+++ configure.in	23 May 2004 14:46:06 -0000	1.51
@@ -76,6 +76,7 @@
                  common/ati/Makefile
                  common/ext/Makefile
                  common/nv/Makefile
+                 common/fmod/Makefile
                  linux/Makefile
 		 macosx/Makefile])
 AC_OUTPUT

Update of /cvsroot/java-game-lib/LWJGL
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31834

Modified Files:
	build.xml 
Log Message:
Remove AL10 from header generation

Index: build.xml
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/build.xml,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- build.xml	23 May 2004 14:14:12 -0000	1.21
+++ build.xml	23 May 2004 14:39:54 -0000	1.22
@@ -270,7 +270,6 @@
 			  
 			<class name="org.lwjgl.openal.ALC"/>
 			<class name="org.lwjgl.openal.AL"/>
-			<class name="org.lwjgl.openal.AL10"/>
 			<class name="org.lwjgl.openal.eax.EAX"/>
 			<class name="org.lwjgl.openal.eax.EAX20"/>
 			<class name="org.lwjgl.openal.eax.EAXBufferProperties"/>

Update of /cvsroot/java-game-lib/LWJGL
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26918

Modified Files:
	build.xml 
Log Message:
updated to support lwjgl_util
updated to exclude fmod

Index: build.xml
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/build.xml,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- build.xml	21 Apr 2004 08:32:19 -0000	1.20
+++ build.xml	23 May 2004 14:14:12 -0000	1.21
@@ -22,15 +22,23 @@
 	<fileset id="lwjgl.fileset" dir="${lwjgl.bin}">
 		<include name="**"/>
 		<exclude name="**.*"/>
+		<exclude name="org/lwjgl/fmod/**"/>		
 		<exclude name="org/lwjgl/test/**"/>
+		<exclude name="org/lwjgl/util/**"/>
 	</fileset>  
 	  
 	<!-- Files to include in the lwjgl_test.jar file -->
 	<fileset id="lwjgl_test.fileset" dir="${lwjgl.bin}">
 		<exclude name="**.*"/>
 		<include name="org/lwjgl/test/**"/>
-	</fileset>  
-
+	</fileset>
+	
+	<!-- Files to include in the lwjgl_util.jar file -->
+	<fileset id="lwjgl_util.fileset" dir="${lwjgl.bin}">
+		<exclude name="**.*"/>
+		<include name="org/lwjgl/util/**"/>
+	</fileset>
+	
 	<!-- Files to make Javadoc from -->
 	<fileset id="lwjgl.javadoc.fileset" dir="${lwjgl.src}/java">
 		<include name="**/*.java" />
@@ -210,6 +218,11 @@
 		<jar destfile="${lwjgl.lib}/lwjgl_test.jar" taskname="lwjgl_test.jar">
 			<fileset refid="lwjgl_test.fileset"/>
 		</jar>
+		
+		<!-- Create lwjgl_util.jar -->
+		<jar destfile="${lwjgl.lib}/lwjgl_util.jar" taskname="lwjgl_util.jar">
+			<fileset refid="lwjgl_util.fileset"/>
+		</jar>		
 	</target>
   
 	<!-- Creates the Javadoc -->