Update of /cvsroot/java-game-lib/LWJGL/src/native/win32
In directory usw-pr-cvs1:/tmp/cvs-serv4170
Modified Files:
org_lwjgl_openal_ALUT.cpp
Log Message:
fix: now uses ByteBuffer address to load buffer when using alutLoadWAVMemory
fix: minor cleanup
Index: org_lwjgl_openal_ALUT.cpp
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/win32/org_lwjgl_openal_ALUT.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/win32/org_lwjgl_openal_ALUT.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- org_lwjgl_openal_ALUT.cpp 26 Aug 2002 18:23:11 -0000 1.5
+++ org_lwjgl_openal_ALUT.cpp 28 Aug 2002 22:46:54 -0000 1.6
@@ -106,7 +106,7 @@
/* class type to find */
jclass alutLoadWAVFile_class = NULL;
- /* method id - will be set to constructor of alutLoadWAVFile */
+ /* method id - will be set to constructor of alutLoadWAVData */
jmethodID methodID = NULL;
/* sound data vars */
@@ -141,7 +141,7 @@
* ALvoid alutLoadWAVMemory(ALbyte *memory,ALenum *format,ALvoid **data,ALsizei
* *size,ALsizei *freq,ALboolean *loop)
*/
-JNIEXPORT jobject JNICALL Java_org_lwjgl_openal_ALUT_loadWAVMemory (JNIEnv *env, jobject obj, jbyteArray buffer) {
+JNIEXPORT jobject JNICALL Java_org_lwjgl_openal_ALUT_loadWAVMemory (JNIEnv *env, jobject obj, jint buffer) {
/*
* NOTE: Since Java doesn't support modification of supplied
@@ -158,17 +158,16 @@
/* class type to find */
jclass alutLoadWAVFile_class = NULL;
- /* method id - will be set to constructor of alutLoadWAVFile */
+ /* method id - will be set to constructor of alutLoadWAVData */
jmethodID methodID = NULL;
/* sound data vars */
jint format, size, freq;
jboolean loop;
void* data;
- ALbyte* bufferlocation = (ALbyte*) (env->GetByteArrayElements(buffer, 0));
-
+
/* load wave from mem */
- alutLoadWAVMemory(bufferlocation, (ALenum*) &format, (void**) &data, (ALsizei*) &size, (ALsizei*) &freq, (ALboolean*) &loop);
+ alutLoadWAVMemory((ALbyte*) buffer, (ALenum*) &format, (void**) &data, (ALsizei*) &size, (ALsizei*) &freq, (ALboolean*) &loop);
/* get class */
alutLoadWAVFile_class = env->FindClass("org/lwjgl/openal/ALUTLoadWAVData");
@@ -178,9 +177,6 @@
/* create object */
alutLoadWAVFile_object = env->NewObject(alutLoadWAVFile_class, methodID, format, (int) data, size, freq, loop);
-
- /* release bytearray again */
- env->ReleaseByteArrayElements(buffer, (jbyte*) bufferlocation, 0);
CHECK_AL_ERROR
return alutLoadWAVFile_object;
|
