Fixed Brian's bugs
This commit is contained in:
parent
5ac3ea26e8
commit
f08389fdd2
|
@ -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();
|
||||
}
|
||||
}
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
}
|
||||
|
||||
|
|
|
@ -387,4 +387,4 @@ JNIEXPORT jint JNICALL Java_org_lwjgl_openal_ALC_getEnumValue (JNIEnv *env, jobj
|
|||
|
||||
CHECK_ALC_ERROR
|
||||
return result;
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue