Update of /cvsroot/java-game-lib/LWJGL/src/native/win32
In directory usw-pr-cvs1:/tmp/cvs-serv10494
Modified Files:
org_lwjgl_openal_ALC.cpp
Log Message:
fix: made java impl. behave like C counterpart, by returning NULL
Index: org_lwjgl_openal_ALC.cpp
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/win32/org_lwjgl_openal_ALC.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/win32/org_lwjgl_openal_ALC.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- org_lwjgl_openal_ALC.cpp 20 Aug 2002 14:46:04 -0000 1.1
+++ org_lwjgl_openal_ALC.cpp 25 Aug 2002 11:02:21 -0000 1.2
@@ -83,6 +83,12 @@
/* get device */
ALCdevice* device = alcOpenDevice(tokenstring);
+ /* if error - cleanup and get out */
+ if(device == NULL) {
+ env->ReleaseStringUTFChars((jstring)tokenstring, 0);
+ return NULL;
+ }
+
/* get ready to create ALCdevice instance */
jobject alcDevice_object = NULL;
jclass alcDevice_class = NULL;
@@ -128,6 +134,10 @@
jint deviceaddress = env->GetIntField(obj, device_field);
ALCcontext* context = alcCreateContext((ALCdevice*) deviceaddress, (ALint*) attrlist);
+ /* if error - get out */
+ if(context == NULL) {
+ return NULL;
+ }
/* get ready to create ALCcontext instance */
jobject alcContext_object = NULL;
@@ -182,7 +192,10 @@
*/
JNIEXPORT jobject JNICALL Java_org_lwjgl_openal_ALC_getCurrentContext (JNIEnv *env, jobject obj) {
- ALCcontext* context = alcGetCurrentContext();
+ ALCcontext* context = alcGetCurrentContext();
+ if(context == NULL) {
+ return NULL;
+ }
/* get ready to create ALCcontext instance */
jobject alcContext_object = NULL;
@@ -213,8 +226,11 @@
jint contextaddress = env->GetIntField(obj, context_field);
ALCdevice* device = alcGetContextsDevice((ALCcontext*) contextaddress);
+ if(device == NULL) {
+ return NULL;
+ }
- /* get ready to create ALCdevice instance */
+ /* get ready to create ALCdevice instance */
jobject alcDevice_object = NULL;
jclass alcDevice_class = NULL;
jmethodID alcDevice_method = NULL;
|
