Added support for using JOAL alongside JOGL in JOGLAppletLauncher. If

JOAL classes are detected, will download, install and load JOAL's
native libraries as well as JOGL's. Added NativeLibLoader.disable()
method to JOAL to support this. Added code to JOGLAppletLauncher to
detect if -Dsun.java2d.noddraw=true was missing from
deployment.properties and if so to prompt user about adding it
automatically. Fixed bug in new per-native-library timestamp code.
Refactored JOAL SingleStaticSource demo to make it easier to embed in
an applet.

git-svn-id: file:///home/mbien/NetBeansProjects/JOGAMP/joal-sync/git-svn/../svn-server-sync/joal/trunk@371 03bf7f67-59de-4072-a415-9a990d468a3f

1 files changed, 33 insertions, 18 deletions

diff --git a/src/java/net/java/games/joal/NativeLibLoader.java b/src/java/net/java/games/joal/NativeLibLoader.java
index 5aace19..f47c96d 100755
--- a/src/java/net/java/games/joal/NativeLibLoader.java
+++ b/src/java/net/java/games/joal/NativeLibLoader.java
@@ -41,28 +41,43 @@ import java.security.*;
 import com.sun.gluegen.runtime.*;
 
 class NativeLibLoader {
-  static {
-    AccessController.doPrivileged(new PrivilegedAction() {
-        public Object run() {
-          // Workaround for problem in OpenAL32.dll, which is actually
-          // the "wrapper" DLL which looks for real OpenAL
-          // implementations like nvopenal.dll and "*oal.dll".
-          // joal.dll matches this wildcard and a bug in OpenAL32.dll
-          // causes a call through a null function pointer.
-          System.loadLibrary("joal_native");
+  private static volatile boolean loadingEnabled = true;
+  private static volatile boolean didLoading;
 
-          // Workaround for 4845371.
-          // Make sure the first reference to the JNI GetDirectBufferAddress is done
-          // from a privileged context so the VM's internal class lookups will succeed.
-          // FIXME: need to figure out an appropriate entry point to call
-          //          JAWT jawt = new JAWT();
-          //          JAWTFactory.JAWT_GetAWT(jawt);
+  public static void disableLoading() {
+    loadingEnabled = false;
+  }
 
-          return null;
-        }
-      });
+  public static void enableLoading() {
+    loadingEnabled = true;
   }
 
   public static void load() {
+    if (!didLoading && loadingEnabled) {
+      synchronized (NativeLibLoader.class) {
+        if (!didLoading && loadingEnabled) {
+          didLoading = true;
+          AccessController.doPrivileged(new PrivilegedAction() {
+              public Object run() {
+                // Workaround for problem in OpenAL32.dll, which is actually
+                // the "wrapper" DLL which looks for real OpenAL
+                // implementations like nvopenal.dll and "*oal.dll".
+                // joal.dll matches this wildcard and a bug in OpenAL32.dll
+                // causes a call through a null function pointer.
+                System.loadLibrary("joal_native");
+
+                // Workaround for 4845371.
+                // Make sure the first reference to the JNI GetDirectBufferAddress is done
+                // from a privileged context so the VM's internal class lookups will succeed.
+                // FIXME: need to figure out an appropriate entry point to call
+                //          JAWT jawt = new JAWT();
+                //          JAWTFactory.JAWT_GetAWT(jawt);
+
+                return null;
+              }
+            });
+        }
+      }
+    }
   }
 }