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

Fix Brians bugs

This commit is contained in:
Caspian Rychlik-Prince 2003-03-17 18:34:43 +00:00
parent d0d2058d02
commit f078482bbc
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/native/common/extal.c
View File

@ -177,7 +177,7 @@ void LoadOpenAL() {
*/ */
void UnLoadOpenAL() { void UnLoadOpenAL() {
#ifdef _WIN32 #ifdef _WIN32
FreeLibrary(handleOAL); //FreeLibrary(handleOAL);
#endif #endif
#ifdef _X11 #ifdef _X11
dlclose(handleOAL); dlclose(handleOAL);

16
src/native/common/org_lwjgl_openal_ALC.cpp
View File

@ -112,21 +112,22 @@ JNIEXPORT void JNICALL Java_org_lwjgl_openal_ALC_getIntegerv (JNIEnv *env, jobje
* ALCdevice *alcOpenDevice( const ALubyte *tokstr ); * ALCdevice *alcOpenDevice( const ALubyte *tokstr );
*/ */
JNIEXPORT jobject JNICALL Java_org_lwjgl_openal_ALC_openDevice (JNIEnv *env, jobject obj, jstring tokstr) { JNIEXPORT jobject JNICALL Java_org_lwjgl_openal_ALC_openDevice (JNIEnv *env, jobject obj, jstring tokstr) {
ALubyte* tokenstring; const char * tokenstring;
jboolean isCopy = JNI_FALSE;
if(tokstr != NULL) { if(tokstr != NULL) {
tokenstring = (ALubyte*) (env->GetStringUTFChars(tokstr, 0)); tokenstring = (env->GetStringUTFChars(tokstr, &isCopy));
} else { } else {
tokenstring = NULL; tokenstring = NULL;
} }
/* get device */ /* get device */
ALCdevice* device = alcOpenDevice(tokenstring); ALCdevice* device = alcOpenDevice((ALubyte *) tokenstring);
/* if error - cleanup and get out */ /* if error - cleanup and get out */
if(device == NULL) { if(device == NULL) {
if(tokenstring != NULL) { if(tokenstring != NULL) {
env->ReleaseStringUTFChars((jstring)tokenstring, 0); env->ReleaseStringUTFChars(tokstr, tokenstring);
} }
return NULL; return NULL;
} }
@ -144,7 +145,8 @@ JNIEXPORT jobject JNICALL Java_org_lwjgl_openal_ALC_openDevice (JNIEnv *env, job
alcDevice_object = env->NewObject(alcDevice_class, alcDevice_method, (int) device); alcDevice_object = env->NewObject(alcDevice_class, alcDevice_method, (int) device);
/* clean up */ /* clean up */
env->ReleaseStringUTFChars((jstring)tokenstring, 0); if (tokenstring != NULL)
env->ReleaseStringUTFChars(tokstr, tokenstring);
return alcDevice_object; return alcDevice_object;
} }
@ -358,7 +360,7 @@ JNIEXPORT jboolean JNICALL Java_org_lwjgl_openal_ALC_isExtensionPresent (JNIEnv
jboolean result = (jboolean) alcIsExtensionPresent((ALCdevice*) deviceaddress, functionname); jboolean result = (jboolean) alcIsExtensionPresent((ALCdevice*) deviceaddress, functionname);
env->ReleaseStringUTFChars((jstring)functionname, 0); env->ReleaseStringUTFChars(extName, (const char *)functionname);
CHECK_ALC_ERROR CHECK_ALC_ERROR
return result; return result;
@ -381,7 +383,7 @@ JNIEXPORT jint JNICALL Java_org_lwjgl_openal_ALC_getEnumValue (JNIEnv *env, jobj
jint result = (jint) alcGetEnumValue((ALCdevice*) deviceaddress, enumerationname); jint result = (jint) alcGetEnumValue((ALCdevice*) deviceaddress, enumerationname);
env->ReleaseStringUTFChars((jstring)enumerationname, 0); env->ReleaseStringUTFChars(enumName, (const char *)enumerationname);
CHECK_ALC_ERROR CHECK_ALC_ERROR
return result; return result;