Menu
▾
▴
[Java-game-lib-cvs] CVS: LWJGL/src/native/win32 org_lwjgl_openal_ALC.cpp,1.3,1.4 org_lwjgl_openal_ALUT.cpp,1.4,1.5 org_lwjgl_openal_CoreAL.cpp,1.2,1.3
|
From: Brian M. <ma...@us...> - 2002-08-26 18:23:14
|
Update of /cvsroot/java-game-lib/LWJGL/src/native/win32 In directory usw-pr-cvs1:/tmp/cvs-serv30337 Modified Files: org_lwjgl_openal_ALC.cpp org_lwjgl_openal_ALUT.cpp org_lwjgl_openal_CoreAL.cpp Log Message: add: macro AL error checking 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.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- org_lwjgl_openal_ALC.cpp 26 Aug 2002 15:07:31 -0000 1.3 +++ org_lwjgl_openal_ALC.cpp 26 Aug 2002 18:23:10 -0000 1.4 @@ -39,6 +39,7 @@ * @version $Revision$ */ #include "org_lwjgl_openal_ALC.h" +#include "checkALerror.h" /* OpenAL includes */ #include <alc.h> @@ -54,7 +55,10 @@ jfieldID field_device = env->GetFieldID(class_device, "device", "I"); jint deviceaddress = env->GetIntField(obj, field_device); - return env->NewStringUTF((const char*) alcGetString((ALCdevice*) deviceaddress, (ALenum) token)); + jstring string = env->NewStringUTF((const char*) alcGetString((ALCdevice*) deviceaddress, (ALenum) token)); + + CHECK_ALC_ERROR + return string; } /** @@ -69,6 +73,7 @@ jint deviceaddress = env->GetIntField(obj, device_field); alcGetIntegerv((ALCdevice*) deviceaddress, (ALenum) token, (ALsizei) size, (ALint*) dest); + CHECK_ALC_ERROR } /** @@ -119,6 +124,7 @@ jint deviceaddress = env->GetIntField(device, device_field); alcCloseDevice((ALCdevice*) deviceaddress); + CHECK_ALC_ERROR } /** @@ -152,6 +158,7 @@ /* create instance */ alcContext_object = env->NewObject(alcContext_class, alcContext_method, (int) context); + CHECK_ALC_ERROR return alcContext_object; } @@ -288,7 +295,9 @@ jfieldID device_field = env->GetFieldID(device_class, "device", "I"); jint deviceaddress = env->GetIntField(device, device_field); - return (jint) alcGetError((ALCdevice*) deviceaddress); + jint result = alcGetError((ALCdevice*) deviceaddress); + CHECK_ALC_ERROR + return result; } /** @@ -310,6 +319,7 @@ env->ReleaseStringUTFChars((jstring)functionname, 0); + CHECK_ALC_ERROR return result; } @@ -332,6 +342,7 @@ env->ReleaseStringUTFChars((jstring)functionname, 0); + CHECK_ALC_ERROR return result; } @@ -354,5 +365,6 @@ env->ReleaseStringUTFChars((jstring)enumerationname, 0); + CHECK_ALC_ERROR return result; } 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.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- org_lwjgl_openal_ALUT.cpp 18 Aug 2002 13:56:29 -0000 1.4 +++ org_lwjgl_openal_ALUT.cpp 26 Aug 2002 18:23:11 -0000 1.5 @@ -40,6 +40,7 @@ * @version $Revision$ */ #include "org_lwjgl_openal_ALUT.h" +#include "checkALerror.h" /* OpenAL includes */ #include <alut.h> @@ -79,6 +80,7 @@ /* call the actual implementation */ alutInit((ALint*) &argc,(char**) argv); + CHECK_AL_ERROR } /* * This function loads a WAV file into memory from a file. @@ -128,6 +130,7 @@ /* release chars */ env->ReleaseStringUTFChars((jstring)filename, 0); + CHECK_AL_ERROR return alutLoadWAVFile_object; } @@ -179,6 +182,7 @@ /* release bytearray again */ env->ReleaseByteArrayElements(buffer, (jbyte*) bufferlocation, 0); + CHECK_AL_ERROR return alutLoadWAVFile_object; } @@ -191,6 +195,7 @@ */ JNIEXPORT void JNICALL Java_org_lwjgl_openal_ALUT_unloadWAV (JNIEnv *env, jobject obj, jint format, jint data, jint size, jint freq) { alutUnloadWAV(format, (void**) data, size, freq); + CHECK_AL_ERROR } /** @@ -201,4 +206,5 @@ */ JNIEXPORT void JNICALL Java_org_lwjgl_openal_ALUT_exit (JNIEnv *env, jobject obj) { alutExit(); + CHECK_AL_ERROR } Index: org_lwjgl_openal_CoreAL.cpp CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/win32/org_lwjgl_openal_CoreAL.cpp =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/win32/org_lwjgl_openal_CoreAL.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- org_lwjgl_openal_CoreAL.cpp 19 Aug 2002 13:54:34 -0000 1.2 +++ org_lwjgl_openal_CoreAL.cpp 26 Aug 2002 18:23:11 -0000 1.3 @@ -40,6 +40,7 @@ * @version $Revision$ */ #include "org_lwjgl_openal_CoreAL.h" +#include "checkALerror.h" /* OpenAL includes */ #include <al.h> @@ -52,6 +53,7 @@ */ JNIEXPORT void JNICALL Java_org_lwjgl_openal_CoreAL_enable (JNIEnv *env, jobject obj, jint capability) { alEnable((ALenum) capability); + CHECK_AL_ERROR } /** @@ -62,6 +64,7 @@ */ JNIEXPORT void JNICALL Java_org_lwjgl_openal_CoreAL_disable (JNIEnv *env, jobject obj, jint capability) { alDisable((ALenum) capability); + CHECK_AL_ERROR } /** @@ -71,7 +74,10 @@ * Alboolean alIsEnabled(ALenum capability); */ JNIEXPORT jboolean JNICALL Java_org_lwjgl_openal_CoreAL_isEnabled (JNIEnv *env, jobject obj, jint capability) { - return (jboolean) alIsEnabled((ALenum) capability); + jboolean result = (jboolean) alIsEnabled((ALenum) capability); + + CHECK_AL_ERROR + return result; } /** @@ -94,7 +100,10 @@ * Alboolean alGetBoolean(ALenum pname); */ JNIEXPORT jboolean JNICALL Java_org_lwjgl_openal_CoreAL_getBoolean (JNIEnv *env, jobject obj, jint pname) { - return (jboolean) alGetBoolean((ALenum) pname); + jboolean result = (jboolean) alGetBoolean((ALenum) pname); + + CHECK_AL_ERROR + return result; } /** @@ -104,7 +113,10 @@ * Alint alGetInteger(ALenum pname); */ JNIEXPORT jint JNICALL Java_org_lwjgl_openal_CoreAL_getInteger (JNIEnv *env, jobject obj, jint pname) { - return (jint) alGetInteger((ALenum) pname); + jint result = (jint) alGetInteger((ALenum) pname); + + CHECK_AL_ERROR + return result; } /** @@ -114,7 +126,10 @@ * ALfloat alGetFloat(ALenum pname); */ JNIEXPORT jfloat JNICALL Java_org_lwjgl_openal_CoreAL_getFloat (JNIEnv *env, jobject obj, jint pname) { - return (jfloat) alGetFloat((ALenum) pname); + jfloat result = (jfloat) alGetFloat((ALenum) pname); + + CHECK_AL_ERROR + return result; } /** @@ -124,7 +139,10 @@ * Aldouble alGetDouble(ALenum pname); */ JNIEXPORT jdouble JNICALL Java_org_lwjgl_openal_CoreAL_getDouble (JNIEnv *env, jobject obj, jint pname) { - return (jdouble) alGetDouble((ALenum) pname); + jdouble result = (jdouble) alGetDouble((ALenum) pname); + + CHECK_AL_ERROR + return result; } /** @@ -135,6 +153,7 @@ */ JNIEXPORT void JNICALL Java_org_lwjgl_openal_CoreAL_getBooleanv (JNIEnv *env, jobject obj, jint pname, jint data) { alGetBooleanv((ALenum) pname, (ALboolean*) data); + CHECK_AL_ERROR } /** @@ -145,6 +164,7 @@ */ JNIEXPORT void JNICALL Java_org_lwjgl_openal_CoreAL_getIntegerv (JNIEnv *env, jobject obj, jint pname, jint data) { alGetIntegerv((ALenum) pname, (ALint*) data); + CHECK_AL_ERROR } /** @@ -155,6 +175,7 @@ */ JNIEXPORT void JNICALL Java_org_lwjgl_openal_CoreAL_getFloatv (JNIEnv *env, jobject obj, jint pname, jint data) { alGetFloatv((ALenum) pname, (ALfloat*) data); + CHECK_AL_ERROR } /** @@ -165,6 +186,7 @@ */ JNIEXPORT void JNICALL Java_org_lwjgl_openal_CoreAL_getDoublev (JNIEnv *env, jobject obj, jint pname, jint data) { alGetDoublev((ALenum) pname, (ALdouble*) data); + CHECK_AL_ERROR } /** @@ -174,7 +196,10 @@ * ALubyte * alGetString(ALenum pname); */ JNIEXPORT jstring JNICALL Java_org_lwjgl_openal_CoreAL_getString (JNIEnv *env, jobject obj, jint param) { - return env->NewStringUTF((const char*) alGetString((ALenum)param)); + jstring string = (jstring) env->NewStringUTF((const char*) alGetString((ALenum)param)); + + CHECK_AL_ERROR + return string; } /** @@ -184,7 +209,10 @@ * ALenum alGetError(ALvoid); */ JNIEXPORT jint JNICALL Java_org_lwjgl_openal_CoreAL_getError (JNIEnv *env, jobject obj) { - return (jint) alGetError(); + jint result = (jint) alGetError(); + + CHECK_AL_ERROR + return result; } /** @@ -198,6 +226,7 @@ jboolean result = (jboolean) alIsExtensionPresent(functionname); env->ReleaseStringUTFChars((jstring)functionname, 0); + CHECK_AL_ERROR return result; } @@ -212,6 +241,7 @@ jint result = (jint) alGetProcAddress(functionname); env->ReleaseStringUTFChars((jstring)functionname, 0); + CHECK_AL_ERROR return result; } @@ -226,6 +256,7 @@ jint result = (jint) alGetEnumValue(functionname); env->ReleaseStringUTFChars((jstring)functionname, 0); + CHECK_AL_ERROR return result; } @@ -237,6 +268,7 @@ */ JNIEXPORT void JNICALL Java_org_lwjgl_openal_CoreAL_listeneri (JNIEnv *env, jobject obj, jint pname, jint value) { alListeneri((ALenum) pname, (ALint) value); + CHECK_AL_ERROR } /** @@ -247,6 +279,7 @@ */ JNIEXPORT void JNICALL Java_org_lwjgl_openal_CoreAL_listenerf (JNIEnv *env, jobject obj, jint pname, jfloat value) { alListenerf((ALenum) pname, (ALfloat) value); + CHECK_AL_ERROR } /** @@ -257,6 +290,7 @@ */ JNIEXPORT void JNICALL Java_org_lwjgl_openal_CoreAL_listener3f (JNIEnv *env, jobject obj, jint pname, jfloat v1, jfloat v2, jfloat v3) { alListener3f((ALenum) pname, (ALfloat) v1, (ALfloat) v2, (ALfloat) v3); + CHECK_AL_ERROR } /** @@ -267,6 +301,7 @@ */ JNIEXPORT void JNICALL Java_org_lwjgl_openal_CoreAL_listenerfv (JNIEnv *env, jobject obj, jint pname, jint values) { alListenerfv((ALenum) pname, (ALfloat*) values); + CHECK_AL_ERROR } /** @@ -277,6 +312,7 @@ */ JNIEXPORT void JNICALL Java_org_lwjgl_openal_CoreAL_getListeneri (JNIEnv *env, jobject obj, jint pname, jint value) { alGetListeneri((ALenum) pname, (ALint*) value); + CHECK_AL_ERROR } /** @@ -287,6 +323,7 @@ */ JNIEXPORT void JNICALL Java_org_lwjgl_openal_CoreAL_getListenerf (JNIEnv *env, jobject obj, jint pname, jint value) { alGetListenerf((ALenum) pname, (ALfloat*) value); + CHECK_AL_ERROR } /** @@ -297,6 +334,7 @@ */ JNIEXPORT void JNICALL Java_org_lwjgl_openal_CoreAL_getListener3f (JNIEnv *env, jobject obj, jint pname, jint v1, jint v2, jint v3) { alGetListener3f((ALenum) pname, (ALfloat*) v1, (ALfloat*) v2, (ALfloat*) v3); + CHECK_AL_ERROR } /** @@ -307,6 +345,7 @@ */ JNIEXPORT void JNICALL Java_org_lwjgl_openal_CoreAL_getListenerfv (JNIEnv *env, jobject obj, jint pname, jint values) { alGetListenerfv((ALenum) pname, (ALfloat*) values); + CHECK_AL_ERROR } /** @@ -319,6 +358,7 @@ int* array = (int*) env->GetIntArrayElements(sources, 0); alGenSources(n, (ALuint*) array); env->ReleaseIntArrayElements(sources, (jint*) array, 0); + CHECK_AL_ERROR } /** @@ -331,6 +371,7 @@ int* array = (int*) env->GetIntArrayElements(source, 0); alDeleteSources(n, (ALuint*) array); env->ReleaseIntArrayElements(source, (jint*) array, 0); + CHECK_AL_ERROR } /** @@ -340,7 +381,10 @@ * Alboolean alIsSource(ALuint source); */ JNIEXPORT jboolean JNICALL Java_org_lwjgl_openal_CoreAL_isSource (JNIEnv *env, jobject obj, jint source) { - return (jboolean) alIsSource((ALuint) source); + jboolean result = (jboolean) alIsSource((ALuint) source); + + CHECK_AL_ERROR + return result; } /** @@ -351,6 +395,7 @@ */ JNIEXPORT void JNICALL Java_org_lwjgl_openal_CoreAL_sourcei (JNIEnv *env, jobject obj, jint source, jint pname, jint value) { alSourcei((ALuint) source, (ALenum) pname, (ALint) value); + CHECK_AL_ERROR } /** @@ -361,6 +406,7 @@ */ JNIEXPORT void JNICALL Java_org_lwjgl_openal_CoreAL_sourcef (JNIEnv *env, jobject obj, jint source, jint pname, jfloat value) { alSourcef((ALuint) source, (ALenum) pname, (ALfloat) value); + CHECK_AL_ERROR } /** @@ -370,6 +416,7 @@ */ JNIEXPORT void JNICALL Java_org_lwjgl_openal_CoreAL_source3f (JNIEnv *env, jobject obj, jint source, jint pname, jfloat v1, jfloat v2, jfloat v3) { alSource3f((ALuint) source, (ALenum) pname, (ALfloat) v1, (ALfloat) v2, (ALfloat) v3); + CHECK_AL_ERROR } /** @@ -380,6 +427,7 @@ */ JNIEXPORT void JNICALL Java_org_lwjgl_openal_CoreAL_sourcefv (JNIEnv *env, jobject obj, jint source, jint pname, jint values) { alSourcefv((ALuint) source, (ALenum) pname, (ALfloat*) values); + CHECK_AL_ERROR } /** @@ -389,6 +437,7 @@ */ JNIEXPORT void JNICALL Java_org_lwjgl_openal_CoreAL_getSourcei (JNIEnv *env, jobject obj, jint source, jint pname, jint value) { alGetSourcei((ALuint) source, (ALenum) pname, (ALint*) value); + CHECK_AL_ERROR } /** @@ -399,6 +448,7 @@ */ JNIEXPORT void JNICALL Java_org_lwjgl_openal_CoreAL_getSourcef (JNIEnv *env, jobject obj, jint source, jint pname, jint value) { alGetSourcef((ALuint) source, (ALenum) pname, (ALfloat*) value); + CHECK_AL_ERROR } /* @@ -409,6 +459,7 @@ */ JNIEXPORT void JNICALL Java_org_lwjgl_openal_CoreAL_getSource3f (JNIEnv *env, jobject obj, jint source, jint pname, jint v1, jint v2, jint v3) { alGetSource3f((ALuint) source, (ALenum) pname, (ALfloat*) v1, (ALfloat*) v2, (ALfloat*) v3); + CHECK_AL_ERROR } /** @@ -419,6 +470,7 @@ */ JNIEXPORT void JNICALL Java_org_lwjgl_openal_CoreAL_getSourcefv (JNIEnv *env, jobject obj, jint source, jint pname, jint values) { alGetSourcefv((ALuint) source, (ALenum) pname, (ALfloat*) values); + CHECK_AL_ERROR } /** @@ -431,6 +483,7 @@ int* array = (int*) env->GetIntArrayElements(sources, 0); alSourcePlayv(n, (ALuint*) array); env->ReleaseIntArrayElements(sources, (jint*) array, 0); + CHECK_AL_ERROR } /** @@ -443,6 +496,7 @@ int* array = (int*) env->GetIntArrayElements(sources, 0); alSourcePausev(n, (ALuint*) array); env->ReleaseIntArrayElements(sources, (jint*) array, 0); + CHECK_AL_ERROR } /** @@ -455,6 +509,7 @@ int* array = (int*) env->GetIntArrayElements(sources, 0); alSourceStopv(n, (ALuint*) array); env->ReleaseIntArrayElements(sources, (jint*) array, 0); + CHECK_AL_ERROR } /** @@ -467,6 +522,7 @@ int* array = (int*) env->GetIntArrayElements(sources, 0); alSourceRewindv(n, (ALuint*) array); env->ReleaseIntArrayElements(sources, (jint*) array, 0); + CHECK_AL_ERROR } /** @@ -477,6 +533,7 @@ */ JNIEXPORT void JNICALL Java_org_lwjgl_openal_CoreAL_sourcePlay (JNIEnv *env, jobject obj, jint source) { alSourcePlay((ALuint) source); + CHECK_AL_ERROR } /* @@ -487,6 +544,7 @@ */ JNIEXPORT void JNICALL Java_org_lwjgl_openal_CoreAL_sourcePause (JNIEnv *env, jobject obj, jint source) { alSourcePause((ALuint) source); + CHECK_AL_ERROR } /** @@ -497,6 +555,7 @@ */ JNIEXPORT void JNICALL Java_org_lwjgl_openal_CoreAL_sourceStop (JNIEnv *env, jobject obj, jint source) { alSourceStop((ALuint) source); + CHECK_AL_ERROR } /** @@ -507,6 +566,7 @@ */ JNIEXPORT void JNICALL Java_org_lwjgl_openal_CoreAL_sourceRewind (JNIEnv *env, jobject obj, jint source) { alSourceRewind((ALuint) source); + CHECK_AL_ERROR } /** @@ -519,6 +579,7 @@ int* array = (int*) env->GetIntArrayElements(buffers, 0); alGenBuffers(n, (ALuint*) array); env->ReleaseIntArrayElements(buffers, (jint*) array, 0); + CHECK_AL_ERROR } /** @@ -531,6 +592,7 @@ int* array = (int*) env->GetIntArrayElements(buffer, 0); alDeleteBuffers(n, (ALuint*) array); env->ReleaseIntArrayElements(buffer, (jint*) array, 0); + CHECK_AL_ERROR } /** @@ -540,7 +602,10 @@ * Alboolean alIsBuffer(ALuint buffer); */ JNIEXPORT jboolean JNICALL Java_org_lwjgl_openal_CoreAL_isBuffer (JNIEnv *env, jobject obj, jint buffer) { - return (jboolean) alIsBuffer((ALuint) buffer); + jboolean result = (jboolean) alIsBuffer((ALuint) buffer); + + CHECK_AL_ERROR + return result; } /** @@ -551,6 +616,7 @@ */ JNIEXPORT void JNICALL Java_org_lwjgl_openal_CoreAL_bufferData (JNIEnv *env, jobject obj, jint buffer, jint format, jint data, jint size, jint freq) { alBufferData(buffer, format, (void**) data, size, freq); + CHECK_AL_ERROR } /** @@ -561,6 +627,7 @@ */ JNIEXPORT void JNICALL Java_org_lwjgl_openal_CoreAL_getBufferi (JNIEnv *env, jobject obj, jint buffer, jint pname, jint value) { alGetBufferi((ALuint) buffer, (ALenum) pname, (ALint*) value); + CHECK_AL_ERROR } /** @@ -571,6 +638,7 @@ */ JNIEXPORT void JNICALL Java_org_lwjgl_openal_CoreAL_getBufferf (JNIEnv *env, jobject obj, jint buffer, jint pname, jint value) { alGetBufferf((ALuint) buffer, (ALenum) pname, (ALfloat*) value); + CHECK_AL_ERROR } /** @@ -583,6 +651,7 @@ int* array = (int*) env->GetIntArrayElements(buffers, 0); alSourceQueueBuffers((ALuint) source, (ALsizei) n, (ALuint*) array); env->ReleaseIntArrayElements(buffers, (jint*) array, 0); + CHECK_AL_ERROR } /** @@ -595,6 +664,7 @@ int* array = (int*) env->GetIntArrayElements(buffers, 0); alSourceUnqueueBuffers((ALuint) source, (ALsizei) n, (ALuint*) array); env->ReleaseIntArrayElements(buffers, (jint*) array, 0); + CHECK_AL_ERROR } /** @@ -606,6 +676,7 @@ JNIEXPORT void JNICALL Java_org_lwjgl_openal_CoreAL_distanceModel (JNIEnv *env, jobject obj, jint value) { alDistanceModel((ALenum) value); + CHECK_AL_ERROR } /** @@ -616,6 +687,7 @@ */ JNIEXPORT void JNICALL Java_org_lwjgl_openal_CoreAL_dopplerFactor (JNIEnv *env, jobject obj, jfloat value) { alDopplerFactor((ALfloat) value); + CHECK_AL_ERROR } /** @@ -626,8 +698,5 @@ */ JNIEXPORT void JNICALL Java_org_lwjgl_openal_CoreAL_dopplerVelocity (JNIEnv *env, jobject obj, jfloat value) { alDopplerVelocity((ALfloat) value); -} - - - - + CHECK_AL_ERROR +} \ No newline at end of file |
