[Java-game-lib-cvs] CVS: LWJGL/src/native/win32 org_lwjgl_openal_ALC.cpp,1.2,1.3

[Brian M. <ma...@us...>]

Update of /cvsroot/java-game-lib/LWJGL/src/native/win32
In directory usw-pr-cvs1:/tmp/cvs-serv18691

Modified Files:
	org_lwjgl_openal_ALC.cpp 
Log Message:
fix: wrong header file being included (DOH!)
fix: using wrong object to retrieve field values from

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.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- org_lwjgl_openal_ALC.cpp	25 Aug 2002 11:02:21 -0000	1.2
+++ org_lwjgl_openal_ALC.cpp	26 Aug 2002 15:07:31 -0000	1.3
@@ -38,7 +38,7 @@
  * @author Brian Matzon <br...@ma...>
  * @version $Revision$
  */
-#include "org_lwjgl_openal_ALUT.h"
+#include "org_lwjgl_openal_ALC.h"
 
 /* OpenAL includes */
 #include <alc.h>
@@ -116,7 +116,7 @@
 JNIEXPORT void JNICALL Java_org_lwjgl_openal_ALC_closeDevice (JNIEnv *env, jobject obj, jobject device) {
 	jclass device_class		= env->GetObjectClass(device);
 	jfieldID device_field	= env->GetFieldID(device_class, "device", "I");
-	jint deviceaddress		= env->GetIntField(obj, device_field);
+	jint deviceaddress		= env->GetIntField(device, device_field);
 
 	alcCloseDevice((ALCdevice*) deviceaddress);
 }
@@ -131,9 +131,10 @@
 	/* get device address */
 	jclass device_class		= env->GetObjectClass(device);
 	jfieldID device_field	= env->GetFieldID(device_class, "device", "I");
-	jint deviceaddress		= env->GetIntField(obj, device_field);
+	jint deviceaddress		= env->GetIntField(device, device_field);
 
 	ALCcontext* context = alcCreateContext((ALCdevice*) deviceaddress, (ALint*) attrlist); 
+	
 	/* if error - get out */
 	if(context == NULL) {
 		return NULL;
@@ -164,7 +165,7 @@
 	/* get context address */
 	jclass context_class	= env->GetObjectClass(context);
 	jfieldID context_field	= env->GetFieldID(context_class, "context", "I");
-	jint contextaddress		= env->GetIntField(obj, context_field);
+	jint contextaddress		= env->GetIntField(context, context_field);
 
 	return alcMakeContextCurrent((ALCcontext*) contextaddress);
 }
@@ -179,7 +180,7 @@
 	/* get context address */
 	jclass context_class	= env->GetObjectClass(context);
 	jfieldID context_field	= env->GetFieldID(context_class, "context", "I");
-	jint contextaddress		= env->GetIntField(obj, context_field);
+	jint contextaddress		= env->GetIntField(context, context_field);
 
 	alcProcessContext((ALCcontext*) contextaddress);
 }
@@ -223,7 +224,7 @@
 	/* get context address */
 	jclass context_class	= env->GetObjectClass(context);
 	jfieldID context_field	= env->GetFieldID(context_class, "context", "I");
-	jint contextaddress		= env->GetIntField(obj, context_field);
+	jint contextaddress		= env->GetIntField(context, context_field);
 
 	ALCdevice* device = alcGetContextsDevice((ALCcontext*) contextaddress); 
 	if(device == NULL) {
@@ -255,7 +256,7 @@
 	/* get context address */
 	jclass context_class	= env->GetObjectClass(context);
 	jfieldID context_field	= env->GetFieldID(context_class, "context", "I");
-	jint contextaddress		= env->GetIntField(obj, context_field);
+	jint contextaddress		= env->GetIntField(context, context_field);
 
 	alcSuspendContext((ALCcontext*) contextaddress);
 }
@@ -270,7 +271,7 @@
 	/* get context address */
 	jclass context_class	= env->GetObjectClass(context);
 	jfieldID context_field	= env->GetFieldID(context_class, "context", "I");
-	jint contextaddress		= env->GetIntField(obj, context_field);
+	jint contextaddress		= env->GetIntField(context, context_field);
 
 	alcDestroyContext((ALCcontext*) contextaddress);
 }
@@ -285,7 +286,7 @@
 	/* get device address */
 	jclass device_class		= env->GetObjectClass(device);
 	jfieldID device_field	= env->GetFieldID(device_class, "device", "I");
-	jint deviceaddress		= env->GetIntField(obj, device_field);
+	jint deviceaddress		= env->GetIntField(device, device_field);
 
 	return (jint) alcGetError((ALCdevice*) deviceaddress);
 }
@@ -300,7 +301,7 @@
 	/* get device address */
 	jclass device_class		= env->GetObjectClass(device);
 	jfieldID device_field	= env->GetFieldID(device_class, "device", "I");
-	jint deviceaddress		= env->GetIntField(obj, device_field);
+	jint deviceaddress		= env->GetIntField(device, device_field);
 	
 	/* get extension */
 	ALubyte* functionname = (ALubyte*) (env->GetStringUTFChars(extName, 0));
@@ -322,7 +323,7 @@
 	/* get device address */
 	jclass device_class		= env->GetObjectClass(device);
 	jfieldID device_field	= env->GetFieldID(device_class, "device", "I");
-	jint deviceaddress		= env->GetIntField(obj, device_field);
+	jint deviceaddress		= env->GetIntField(device, device_field);
 	
 	/* get extension */
 	ALubyte* functionname = (ALubyte*) (env->GetStringUTFChars(funcName, 0));
@@ -344,7 +345,7 @@
 	/* get device address */
 	jclass device_class		= env->GetObjectClass(device);
 	jfieldID device_field	= env->GetFieldID(device_class, "device", "I");
-	jint deviceaddress		= env->GetIntField(obj, device_field);
+	jint deviceaddress		= env->GetIntField(device, device_field);
 	
 	/* get extension */
 	ALubyte* enumerationname = (ALubyte*) (env->GetStringUTFChars(enumName, 0));