michael/lwjgl
michael
/
lwjgl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed Brian's bugs

This commit is contained in:
Elias Naur 2003-03-24 11:56:05 +00:00
parent 5ac3ea26e8
commit f08389fdd2
4 changed files with 46 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/java/org/lwjgl/openal/BaseAL.java
View File

@ -77,7 +77,6 @@ public abstract class BaseAL {
return; return;
} }
// need to pass path of possible locations of OAL to native side // need to pass path of possible locations of OAL to native side
String libpath = System.getProperty("java.library.path"); String libpath = System.getProperty("java.library.path");
String seperator = System.getProperty("path.separator"); String seperator = System.getProperty("path.separator");
@ -94,13 +93,12 @@ public abstract class BaseAL {
String[] oalPaths = new String[st.countTokens()+1]; String[] oalPaths = new String[st.countTokens()+1];
//build paths //build paths
for(int i=0;i<st.countTokens();i++) { for(int i=0;i<oalPaths.length - 1;i++) {
oalPaths[i] = st.nextToken() + File.separator + libname; oalPaths[i] = st.nextToken() + File.separator + libname;
} }
//add cwd path //add cwd path
oalPaths[oalPaths.length-1] = libname; oalPaths[oalPaths.length-1] = libname;
if (!nCreate(oalPaths)) { if (!nCreate(oalPaths)) {
throw new Exception("AL instance could not be created."); throw new Exception("AL instance could not be created.");
} }

4
src/java/org/lwjgl/test/openal/ALTest.java
View File

@ -298,6 +298,10 @@ public class ALTest extends BasicTest {
// Initialize Open AL manually // Initialize Open AL manually
//Open device //Open device
device = alc.openDevice(null); device = alc.openDevice(null);
if (device == null) {
System.out.println("Could not create ALC device");
System.exit(-1);
}
//Create context(s) //Create context(s)
context = alc.createContext(device, 0); context = alc.createContext(device, 0);
//Set active context //Set active context

26
src/native/common/extal.cpp
View File

@ -168,30 +168,26 @@ void LoadOpenAL(JNIEnv *env, jobjectArray oalPaths) {
#ifdef _DEBUG #ifdef _DEBUG
printf("Found %d OpenAL paths\n", pathcount); printf("Found %d OpenAL paths\n", pathcount);
#endif #endif
#ifdef _WIN32
for(int i=0;i<pathcount;i++) { for(int i=0;i<pathcount;i++) {
jstring path = (jstring) env->GetObjectArrayElement(oalPaths, i); jstring path = (jstring) env->GetObjectArrayElement(oalPaths, i);
const char *path_str = env->GetStringUTFChars(path, NULL);
#ifdef _DEBUG #ifdef _DEBUG
printf("Testing '%s'\n", env->GetStringUTFChars(path, NULL)); printf("Testing '%s'\n", path_str);
#endif #endif
handleOAL = LoadLibrary(env->GetStringUTFChars(path, NULL)); #ifdef _WIN32
if (handleOAL != NULL) { handleOAL = LoadLibrary(path_str);
#ifdef _DEBUG
printf("Found OpenAL at '%s'\n", env->GetStringUTFChars(path, NULL));
#endif
break;
}
}
#endif #endif
#ifdef _X11 #ifdef _X11
for(int i=0;i<pathcount;i++) { handleOAL = dlopen(path_str, RTLD_LAZY);
jstring path = (jstring) env->GetObjectArrayElement(oalPaths, i); #endif
handleOAL = dlopen(env->GetStringUTFChars(path, NULL), RTLD_LAZY);
if (handleOAL != NULL) { if (handleOAL != NULL) {
#ifdef _DEBUG
printf("Found OpenAL at '%s'\n", path_str);
#endif
break; break;
} }
env->ReleaseStringUTFChars(path, path_str);
} }
#endif
} }
/** /**
@ -199,7 +195,7 @@ void LoadOpenAL(JNIEnv *env, jobjectArray oalPaths) {
*/ */
void UnLoadOpenAL() { void UnLoadOpenAL() {
#ifdef _WIN32 #ifdef _WIN32
//FreeLibrary(handleOAL); FreeLibrary(handleOAL);
#endif #endif
#ifdef _X11 #ifdef _X11
dlclose(handleOAL); dlclose(handleOAL);