From f08389fdd2e78a863faa2c2ed28cd2de6800bf03 Mon Sep 17 00:00:00 2001
From: Elias Naur <elias.naur@gmail.com>
Date: Mon, 24 Mar 2003 11:56:05 +0000
Subject: [PATCH] Fixed Brian's bugs

---
 src/java/org/lwjgl/openal/BaseAL.java      | 58 +++++++++++-----------
 src/java/org/lwjgl/test/openal/ALTest.java |  4 ++
 src/native/common/extal.cpp                | 30 +++++------
 src/native/common/org_lwjgl_openal_ALC.cpp |  2 +-
 4 files changed, 46 insertions(+), 48 deletions(-)

diff --git a/src/java/org/lwjgl/openal/BaseAL.java b/src/java/org/lwjgl/openal/BaseAL.java
index 2b1259bb..e057a207 100644
--- a/src/java/org/lwjgl/openal/BaseAL.java
+++ b/src/java/org/lwjgl/openal/BaseAL.java
@@ -74,38 +74,36 @@ public abstract class BaseAL {
 	 */
 	public void create() throws Exception {
 		if (created) {
-		  return;
-    }
-    
-    
-    // need to pass path of possible locations of OAL to native side
-    String libpath = System.getProperty("java.library.path");
-    String seperator = System.getProperty("path.separator");
-    String libname;
-    
-    // libname is hardcoded atm - this will change in a near future...
-    libname = (System.getProperty("os.name").toLowerCase().indexOf("windows") == -1) 
-            ? "libopenal.so" 
-            : "OpenAL32.dll";     
-    
-    StringTokenizer st = new StringTokenizer(libpath, seperator);
-        
-    //create needed string array
-    String[] oalPaths = new String[st.countTokens()+1];
-    
-    //build paths
-    for(int i=0;i<st.countTokens();i++) {
-      oalPaths[i] = st.nextToken() + File.separator + libname; 
-    }
-    
-    //add cwd path
-    oalPaths[oalPaths.length-1] = libname;
-        
+			return;
+		}
+
+		// need to pass path of possible locations of OAL to native side
+		String libpath = System.getProperty("java.library.path");
+		String seperator = System.getProperty("path.separator");
+		String libname;
+
+		// libname is hardcoded atm - this will change in a near future...
+		libname = (System.getProperty("os.name").toLowerCase().indexOf("windows") == -1) 
+		        ? "libopenal.so" 
+		        : "OpenAL32.dll";     
+
+		StringTokenizer st = new StringTokenizer(libpath, seperator);
+            
+		//create needed string array
+		String[] oalPaths = new String[st.countTokens()+1];
+
+		//build paths
+		for(int i=0;i<oalPaths.length - 1;i++) {
+			oalPaths[i] = st.nextToken() + File.separator + libname; 
+		}
+
+		//add cwd path
+		oalPaths[oalPaths.length-1] = libname;
 		if (!nCreate(oalPaths)) {
 			throw new Exception("AL instance could not be created.");
-        }
+                }
 		created = true;
-        init();
+                init();
 	}
 	
 	/**
@@ -130,4 +128,4 @@ public abstract class BaseAL {
 	 * Native method the destroy the AL
 	 */
 	protected native void nDestroy();    
-}
\ No newline at end of file
+}
diff --git a/src/java/org/lwjgl/test/openal/ALTest.java b/src/java/org/lwjgl/test/openal/ALTest.java
index 2a4607d0..25f09192 100644
--- a/src/java/org/lwjgl/test/openal/ALTest.java
+++ b/src/java/org/lwjgl/test/openal/ALTest.java
@@ -298,6 +298,10 @@ public class ALTest extends BasicTest {
         // Initialize Open AL manually
         //Open device
         device = alc.openDevice(null);
+	if (device == null) {
+		System.out.println("Could not create ALC device");
+		System.exit(-1);
+	}
         //Create context(s)
         context = alc.createContext(device, 0);
         //Set active context
diff --git a/src/native/common/extal.cpp b/src/native/common/extal.cpp
index 2db149d6..0b2b2de0 100644
--- a/src/native/common/extal.cpp
+++ b/src/native/common/extal.cpp
@@ -168,30 +168,26 @@ void LoadOpenAL(JNIEnv *env, jobjectArray oalPaths) {
 #ifdef _DEBUG
   printf("Found %d OpenAL paths\n", pathcount);
 #endif  
-#ifdef _WIN32
   for(int i=0;i<pathcount;i++) {
     jstring path = (jstring) env->GetObjectArrayElement(oalPaths, i);
+    const char *path_str = env->GetStringUTFChars(path, NULL);
 #ifdef _DEBUG
-  printf("Testing '%s'\n", env->GetStringUTFChars(path, NULL));
+    printf("Testing '%s'\n", path_str);
 #endif  
-    handleOAL = LoadLibrary(env->GetStringUTFChars(path, NULL));
-    if (handleOAL != NULL) {
-#ifdef _DEBUG
-  printf("Found OpenAL at '%s'\n", env->GetStringUTFChars(path, NULL));
-#endif  
-      break;
-    }
-  }
+#ifdef _WIN32
+    handleOAL = LoadLibrary(path_str);
 #endif
 #ifdef _X11
-  for(int i=0;i<pathcount;i++) {
-    jstring path = (jstring) env->GetObjectArrayElement(oalPaths, i);
-    handleOAL = dlopen(env->GetStringUTFChars(path, NULL), RTLD_LAZY);
+    handleOAL = dlopen(path_str, RTLD_LAZY);
+#endif
     if (handleOAL != NULL) {
+#ifdef _DEBUG
+      printf("Found OpenAL at '%s'\n", path_str);
+#endif  
       break;
     }
-  }   
-#endif
+    env->ReleaseStringUTFChars(path, path_str);
+  }
 }
 
 /**
@@ -199,10 +195,10 @@ void LoadOpenAL(JNIEnv *env, jobjectArray oalPaths) {
  */
 void UnLoadOpenAL() {
 #ifdef _WIN32
-  //FreeLibrary(handleOAL);
+  FreeLibrary(handleOAL);
 #endif
 #ifdef _X11
-   dlclose(handleOAL);
+  dlclose(handleOAL);
 #endif
 }
 
diff --git a/src/native/common/org_lwjgl_openal_ALC.cpp b/src/native/common/org_lwjgl_openal_ALC.cpp
index 6125dbbc..7e900850 100644
--- a/src/native/common/org_lwjgl_openal_ALC.cpp
+++ b/src/native/common/org_lwjgl_openal_ALC.cpp
@@ -387,4 +387,4 @@ JNIEXPORT jint JNICALL Java_org_lwjgl_openal_ALC_getEnumValue (JNIEnv *env, jobj
 	
 	CHECK_ALC_ERROR
 	return result;
-}
\ No newline at end of file
+}