Thread: [Java-game-lib-cvs] SF.net SVN: java-game-lib: [2355] trunk/LWJGL/src/java/org/lwjgl/fmod3/FMOD.jav

Revision: 2355
Author:   matzon
Date:     2006-06-06 13:37:11 -0700 (Tue, 06 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/java-game-lib/?rev=2355&view=rev

Log Message:
-----------
make destroy try its best to close sound and music

Modified Paths:
--------------
    trunk/LWJGL/src/java/org/lwjgl/fmod3/FMOD.java
Modified: trunk/LWJGL/src/java/org/lwjgl/fmod3/FMOD.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/fmod3/FMOD.java	2006-06-06 20:36:45 UTC (rev 2354)
+++ trunk/LWJGL/src/java/org/lwjgl/fmod3/FMOD.java	2006-06-06 20:37:11 UTC (rev 2355)
@@ -277,6 +277,9 @@
 			return;
 		}
 
+		FSound.FSOUND_Close();
+		FMusic.FMUSIC_StopAllSongs();
+		
 		created = false;
 		nDestroy();
 	}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 2407
Author:   matzon
Date:     2006-07-02 14:50:50 -0700 (Sun, 02 Jul 2006)
ViewCVS:  http://svn.sourceforge.net/java-game-lib/?rev=2407&view=rev

Log Message:
-----------
preliminary applet support

Modified Paths:
--------------
    trunk/LWJGL/src/java/org/lwjgl/fmod3/FMOD.java
Modified: trunk/LWJGL/src/java/org/lwjgl/fmod3/FMOD.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/fmod3/FMOD.java	2006-07-02 21:47:09 UTC (rev 2406)
+++ trunk/LWJGL/src/java/org/lwjgl/fmod3/FMOD.java	2006-07-02 21:50:50 UTC (rev 2407)
@@ -31,13 +31,17 @@
  */
 package org.lwjgl.fmod3;
 
+import java.io.File;
 import java.lang.reflect.Method;
 import java.nio.FloatBuffer;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
 import java.util.ArrayList;
 import java.util.HashMap;
 
 import org.lwjgl.LWJGLException;
 import org.lwjgl.LWJGLUtil;
+import org.lwjgl.applet.LWJGLInstaller;
 
 /**
  * <br>
@@ -189,17 +193,8 @@
 	/** The native JNI library name */
 	private static String JNI_LIBRARY_NAME = "lwjgl-fmod3";
 
-	/** The native library name on win32 */
-	private static String FMOD_WIN32_LIBRARY_NAME = "fmod";
-
-	/** The native library name on win32 */
-	private static String FMOD_LINUX_LIBRARY_NAME = "fmod";
-
-	/** The native library name on win32 */
-	private static String FMOD_OSX_LIBRARY_NAME = "fmod";
-
 	/** Version of FMOD */
-	public static final String VERSION = "1.0beta";
+	public static final String VERSION = "1.0beta2";
 
 	static {
 		initialize();
@@ -214,7 +209,11 @@
 		}
 		initialized = true;
 
-		System.loadLibrary(JNI_LIBRARY_NAME);    
+		if (LWJGLInstaller.installed) {
+			loadLibrary(LWJGLInstaller.installDirectory + File.separator + System.mapLibraryName(JNI_LIBRARY_NAME), true);
+		} else {
+			loadLibrary(JNI_LIBRARY_NAME, false);
+		}
 
 		// check for mismatch
 		String nativeVersion = getNativeLibraryVersion();
@@ -229,6 +228,19 @@
 			callbacks[i] = new HashMap();
 		}
 	}
+	
+	private static void loadLibrary(final String name, final boolean usingPath) {
+		AccessController.doPrivileged(new PrivilegedAction() {
+			public Object run() {
+				if(usingPath) {
+					System.load(name);
+				} else {
+					System.loadLibrary(name);
+				}
+				return null;
+			}
+		});
+	}	
 
 	/**
 	 * Return the version of the native library


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.