1 files changed, 44 insertions, 12 deletions

diff --git a/src/java/net/java/games/joal/util/ALut.java b/src/java/net/java/games/joal/util/ALut.java
index 71673b0..5d1746f 100644
--- a/src/java/net/java/games/joal/util/ALut.java
+++ b/src/java/net/java/games/joal/util/ALut.java
@@ -49,28 +49,60 @@ import net.java.games.joal.*;
 public final class ALut {
 
   private static ALC alc;
-    
+  private static ALCdevice device;
+  private static ALCcontext context;
+  private static Thread initializingThread;
+
   private ALut() { }
 
   /** Initializes the OpenAL Utility Toolkit, creates an OpenAL
-      context and makes it current on the current thread. */
-  public static void alutInit() throws ALException {
-    alc = ALFactory.getALC();
+      context and makes it current on the current thread. The ALut may
+      only be initialized on one thread at any given time. */
+  public static synchronized void alutInit() throws ALException {
+    if (context != null) {
+      throw new ALException("Already initialized on thread " + initializingThread.getName());
+    }
+    if (alc == null) {
+      alc = ALFactory.getALC();
+    }
     String deviceName = null;
-    ALCcontext context;
-    ALCdevice device;
-    device = alc.alcOpenDevice(deviceName);
-    if (device == null) {
+    ALCdevice d = alc.alcOpenDevice(deviceName);
+    if (d == null) {
       throw new ALException("Error opening default OpenAL device");
     }
-    context = alc.alcCreateContext(device, null);
-    if (context == null) {
+    ALCcontext c = alc.alcCreateContext(d, null);
+    if (c == null) {
+      alc.alcCloseDevice(d);
       throw new ALException("Error creating OpenAL context");
     }
-    alc.alcMakeContextCurrent(context);
-    if (alc.alcGetError(device) != 0) {
+    alc.alcMakeContextCurrent(c);
+    if (alc.alcGetError(d) != 0) {
+      alc.alcDestroyContext(c);
+      alc.alcCloseDevice(d);
       throw new ALException("Error making OpenAL context current");
     }
+    // Fully initialized; finish setup
+    device = d;
+    context = c;
+    initializingThread = Thread.currentThread();
+  }
+
+  /** Shuts down the OpenAL Utility Toolkit; releases and destroys the
+      internal OpenAL context and closes the output device. Must be
+      called from the same thread as alutInit(). Most applications
+      should not need to call this; only those which wish to toggle
+      sound on / off at run time by initializing and un-initializing
+      OpenAL need to call it. */
+  public static synchronized void alutExit() throws ALException {
+    if (context == null) {
+      throw new ALException("Not initialized");
+    }
+    alc.alcMakeContextCurrent(null);
+    alc.alcDestroyContext(context);
+    alc.alcCloseDevice(device);
+    context = null;
+    device = null;
+    initializingThread = null;
   }
 
   public static void alutLoadWAVFile(String fileName,