From 21cdb1f469256de19e4007d067c2f9cf1f737d9b Mon Sep 17 00:00:00 2001 From: Elias Naur Date: Tue, 9 Mar 2004 11:03:10 +0000 Subject: [PATCH] Converted openal to dynamic java native methods --- src/java/org/lwjgl/openal/AL10.java | 2 - src/java/org/lwjgl/openal/ALC.java | 18 +- src/native/common/common_tools.cpp | 5 +- src/native/common/common_tools.h | 2 +- src/native/common/extal.cpp | 249 +-------- src/native/common/extal.h | 155 +----- src/native/common/extgl.cpp | 12 +- src/native/common/extgl.h | 4 +- src/native/common/org_lwjgl_openal_AL10.cpp | 287 +++++++++-- src/native/common/org_lwjgl_openal_AL10.h | 533 -------------------- src/native/common/org_lwjgl_openal_ALC.cpp | 109 ++-- src/native/common/org_lwjgl_openal_ALC.h | 180 ------- src/native/common/org_lwjgl_opengl_GL11.cpp | 6 +- 13 files changed, 338 insertions(+), 1224 deletions(-) delete mode 100644 src/native/common/org_lwjgl_openal_AL10.h delete mode 100644 src/native/common/org_lwjgl_openal_ALC.h diff --git a/src/java/org/lwjgl/openal/AL10.java b/src/java/org/lwjgl/openal/AL10.java index 6f990f8b..e1563360 100644 --- a/src/java/org/lwjgl/openal/AL10.java +++ b/src/java/org/lwjgl/openal/AL10.java @@ -443,8 +443,6 @@ public final class AL10 { */ public static native float alGetFloat(int pname); - private static native void nalGetBooleanv(int pname, ByteBuffer data, int offset); - /** * Like OpenGL, AL uses a simplified interface for querying global state. * diff --git a/src/java/org/lwjgl/openal/ALC.java b/src/java/org/lwjgl/openal/ALC.java index d9e66e84..984b767e 100644 --- a/src/java/org/lwjgl/openal/ALC.java +++ b/src/java/org/lwjgl/openal/ALC.java @@ -170,20 +170,10 @@ public class ALC { return; } - if (!nCreate()) { - throw new OpenALException("ALC instance could not be created."); - } init(); created = true; } - /** - * Native method to create ALC instance - * - * @return true if the ALC creation process succeeded - */ - protected static native boolean nCreate(); - /** * Calls whatever destruction rutines that are needed */ @@ -192,14 +182,8 @@ public class ALC { return; } created = false; - nDestroy(); } - /** - * Native method the destroy the ALC - */ - protected static native void nDestroy(); - /** * The application can obtain certain strings from ALC. * @@ -410,4 +394,4 @@ public class ALC { } native static int nalcGetEnumValue(int device, String enumName); -} \ No newline at end of file +} diff --git a/src/native/common/common_tools.cpp b/src/native/common/common_tools.cpp index 9b0b1c01..b4077b97 100644 --- a/src/native/common/common_tools.cpp +++ b/src/native/common/common_tools.cpp @@ -142,7 +142,7 @@ jclass ext_ResetClass(JNIEnv *env, const char *class_name) { return clazz; } -void ext_InitializeClass(JNIEnv *env, jclass clazz, jobject ext_set, const char *ext_name, ExtGetProcAddressPROC gpa, int num_functions, JavaMethodAndExtFunction *functions) { +bool ext_InitializeClass(JNIEnv *env, jclass clazz, jobject ext_set, const char *ext_name, ExtGetProcAddressPROC gpa, int num_functions, JavaMethodAndExtFunction *functions) { JNINativeMethod *methods = (JNINativeMethod *)malloc(num_functions*sizeof(JNINativeMethod)); for (int i = 0; i < num_functions; i++) { JavaMethodAndExtFunction *function = functions + i; @@ -153,7 +153,7 @@ void ext_InitializeClass(JNIEnv *env, jclass clazz, jobject ext_set, const char if (ext_set != NULL) ext_removeExtension(env, ext_set, ext_name); free(methods); - return; + return false; } void **ext_function_pointer_pointer = function->ext_function_pointer; *ext_function_pointer_pointer = ext_func_pointer; @@ -167,5 +167,6 @@ void ext_InitializeClass(JNIEnv *env, jclass clazz, jobject ext_set, const char free(methods); if (result != 0) printfDebug("Could not register natives for extension %s\n", ext_name); + return true; } diff --git a/src/native/common/common_tools.h b/src/native/common/common_tools.h index ae55f59a..5ffa7610 100644 --- a/src/native/common/common_tools.h +++ b/src/native/common/common_tools.h @@ -99,6 +99,6 @@ typedef struct { extern void doExtension(JNIEnv *env, jobject ext_set, const char *method_name, const char *ext); extern jclass ext_ResetClass(JNIEnv *env, const char *class_name); -extern void ext_InitializeClass(JNIEnv *env, jclass clazz, jobject ext_set, const char *ext_name, ExtGetProcAddressPROC gpa, int num_functions, JavaMethodAndExtFunction *functions); +extern bool ext_InitializeClass(JNIEnv *env, jclass clazz, jobject ext_set, const char *ext_name, ExtGetProcAddressPROC gpa, int num_functions, JavaMethodAndExtFunction *functions); #endif diff --git a/src/native/common/extal.cpp b/src/native/common/extal.cpp index e894d8a7..c4ce4a19 100644 --- a/src/native/common/extal.cpp +++ b/src/native/common/extal.cpp @@ -48,77 +48,6 @@ * @author Brian Matzon * @version $Revision$ */ -alEnablePROC alEnable = NULL; -alDisablePROC alDisable = NULL; -alIsEnabledPROC alIsEnabled = NULL; -alHintPROC alHint = NULL; -alGetBooleanPROC alGetBoolean = NULL; -alGetIntegerPROC alGetInteger = NULL; -alGetFloatPROC alGetFloat = NULL; -alGetDoublePROC alGetDouble = NULL; -alGetBooleanvPROC alGetBooleanv = NULL; -alGetIntegervPROC alGetIntegerv = NULL; -alGetFloatvPROC alGetFloatv = NULL; -alGetDoublevPROC alGetDoublev = NULL; -alGetStringPROC alGetString = NULL; -alGetErrorPROC alGetError = NULL; -alIsExtensionPresentPROC alIsExtensionPresent = NULL; -alGetProcAddressPROC alGetProcAddress = NULL; -alGetEnumValuePROC alGetEnumValue = NULL; -alListeneriPROC alListeneri = NULL; -alListenerfPROC alListenerf = NULL; -alListener3fPROC alListener3f = NULL; -alListenerfvPROC alListenerfv = NULL; -alGetListeneriPROC alGetListeneri = NULL; -alGetListenerfPROC alGetListenerf = NULL; -alGetListener3fPROC alGetListener3f = NULL; -alGetListenerfvPROC alGetListenerfv = NULL; -alGenSourcesPROC alGenSources = NULL; -alDeleteSourcesPROC alDeleteSources = NULL; -alIsSourcePROC alIsSource = NULL; -alSourceiPROC alSourcei = NULL; -alSourcefPROC alSourcef = NULL; -alSource3fPROC alSource3f = NULL; -alSourcefvPROC alSourcefv = NULL; -alGetSourceiPROC alGetSourcei = NULL; -alGetSourcefPROC alGetSourcef = NULL; -alGetSource3fPROC alGetSource3f = NULL; -alGetSourcefvPROC alGetSourcefv = NULL; -alSourcePlayvPROC alSourcePlayv = NULL; -alSourcePausevPROC alSourcePausev = NULL; -alSourceStopvPROC alSourceStopv = NULL; -alSourceRewindvPROC alSourceRewindv = NULL; -alSourcePlayPROC alSourcePlay = NULL; -alSourcePausePROC alSourcePause = NULL; -alSourceStopPROC alSourceStop = NULL; -alSourceRewindPROC alSourceRewind = NULL; -alGenBuffersPROC alGenBuffers = NULL; -alDeleteBuffersPROC alDeleteBuffers = NULL; -alIsBufferPROC alIsBuffer = NULL; -alBufferDataPROC alBufferData = NULL; -alGetBufferiPROC alGetBufferi = NULL; -alGetBufferfPROC alGetBufferf = NULL; -alSourceQueueBuffersPROC alSourceQueueBuffers = NULL; -alSourceUnqueueBuffersPROC alSourceUnqueueBuffers = NULL; -alDistanceModelPROC alDistanceModel = NULL; -alDopplerFactorPROC alDopplerFactor = NULL; -alDopplerVelocityPROC alDopplerVelocity = NULL; -alcGetStringPROC alcGetString = NULL; -alcGetIntegervPROC alcGetIntegerv = NULL; -alcOpenDevicePROC alcOpenDevice = NULL; -alcCloseDevicePROC alcCloseDevice = NULL; -alcCreateContextPROC alcCreateContext = NULL; -alcMakeContextCurrentPROC alcMakeContextCurrent = NULL; -alcProcessContextPROC alcProcessContext = NULL; -alcGetCurrentContextPROC alcGetCurrentContext = NULL; -alcGetContextsDevicePROC alcGetContextsDevice = NULL; -alcSuspendContextPROC alcSuspendContext = NULL; -alcDestroyContextPROC alcDestroyContext = NULL; -alcGetErrorPROC alcGetError = NULL; -alcIsExtensionPresentPROC alcIsExtensionPresent = NULL; -alcGetProcAddressPROC alcGetProcAddress = NULL; -alcGetEnumValuePROC alcGetEnumValue = NULL; - #ifdef _WIN32 EAXSet eaxSet; // EAXSet function, ret$ EAXGet eaxGet; // EAXGet function, ret$ @@ -145,14 +74,11 @@ static bool LoadOpenAL(JNIEnv *env, jobjectArray oalPaths); /* Unloads OpenAL */ static void UnLoadOpenAL(void); -/* Gets a pointer to the named function */ -static void* GetFunctionPointer(const char* function); - /* Loads OpenAL basic functions */ -static bool LoadAL(void); +extern bool LoadAL(JNIEnv *env); /* Loads OpenAL ALC functions */ -static bool LoadALC(void); +extern bool LoadALC(JNIEnv *env); /* Loads any extensions to OpenAL */ static bool LoadALExtensions(void); @@ -184,7 +110,7 @@ static void *NativeGetFunctionPointer(const char *function) { * @param function Name of function * @return pointer to named function, or NULL if not found */ -static void* GetFunctionPointer(const char* function) { +static void* extal_GetProcAddress(const char* function) { void *p = NativeGetFunctionPointer(function); if (p == NULL) { printfDebug("Could not locate symbol %s\n", function); @@ -306,13 +232,13 @@ void InitializeOpenAL(JNIEnv *env, jobjectArray oalPaths) { } //load basic OpenAL functions - if(!LoadAL()) { + if(!LoadAL(env)) { throwOpenALException(env, "Could not load OpenAL function pointers."); return; } //load OpenAL context functions - if(!LoadALC()) { + if(!LoadALC(env)) { throwOpenALException(env, "Could not load ALC function pointers."); return; } @@ -332,166 +258,6 @@ void DeInitializeOpenAL() { handleOAL = 0; } -/** - * Loads the basic OpenAL functions - * - * @return true if all methods were loaded, false if one of the methods could not be loaded - */ -static bool LoadAL() { - alEnable = (alEnablePROC) GetFunctionPointer("alEnable"); - alDisable = (alDisablePROC) GetFunctionPointer("alDisable"); - alIsEnabled = (alIsEnabledPROC) GetFunctionPointer("alIsEnabled"); - //alHint = (alHintPROC) GetFunctionPointer("alHint"); - alGetBoolean = (alGetBooleanPROC) GetFunctionPointer("alGetBoolean"); - alGetInteger = (alGetIntegerPROC) GetFunctionPointer("alGetInteger"); - alGetFloat = (alGetFloatPROC) GetFunctionPointer("alGetFloat"); - alGetDouble = (alGetDoublePROC) GetFunctionPointer("alGetDouble"); - alGetBooleanv = (alGetBooleanvPROC) GetFunctionPointer("alGetBooleanv"); - alGetIntegerv = (alGetIntegervPROC) GetFunctionPointer("alGetIntegerv"); - alGetFloatv = (alGetFloatvPROC) GetFunctionPointer("alGetFloatv"); - alGetDoublev = (alGetDoublevPROC) GetFunctionPointer("alGetDoublev"); - alGetString = (alGetStringPROC) GetFunctionPointer("alGetString"); - alGetError = (alGetErrorPROC) GetFunctionPointer("alGetError"); - alIsExtensionPresent = (alIsExtensionPresentPROC) GetFunctionPointer("alIsExtensionPresent"); - alGetProcAddress = (alGetProcAddressPROC) GetFunctionPointer("alGetProcAddress"); - alGetEnumValue = (alGetEnumValuePROC) GetFunctionPointer("alGetEnumValue"); - alListeneri = (alListeneriPROC) GetFunctionPointer("alListeneri"); - alListenerf = (alListenerfPROC) GetFunctionPointer("alListenerf"); - alListener3f = (alListener3fPROC) GetFunctionPointer("alListener3f"); - alListenerfv = (alListenerfvPROC) GetFunctionPointer("alListenerfv"); - alGetListeneri = (alGetListeneriPROC) GetFunctionPointer("alGetListeneri"); - alGetListenerf = (alGetListenerfPROC) GetFunctionPointer("alGetListenerf"); - alGetListener3f = (alGetListener3fPROC) GetFunctionPointer("alGetListener3f"); - alGetListenerfv = (alGetListenerfvPROC) GetFunctionPointer("alGetListenerfv"); - alGenSources = (alGenSourcesPROC) GetFunctionPointer("alGenSources"); - alDeleteSources = (alDeleteSourcesPROC) GetFunctionPointer("alDeleteSources"); - alIsSource = (alIsSourcePROC) GetFunctionPointer("alIsSource"); - alSourcei = (alSourceiPROC) GetFunctionPointer("alSourcei"); - alSourcef = (alSourcefPROC) GetFunctionPointer("alSourcef"); - alSource3f = (alSource3fPROC) GetFunctionPointer("alSource3f"); - alSourcefv = (alSourcefvPROC) GetFunctionPointer("alSourcefv"); - alGetSourcei = (alGetSourceiPROC) GetFunctionPointer("alGetSourcei"); - alGetSourcef = (alGetSourcefPROC) GetFunctionPointer("alGetSourcef"); - alGetSource3f = (alGetSource3fPROC) GetFunctionPointer("alGetSource3f"); - alGetSourcefv = (alGetSourcefvPROC) GetFunctionPointer("alGetSourcefv"); - alSourcePlayv = (alSourcePlayvPROC) GetFunctionPointer("alSourcePlayv"); - alSourcePausev = (alSourcePausevPROC) GetFunctionPointer("alSourcePausev"); - alSourceStopv = (alSourceStopvPROC) GetFunctionPointer("alSourceStopv"); - alSourceRewindv = (alSourceRewindvPROC) GetFunctionPointer("alSourceRewindv"); - alSourcePlay = (alSourcePlayPROC) GetFunctionPointer("alSourcePlay"); - alSourcePause = (alSourcePausePROC) GetFunctionPointer("alSourcePause"); - alSourceStop = (alSourceStopPROC) GetFunctionPointer("alSourceStop"); - alSourceRewind = (alSourceRewindPROC) GetFunctionPointer("alSourceRewind"); - alGenBuffers = (alGenBuffersPROC) GetFunctionPointer("alGenBuffers"); - alDeleteBuffers = (alDeleteBuffersPROC) GetFunctionPointer("alDeleteBuffers"); - alIsBuffer = (alIsBufferPROC) GetFunctionPointer("alIsBuffer"); - alBufferData = (alBufferDataPROC) GetFunctionPointer("alBufferData"); - alGetBufferi = (alGetBufferiPROC) GetFunctionPointer("alGetBufferi"); - alGetBufferf = (alGetBufferfPROC) GetFunctionPointer("alGetBufferf"); - alSourceQueueBuffers = (alSourceQueueBuffersPROC) GetFunctionPointer("alSourceQueueBuffers"); - alSourceUnqueueBuffers = (alSourceUnqueueBuffersPROC) GetFunctionPointer("alSourceUnqueueBuffers"); - alDistanceModel = (alDistanceModelPROC) GetFunctionPointer("alDistanceModel"); - alDopplerFactor = (alDopplerFactorPROC) GetFunctionPointer("alDopplerFactor"); - alDopplerVelocity = (alDopplerVelocityPROC) GetFunctionPointer("alDopplerVelocity"); - - return - alEnable != NULL && - alDisable != NULL && - alIsEnabled != NULL && - //alHint != NULL && - alGetBoolean != NULL && - alGetInteger != NULL && - alGetFloat != NULL && - alGetDouble != NULL && - alGetBooleanv != NULL && - alGetIntegerv != NULL && - alGetFloatv != NULL && - alGetDoublev != NULL && - alGetString != NULL && - alGetError != NULL && - alIsExtensionPresent != NULL && - alGetProcAddress != NULL && - alGetEnumValue != NULL && - alListeneri != NULL && - alListenerf != NULL && - alListener3f != NULL && - alListenerfv != NULL && - alGetListeneri != NULL && - alGetListenerf != NULL && - alGetListener3f != NULL && - alGetListenerfv != NULL && - alGenSources != NULL && - alDeleteSources != NULL && - alIsSource != NULL && - alSourcei != NULL && - alSourcef != NULL && - alSource3f != NULL && - alSourcefv != NULL && - alGetSourcei != NULL && - alGetSourcef != NULL && - alGetSource3f != NULL && - alGetSourcefv != NULL && - alSourcePlayv != NULL && - alSourcePausev != NULL && - alSourceStopv != NULL && - alSourceRewindv != NULL && - alSourcePlay != NULL && - alSourcePause != NULL && - alSourceStop != NULL && - alSourceRewind != NULL && - alGenBuffers != NULL && - alDeleteBuffers != NULL && - alIsBuffer != NULL && - alBufferData != NULL && - alGetBufferi != NULL && - alGetBufferf != NULL && - alSourceQueueBuffers != NULL && - alSourceUnqueueBuffers != NULL && - alDistanceModel != NULL && - alDopplerFactor != NULL && - alDopplerVelocity != NULL; -} - -/** - * Loads the context OpenAL functions - * - * @return true if all methods were loaded, false if one of the methods could not be loaded - */ -static bool LoadALC() { - alcGetString = (alcGetStringPROC) GetFunctionPointer("alcGetString"); - alcGetIntegerv = (alcGetIntegervPROC) GetFunctionPointer("alcGetIntegerv"); - alcOpenDevice = (alcOpenDevicePROC) GetFunctionPointer("alcOpenDevice"); - alcCloseDevice = (alcCloseDevicePROC) GetFunctionPointer("alcCloseDevice"); - alcCreateContext = (alcCreateContextPROC) GetFunctionPointer("alcCreateContext"); - alcMakeContextCurrent = (alcMakeContextCurrentPROC) GetFunctionPointer("alcMakeContextCurrent"); - alcProcessContext = (alcProcessContextPROC) GetFunctionPointer("alcProcessContext"); - alcGetCurrentContext = (alcGetCurrentContextPROC) GetFunctionPointer("alcGetCurrentContext"); - alcGetContextsDevice = (alcGetContextsDevicePROC) GetFunctionPointer("alcGetContextsDevice"); - alcSuspendContext = (alcSuspendContextPROC) GetFunctionPointer("alcSuspendContext"); - alcDestroyContext = (alcDestroyContextPROC) GetFunctionPointer("alcDestroyContext"); - alcGetError = (alcGetErrorPROC) GetFunctionPointer("alcGetError"); - alcIsExtensionPresent = (alcIsExtensionPresentPROC) GetFunctionPointer("alcIsExtensionPresent"); - alcGetProcAddress = (alcGetProcAddressPROC) GetFunctionPointer("alcGetProcAddress"); - alcGetEnumValue = (alcGetEnumValuePROC) GetFunctionPointer("alcGetEnumValue"); - - return - alcGetString != NULL && - alcGetIntegerv != NULL && - alcOpenDevice != NULL && - alcCloseDevice != NULL && - alcCreateContext != NULL && - alcMakeContextCurrent != NULL && - alcProcessContext != NULL && - alcGetCurrentContext != NULL && - alcGetContextsDevice != NULL && - alcSuspendContext != NULL && - alcDestroyContext != NULL && - alcGetError != NULL && - alcIsExtensionPresent != NULL && - alcGetProcAddress != NULL && - alcGetEnumValue != NULL; -} - /** * Loads the OpenAL extensions functions * @@ -500,3 +266,8 @@ static bool LoadALC() { static bool LoadALExtensions() { return true; } + +bool extal_InitializeClass(JNIEnv *env, jclass clazz, jobject ext_set, const char *ext_name, int num_functions, JavaMethodAndExtFunction *functions) { + return ext_InitializeClass(env, clazz, ext_set, ext_name, &extal_GetProcAddress, num_functions, functions); +} + diff --git a/src/native/common/extal.h b/src/native/common/extal.h index 9a3a2d0c..98d2df07 100644 --- a/src/native/common/extal.h +++ b/src/native/common/extal.h @@ -51,6 +51,9 @@ #endif #include +#include "common_tools.h" + +bool extal_InitializeClass(JNIEnv *env, jclass clazz, jobject ext_set, const char *ext_name, int num_functions, JavaMethodAndExtFunction *functions); #ifdef __cplusplus extern "C" { @@ -142,156 +145,6 @@ const GUID DSPROPSETID_EAX20_BufferProperties void InitializeOpenAL(JNIEnv *env, jobjectArray oalPaths); void DeInitializeOpenAL(); -//alc -typedef ALCubyte* (ALCAPIENTRY *alcGetStringPROC)(ALCdevice *device,ALCenum param); -typedef ALCvoid (ALCAPIENTRY *alcGetIntegervPROC)(ALCdevice *device,ALCenum param,ALCsizei size,ALCint *data); -typedef ALCdevice* (ALCAPIENTRY *alcOpenDevicePROC)(ALCubyte *deviceName); -typedef ALCvoid (ALCAPIENTRY *alcCloseDevicePROC)(ALCdevice *device); -typedef ALCcontext* (ALCAPIENTRY *alcCreateContextPROC)(ALCdevice *device,ALCint *attrList); -typedef ALCboolean (ALCAPIENTRY *alcMakeContextCurrentPROC)(ALCcontext *context); -typedef ALCvoid (ALCAPIENTRY *alcProcessContextPROC)(ALCcontext *context); -typedef ALCcontext* (ALCAPIENTRY *alcGetCurrentContextPROC)(ALCvoid); -typedef ALCdevice* (ALCAPIENTRY *alcGetContextsDevicePROC)(ALCcontext *context); -typedef ALCvoid (ALCAPIENTRY *alcSuspendContextPROC)(ALCcontext *context); -typedef ALCvoid (ALCAPIENTRY *alcDestroyContextPROC)(ALCcontext *context); -typedef ALCenum (ALCAPIENTRY *alcGetErrorPROC)(ALCdevice *device); -typedef ALCboolean (ALCAPIENTRY *alcIsExtensionPresentPROC)(ALCdevice *device,ALCubyte *extName); -typedef ALCvoid* (ALCAPIENTRY *alcGetProcAddressPROC)(ALCdevice *device,ALCubyte *funcName); -typedef ALCenum (ALCAPIENTRY *alcGetEnumValuePROC)(ALCdevice *device,ALCubyte *enumName); - -//al -typedef ALvoid (ALAPIENTRY *alEnablePROC)( ALenum capability ); -typedef ALvoid (ALAPIENTRY *alDisablePROC)( ALenum capability ); -typedef ALboolean (ALAPIENTRY *alIsEnabledPROC)( ALenum capability ); -typedef ALvoid (ALAPIENTRY *alHintPROC)( ALenum target, ALenum mode ); -typedef ALboolean (ALAPIENTRY *alGetBooleanPROC)( ALenum param ); -typedef ALint (ALAPIENTRY *alGetIntegerPROC)( ALenum param ); -typedef ALfloat (ALAPIENTRY *alGetFloatPROC)( ALenum param ); -typedef ALdouble (ALAPIENTRY *alGetDoublePROC)( ALenum param ); -typedef ALvoid (ALAPIENTRY *alGetBooleanvPROC)( ALenum param, ALboolean* data ); -typedef ALvoid (ALAPIENTRY *alGetIntegervPROC)( ALenum param, ALint* data ); -typedef ALvoid (ALAPIENTRY *alGetFloatvPROC)( ALenum param, ALfloat* data ); -typedef ALvoid (ALAPIENTRY *alGetDoublevPROC)( ALenum param, ALdouble* data ); -typedef ALubyte* (ALAPIENTRY *alGetStringPROC)( ALenum param ); -typedef ALenum (ALAPIENTRY *alGetErrorPROC)( ALvoid ); -typedef ALboolean (ALAPIENTRY *alIsExtensionPresentPROC)( ALubyte* fname ); -typedef ALvoid* (ALAPIENTRY *alGetProcAddressPROC)( ALubyte* fname ); -typedef ALenum (ALAPIENTRY *alGetEnumValuePROC)( ALubyte* ename ); -typedef ALvoid (ALAPIENTRY *alListeneriPROC)( ALenum param, ALint value ); -typedef ALvoid (ALAPIENTRY *alListenerfPROC)( ALenum param, ALfloat value ); -typedef ALvoid (ALAPIENTRY *alListener3fPROC)( ALenum param, ALfloat v1, ALfloat v2, ALfloat v3 ); -typedef ALvoid (ALAPIENTRY *alListenerfvPROC)( ALenum param, ALfloat* values ); -typedef ALvoid (ALAPIENTRY *alGetListeneriPROC)( ALenum param, ALint* value ); -typedef ALvoid (ALAPIENTRY *alGetListenerfPROC)( ALenum param, ALfloat* value ); -typedef ALvoid (ALAPIENTRY *alGetListener3fPROC)( ALenum param, ALfloat* v1, ALfloat* v2, ALfloat* v3 ); -typedef ALvoid (ALAPIENTRY *alGetListenerfvPROC)( ALenum param, ALfloat* values ); -typedef ALvoid (ALAPIENTRY *alGenSourcesPROC)( ALsizei n, ALuint* sources ); -typedef ALvoid (ALAPIENTRY *alDeleteSourcesPROC)( ALsizei n, ALuint* sources ); -typedef ALboolean (ALAPIENTRY *alIsSourcePROC)( ALuint id ); -typedef ALvoid (ALAPIENTRY *alSourceiPROC)( ALuint source, ALenum param, ALint value ); -typedef ALvoid (ALAPIENTRY *alSourcefPROC)( ALuint source, ALenum param, ALfloat value ); -typedef ALvoid (ALAPIENTRY *alSource3fPROC)( ALuint source, ALenum param, ALfloat v1, ALfloat v2, ALfloat v3 ); -typedef ALvoid (ALAPIENTRY *alSourcefvPROC)( ALuint source, ALenum param, ALfloat* values ); -typedef ALvoid (ALAPIENTRY *alGetSourceiPROC)( ALuint source, ALenum param, ALint* value ); -typedef ALvoid (ALAPIENTRY *alGetSourcefPROC)( ALuint source, ALenum param, ALfloat* value ); -typedef ALvoid (ALAPIENTRY *alGetSource3fPROC)( ALuint source, ALenum param, ALfloat* v1, ALfloat* v2, ALfloat* v3 ); -typedef ALvoid (ALAPIENTRY *alGetSourcefvPROC)( ALuint source, ALenum param, ALfloat* values ); -typedef ALvoid (ALAPIENTRY *alSourcePlayvPROC)( ALsizei n, ALuint *sources ); -typedef ALvoid (ALAPIENTRY *alSourcePausevPROC)( ALsizei n, ALuint *sources ); -typedef ALvoid (ALAPIENTRY *alSourceStopvPROC)( ALsizei n, ALuint *sources ); -typedef ALvoid (ALAPIENTRY *alSourceRewindvPROC)(ALsizei n,ALuint *sources); -typedef ALvoid (ALAPIENTRY *alSourcePlayPROC)( ALuint source ); -typedef ALvoid (ALAPIENTRY *alSourcePausePROC)( ALuint source ); -typedef ALvoid (ALAPIENTRY *alSourceStopPROC)( ALuint source ); -typedef ALvoid (ALAPIENTRY *alSourceRewindPROC)( ALuint source ); -typedef ALvoid (ALAPIENTRY *alGenBuffersPROC)( ALsizei n, ALuint* buffers ); -typedef ALvoid (ALAPIENTRY *alDeleteBuffersPROC)( ALsizei n, ALuint* buffers ); -typedef ALboolean (ALAPIENTRY *alIsBufferPROC)( ALuint buffer ); -typedef ALvoid (ALAPIENTRY *alBufferDataPROC)( ALuint buffer, - ALenum format, - ALvoid* data, - ALsizei size, - ALsizei freq ); -typedef ALvoid (ALAPIENTRY *alGetBufferiPROC)( ALuint buffer, ALenum param, ALint* value ); -typedef ALvoid (ALAPIENTRY *alGetBufferfPROC)( ALuint buffer, ALenum param, ALfloat* value ); -typedef ALvoid (ALAPIENTRY *alSourceQueueBuffersPROC)( ALuint source, ALsizei n, ALuint* buffers ); -typedef ALvoid (ALAPIENTRY *alSourceUnqueueBuffersPROC)( ALuint source, ALsizei n, ALuint* buffers ); -typedef ALvoid (ALAPIENTRY *alDistanceModelPROC)( ALenum value ); -typedef ALvoid (ALAPIENTRY *alDopplerFactorPROC)( ALfloat value ); -typedef ALvoid (ALAPIENTRY *alDopplerVelocityPROC)( ALfloat value ); - -extern alcGetStringPROC alcGetString; -extern alcGetIntegervPROC alcGetIntegerv; -extern alcOpenDevicePROC alcOpenDevice; -extern alcCloseDevicePROC alcCloseDevice; -extern alcCreateContextPROC alcCreateContext; -extern alcMakeContextCurrentPROC alcMakeContextCurrent; -extern alcProcessContextPROC alcProcessContext; -extern alcGetCurrentContextPROC alcGetCurrentContext; -extern alcGetContextsDevicePROC alcGetContextsDevice; -extern alcSuspendContextPROC alcSuspendContext; -extern alcDestroyContextPROC alcDestroyContext; -extern alcGetErrorPROC alcGetError; -extern alcIsExtensionPresentPROC alcIsExtensionPresent; -extern alcGetProcAddressPROC alcGetProcAddress; -extern alcGetEnumValuePROC alcGetEnumValue; - -extern alEnablePROC alEnable; -extern alDisablePROC alDisable; -extern alIsEnabledPROC alIsEnabled; -extern alHintPROC alHint; -extern alGetBooleanPROC alGetBoolean; -extern alGetIntegerPROC alGetInteger; -extern alGetFloatPROC alGetFloat; -extern alGetDoublePROC alGetDouble; -extern alGetBooleanvPROC alGetBooleanv; -extern alGetIntegervPROC alGetIntegerv; -extern alGetFloatvPROC alGetFloatv; -extern alGetDoublevPROC alGetDoublev; -extern alGetStringPROC alGetString; -extern alGetErrorPROC alGetError; -extern alIsExtensionPresentPROC alIsExtensionPresent; -extern alGetProcAddressPROC alGetProcAddress; -extern alGetEnumValuePROC alGetEnumValue; -extern alListeneriPROC alListeneri; -extern alListenerfPROC alListenerf; -extern alListener3fPROC alListener3f; -extern alListenerfvPROC alListenerfv; -extern alGetListeneriPROC alGetListeneri; -extern alGetListenerfPROC alGetListenerf; -extern alGetListener3fPROC alGetListener3f; -extern alGetListenerfvPROC alGetListenerfv; -extern alGenSourcesPROC alGenSources; -extern alDeleteSourcesPROC alDeleteSources; -extern alIsSourcePROC alIsSource; -extern alSourceiPROC alSourcei; -extern alSourcefPROC alSourcef; -extern alSource3fPROC alSource3f; -extern alSourcefvPROC alSourcefv; -extern alGetSourceiPROC alGetSourcei; -extern alGetSourcefPROC alGetSourcef; -extern alGetSource3fPROC alGetSource3f; -extern alGetSourcefvPROC alGetSourcefv; -extern alSourcePlayvPROC alSourcePlayv; -extern alSourcePausevPROC alSourcePausev; -extern alSourceStopvPROC alSourceStopv; -extern alSourceRewindvPROC alSourceRewindv; -extern alSourcePlayPROC alSourcePlay; -extern alSourcePausePROC alSourcePause; -extern alSourceStopPROC alSourceStop; -extern alSourceRewindPROC alSourceRewind; -extern alGenBuffersPROC alGenBuffers; -extern alDeleteBuffersPROC alDeleteBuffers; -extern alIsBufferPROC alIsBuffer; -extern alBufferDataPROC alBufferData; -extern alGetBufferiPROC alGetBufferi; -extern alGetBufferfPROC alGetBufferf; -extern alSourceQueueBuffersPROC alSourceQueueBuffers; -extern alSourceUnqueueBuffersPROC alSourceUnqueueBuffers; -extern alDistanceModelPROC alDistanceModel; -extern alDopplerFactorPROC alDopplerFactor; -extern alDopplerVelocityPROC alDopplerVelocity; - #ifdef _WIN32 typedef ALenum (*EAXSet)(const GUID*, ALuint, ALuint, ALvoid*, ALuint); typedef ALenum (*EAXGet)(const GUID*, ALuint, ALuint, ALvoid*, ALuint); @@ -300,6 +153,8 @@ extern EAXSet eaxSet; extern EAXGet eaxGet; #endif +typedef ALvoid (ALAPIENTRY *alEnablePROC)( ALenum capability ); +extern alEnablePROC alEnable; #ifdef __cplusplus } #endif diff --git a/src/native/common/extgl.cpp b/src/native/common/extgl.cpp index e9e5a5f4..4246b28e 100755 --- a/src/native/common/extgl.cpp +++ b/src/native/common/extgl.cpp @@ -577,7 +577,7 @@ glDrawRangeElementArrayNVPROC glDrawRangeElementArrayNV = NULL; glMultiDrawElementArrayNVPROC glMultiDrawElementArrayNV = NULL; glMultiDrawRangeElementArrayNVPROC glMultiDrawRangeElementArrayNV = NULL; -bool extgl_error = false; +static bool extgl_error = false; struct ExtensionTypes extgl_Extensions; @@ -641,8 +641,8 @@ static void *extgl_GetProcAddress(const char *name) #endif } -void extgl_InitializeClass(JNIEnv *env, jclass clazz, jobject ext_set, const char *ext_name, int num_functions, JavaMethodAndExtFunction *functions) { - ext_InitializeClass(env, clazz, ext_set, ext_name, &extgl_GetProcAddress, num_functions, functions); +bool extgl_InitializeClass(JNIEnv *env, jclass clazz, jobject ext_set, const char *ext_name, int num_functions, JavaMethodAndExtFunction *functions) { + return ext_InitializeClass(env, clazz, ext_set, ext_name, &extgl_GetProcAddress, num_functions, functions); } @@ -1165,7 +1165,7 @@ static void extgl_InitSupportedExtensions(JNIEnv *env, jobject ext_set) extgl_Extensions.GL_SGIX_shadow = GLQueryExtension(env, ext_set, "GL_SGIX_shadow"); } -extern void extgl_InitOpenGL1_1(JNIEnv *env); +extern bool extgl_InitOpenGL1_1(JNIEnv *env); //extern void extgl_InitARBFragmentProgram(JNIEnv *env, jobject ext_set); extern void extgl_InitARBImaging(JNIEnv *env, jobject ext_set); extern void extgl_InitARBMatrixPalette(JNIEnv *env, jobject ext_set); @@ -1228,8 +1228,8 @@ extern void extgl_InitOpenGL1_5(JNIEnv *env, jobject ext_set); bool extgl_Initialize(JNIEnv *env, jobject ext_set) { extgl_error = false; - extgl_InitOpenGL1_1(env); - if (extgl_error) + bool result = extgl_InitOpenGL1_1(env); + if (!result) return false; extgl_InitSupportedExtensions(env, ext_set); diff --git a/src/native/common/extgl.h b/src/native/common/extgl.h index db2a059d..428d81dd 100644 --- a/src/native/common/extgl.h +++ b/src/native/common/extgl.h @@ -3267,7 +3267,7 @@ struct ExtensionTypes }; extern struct ExtensionTypes extgl_Extensions; -extern bool extgl_error; +//extern bool extgl_error; typedef GLenum (APIENTRY * glGetErrorPROC) (void); typedef const GLubyte * (APIENTRY * glGetStringPROC) (GLenum name); @@ -3289,7 +3289,7 @@ bool extgl_InitGLX(JNIEnv *env, Display *disp, int screen); bool extgl_InitAGL(JNIEnv *env); #endif void extgl_Close(void); -void extgl_InitializeClass(JNIEnv *env, jclass clazz, jobject ext_set, const char *ext_name, int num_functions, JavaMethodAndExtFunction *functions); +bool extgl_InitializeClass(JNIEnv *env, jclass clazz, jobject ext_set, const char *ext_name, int num_functions, JavaMethodAndExtFunction *functions); #define EXTGL_SANITY_CHECK(e,x) if (extgl_error) { \ extgl_Extensions.x = false; \ diff --git a/src/native/common/org_lwjgl_openal_AL10.cpp b/src/native/common/org_lwjgl_openal_AL10.cpp index 7db4ea8b..8d9fa2c2 100644 --- a/src/native/common/org_lwjgl_openal_AL10.cpp +++ b/src/native/common/org_lwjgl_openal_AL10.cpp @@ -39,19 +39,131 @@ * @author Brian Matzon * @version $Revision$ */ -#include "org_lwjgl_openal_AL10.h" /* OpenAL includes */ #include "checkALerror.h" #include "extal.h" +//al +typedef ALvoid (ALAPIENTRY *alDisablePROC)( ALenum capability ); +typedef ALboolean (ALAPIENTRY *alIsEnabledPROC)( ALenum capability ); +//typedef ALvoid (ALAPIENTRY *alHintPROC)( ALenum target, ALenum mode ); +typedef ALboolean (ALAPIENTRY *alGetBooleanPROC)( ALenum param ); +typedef ALint (ALAPIENTRY *alGetIntegerPROC)( ALenum param ); +typedef ALfloat (ALAPIENTRY *alGetFloatPROC)( ALenum param ); +//typedef ALvoid (ALAPIENTRY *alGetBooleanvPROC)( ALenum param, ALboolean* data ); +typedef ALvoid (ALAPIENTRY *alGetIntegervPROC)( ALenum param, ALint* data ); +typedef ALvoid (ALAPIENTRY *alGetFloatvPROC)( ALenum param, ALfloat* data ); +typedef ALubyte* (ALAPIENTRY *alGetStringPROC)( ALenum param ); +typedef ALenum (ALAPIENTRY *alGetErrorPROC)( ALvoid ); +typedef ALboolean (ALAPIENTRY *alIsExtensionPresentPROC)( ALubyte* fname ); +//typedef ALvoid* (ALAPIENTRY *alGetProcAddressPROC)( ALubyte* fname ); +typedef ALenum (ALAPIENTRY *alGetEnumValuePROC)( ALubyte* ename ); +typedef ALvoid (ALAPIENTRY *alListeneriPROC)( ALenum param, ALint value ); +typedef ALvoid (ALAPIENTRY *alListenerfPROC)( ALenum param, ALfloat value ); +typedef ALvoid (ALAPIENTRY *alListener3fPROC)( ALenum param, ALfloat v1, ALfloat v2, ALfloat v3 ); +typedef ALvoid (ALAPIENTRY *alListenerfvPROC)( ALenum param, ALfloat* values ); +typedef ALvoid (ALAPIENTRY *alGetListeneriPROC)( ALenum param, ALint* value ); +typedef ALvoid (ALAPIENTRY *alGetListenerfPROC)( ALenum param, ALfloat* value ); +//typedef ALvoid (ALAPIENTRY *alGetListener3fPROC)( ALenum param, ALfloat* v1, ALfloat* v2, ALfloat* v3 ); +typedef ALvoid (ALAPIENTRY *alGetListenerfvPROC)( ALenum param, ALfloat* values ); +typedef ALvoid (ALAPIENTRY *alGenSourcesPROC)( ALsizei n, ALuint* sources ); +typedef ALvoid (ALAPIENTRY *alDeleteSourcesPROC)( ALsizei n, ALuint* sources ); +typedef ALboolean (ALAPIENTRY *alIsSourcePROC)( ALuint id ); +typedef ALvoid (ALAPIENTRY *alSourceiPROC)( ALuint source, ALenum param, ALint value ); +typedef ALvoid (ALAPIENTRY *alSourcefPROC)( ALuint source, ALenum param, ALfloat value ); +typedef ALvoid (ALAPIENTRY *alSource3fPROC)( ALuint source, ALenum param, ALfloat v1, ALfloat v2, ALfloat v3 ); +typedef ALvoid (ALAPIENTRY *alSourcefvPROC)( ALuint source, ALenum param, ALfloat* values ); +typedef ALvoid (ALAPIENTRY *alGetSourceiPROC)( ALuint source, ALenum param, ALint* value ); +typedef ALvoid (ALAPIENTRY *alGetSourcefPROC)( ALuint source, ALenum param, ALfloat* value ); +//typedef ALvoid (ALAPIENTRY *alGetSource3fPROC)( ALuint source, ALenum param, ALfloat* v1, ALfloat* v2, ALfloat* v3 ); +typedef ALvoid (ALAPIENTRY *alGetSourcefvPROC)( ALuint source, ALenum param, ALfloat* values ); +typedef ALvoid (ALAPIENTRY *alSourcePlayvPROC)( ALsizei n, ALuint *sources ); +typedef ALvoid (ALAPIENTRY *alSourcePausevPROC)( ALsizei n, ALuint *sources ); +typedef ALvoid (ALAPIENTRY *alSourceStopvPROC)( ALsizei n, ALuint *sources ); +typedef ALvoid (ALAPIENTRY *alSourceRewindvPROC)(ALsizei n,ALuint *sources); +typedef ALvoid (ALAPIENTRY *alSourcePlayPROC)( ALuint source ); +typedef ALvoid (ALAPIENTRY *alSourcePausePROC)( ALuint source ); +typedef ALvoid (ALAPIENTRY *alSourceStopPROC)( ALuint source ); +typedef ALvoid (ALAPIENTRY *alSourceRewindPROC)( ALuint source ); +typedef ALvoid (ALAPIENTRY *alGenBuffersPROC)( ALsizei n, ALuint* buffers ); +typedef ALvoid (ALAPIENTRY *alDeleteBuffersPROC)( ALsizei n, ALuint* buffers ); +typedef ALboolean (ALAPIENTRY *alIsBufferPROC)( ALuint buffer ); +typedef ALvoid (ALAPIENTRY *alBufferDataPROC)( ALuint buffer, + ALenum format, + ALvoid* data, + ALsizei size, + ALsizei freq ); +typedef ALvoid (ALAPIENTRY *alGetBufferiPROC)( ALuint buffer, ALenum param, ALint* value ); +typedef ALvoid (ALAPIENTRY *alGetBufferfPROC)( ALuint buffer, ALenum param, ALfloat* value ); +typedef ALvoid (ALAPIENTRY *alSourceQueueBuffersPROC)( ALuint source, ALsizei n, ALuint* buffers ); +typedef ALvoid (ALAPIENTRY *alSourceUnqueueBuffersPROC)( ALuint source, ALsizei n, ALuint* buffers ); +typedef ALvoid (ALAPIENTRY *alDistanceModelPROC)( ALenum value ); +typedef ALvoid (ALAPIENTRY *alDopplerFactorPROC)( ALfloat value ); +typedef ALvoid (ALAPIENTRY *alDopplerVelocityPROC)( ALfloat value ); + + +alEnablePROC alEnable; +static alDisablePROC alDisable; +static alIsEnabledPROC alIsEnabled; +//static alHintPROC alHint; +static alGetBooleanPROC alGetBoolean; +static alGetIntegerPROC alGetInteger; +static alGetFloatPROC alGetFloat; +//static alGetBooleanvPROC alGetBooleanv; +static alGetIntegervPROC alGetIntegerv; +static alGetFloatvPROC alGetFloatv; +static alGetStringPROC alGetString; +static alGetErrorPROC alGetError; +static alIsExtensionPresentPROC alIsExtensionPresent; +//static alGetProcAddressPROC alGetProcAddress; +static alGetEnumValuePROC alGetEnumValue; +static alListeneriPROC alListeneri; +static alListenerfPROC alListenerf; +static alListener3fPROC alListener3f; +static alListenerfvPROC alListenerfv; +static alGetListeneriPROC alGetListeneri; +static alGetListenerfPROC alGetListenerf; +//static alGetListener3fPROC alGetListener3f; +static alGetListenerfvPROC alGetListenerfv; +static alGenSourcesPROC alGenSources; +static alDeleteSourcesPROC alDeleteSources; +static alIsSourcePROC alIsSource; +static alSourceiPROC alSourcei; +static alSourcefPROC alSourcef; +static alSource3fPROC alSource3f; +static alSourcefvPROC alSourcefv; +static alGetSourceiPROC alGetSourcei; +static alGetSourcefPROC alGetSourcef; +//static alGetSource3fPROC alGetSource3f; +static alGetSourcefvPROC alGetSourcefv; +static alSourcePlayvPROC alSourcePlayv; +static alSourcePausevPROC alSourcePausev; +static alSourceStopvPROC alSourceStopv; +static alSourceRewindvPROC alSourceRewindv; +static alSourcePlayPROC alSourcePlay; +static alSourcePausePROC alSourcePause; +static alSourceStopPROC alSourceStop; +static alSourceRewindPROC alSourceRewind; +static alGenBuffersPROC alGenBuffers; +static alDeleteBuffersPROC alDeleteBuffers; +static alIsBufferPROC alIsBuffer; +static alBufferDataPROC alBufferData; +static alGetBufferiPROC alGetBufferi; +static alGetBufferfPROC alGetBufferf; +static alSourceQueueBuffersPROC alSourceQueueBuffers; +static alSourceUnqueueBuffersPROC alSourceUnqueueBuffers; +static alDistanceModelPROC alDistanceModel; +static alDopplerFactorPROC alDopplerFactor; +static alDopplerVelocityPROC alDopplerVelocity; + /** * This function enables a feature of the OpenAL driver. * * C Specification: * ALvoid alEnable(ALenum capability); */ -JNIEXPORT void JNICALL Java_org_lwjgl_openal_AL10_alEnable (JNIEnv *env, jclass clazz, jint capability) { +static void JNICALL Java_org_lwjgl_openal_AL10_alEnable (JNIEnv *env, jclass clazz, jint capability) { alEnable((ALenum) capability); CHECK_AL_ERROR } @@ -62,7 +174,7 @@ JNIEXPORT void JNICALL Java_org_lwjgl_openal_AL10_alEnable (JNIEnv *env, jclass * C Specification: * ALvoid alDisable(ALenum capability); */ -JNIEXPORT void JNICALL Java_org_lwjgl_openal_AL10_alDisable (JNIEnv *env, jclass clazz, jint capability) { +static void JNICALL Java_org_lwjgl_openal_AL10_alDisable (JNIEnv *env, jclass clazz, jint capability) { alDisable((ALenum) capability); CHECK_AL_ERROR } @@ -73,7 +185,7 @@ JNIEXPORT void JNICALL Java_org_lwjgl_openal_AL10_alDisable (JNIEnv *env, jclass * C Specification: * Alboolean alIsEnabled(ALenum capability); */ -JNIEXPORT jboolean JNICALL Java_org_lwjgl_openal_AL10_alIsEnabled (JNIEnv *env, jclass clazz, jint capability) { +static jboolean JNICALL Java_org_lwjgl_openal_AL10_alIsEnabled (JNIEnv *env, jclass clazz, jint capability) { jboolean result = (jboolean) alIsEnabled((ALenum) capability); CHECK_AL_ERROR @@ -86,11 +198,11 @@ JNIEXPORT jboolean JNICALL Java_org_lwjgl_openal_AL10_alIsEnabled (JNIEnv *env, * C Specification * ALvoid alHint(ALenum target, ALenum mode); */ -JNIEXPORT void JNICALL Java_org_lwjgl_openal_AL10_alHint (JNIEnv *env, jclass clazz, jint target, jint mode) { - //alHint((ALint)target, (ALint)mode); +/*static void JNICALL Java_org_lwjgl_openal_AL10_alHint (JNIEnv *env, jclass clazz, jint target, jint mode) { + alHint((ALint)target, (ALint)mode); //cannot link with above statement return; -} +}*/ /** @@ -99,7 +211,7 @@ JNIEXPORT void JNICALL Java_org_lwjgl_openal_AL10_alHint (JNIEnv *env, jclass cl * C Specification: * Alboolean alGetBoolean(ALenum pname); */ -JNIEXPORT jboolean JNICALL Java_org_lwjgl_openal_AL10_alGetBoolean (JNIEnv *env, jclass clazz, jint pname) { +static jboolean JNICALL Java_org_lwjgl_openal_AL10_alGetBoolean (JNIEnv *env, jclass clazz, jint pname) { jboolean result = (jboolean) alGetBoolean((ALenum) pname); CHECK_AL_ERROR @@ -112,20 +224,31 @@ JNIEXPORT jboolean JNICALL Java_org_lwjgl_openal_AL10_alGetBoolean (JNIEnv *env, * C Specification: * Alint alGetInteger(ALenum pname); */ -JNIEXPORT jint JNICALL Java_org_lwjgl_openal_AL10_alGetInteger (JNIEnv *env, jclass clazz, jint pname) { +static jint JNICALL Java_org_lwjgl_openal_AL10_alGetInteger (JNIEnv *env, jclass clazz, jint pname) { jint result = (jint) alGetInteger((ALenum) pname); CHECK_AL_ERROR return result; } +/** + * This function retrieves a integer OpenAL state. + * + * C Specification: + * ALvoid nalGetIntegerv(ALenum pname,ALint *data); + */ +static void JNICALL Java_org_lwjgl_openal_AL10_nalGetIntegerv (JNIEnv *env, jclass clazz, jint pname, jobject data, int offset) { + alGetIntegerv((ALenum) pname, offset + (ALint*) env->GetDirectBufferAddress(data)); + CHECK_AL_ERROR +} + /** * This function returns a floating point OpenAL state. * * C Specification: * ALfloat alGetFloat(ALenum pname); */ -JNIEXPORT jfloat JNICALL Java_org_lwjgl_openal_AL10_alGetFloat (JNIEnv *env, jclass clazz, jint pname) { +static jfloat JNICALL Java_org_lwjgl_openal_AL10_alGetFloat (JNIEnv *env, jclass clazz, jint pname) { jfloat result = (jfloat) alGetFloat((ALenum) pname); CHECK_AL_ERROR @@ -138,7 +261,7 @@ JNIEXPORT jfloat JNICALL Java_org_lwjgl_openal_AL10_alGetFloat (JNIEnv *env, jcl * C Specification: * ALvoid alGetFloatv(ALenum pname,ALfloat *data); */ -JNIEXPORT void JNICALL Java_org_lwjgl_openal_AL10_nalGetFloatv (JNIEnv *env, jclass clazz, jint pname, jobject data, int offset) { +static void JNICALL Java_org_lwjgl_openal_AL10_nalGetFloatv (JNIEnv *env, jclass clazz, jint pname, jobject data, int offset) { alGetFloatv((ALenum) pname, offset + (ALfloat*) env->GetDirectBufferAddress(data)); CHECK_AL_ERROR } @@ -149,7 +272,7 @@ JNIEXPORT void JNICALL Java_org_lwjgl_openal_AL10_nalGetFloatv (JNIEnv *env, jcl * C Specification: * ALubyte * alGetString(ALenum pname); */ -JNIEXPORT jstring JNICALL Java_org_lwjgl_openal_AL10_alGetString (JNIEnv *env, jclass clazz, jint param) { +static jstring JNICALL Java_org_lwjgl_openal_AL10_alGetString (JNIEnv *env, jclass clazz, jint param) { jstring string = env->NewStringUTF((char*) alGetString(param)); CHECK_AL_ERROR return string; @@ -161,7 +284,7 @@ JNIEXPORT jstring JNICALL Java_org_lwjgl_openal_AL10_alGetString (JNIEnv *env, j * C Specification: * ALenum alGetError(ALvoid); */ -JNIEXPORT jint JNICALL Java_org_lwjgl_openal_AL10_alGetError (JNIEnv *env, jclass clazz) { +static jint JNICALL Java_org_lwjgl_openal_AL10_alGetError (JNIEnv *env, jclass clazz) { jint result = (jint) alGetError(); // Don't think we should be checking for errors here..? @@ -175,7 +298,7 @@ JNIEXPORT jint JNICALL Java_org_lwjgl_openal_AL10_alGetError (JNIEnv *env, jclas * C Specification: * ALboolean alIsExtensionPresent(ALubyte *extName); */ -JNIEXPORT jboolean JNICALL Java_org_lwjgl_openal_AL10_alIsExtensionPresent (JNIEnv *env, jclass clazz, jstring fname) { +static jboolean JNICALL Java_org_lwjgl_openal_AL10_alIsExtensionPresent (JNIEnv *env, jclass clazz, jstring fname) { ALubyte* functionname = (ALubyte*) (env->GetStringUTFChars(fname, 0)); jboolean result = (jboolean) alIsExtensionPresent(functionname); env->ReleaseStringUTFChars((jstring)functionname, 0); @@ -190,7 +313,7 @@ JNIEXPORT jboolean JNICALL Java_org_lwjgl_openal_AL10_alIsExtensionPresent (JNIE * C Specification: * ALenum alGetEnumValue(ALubyte *enumName); */ -JNIEXPORT jint JNICALL Java_org_lwjgl_openal_AL10_alGetEnumValue (JNIEnv *env, jclass clazz, jstring ename) { +static jint JNICALL Java_org_lwjgl_openal_AL10_alGetEnumValue (JNIEnv *env, jclass clazz, jstring ename) { ALubyte* functionname = (ALubyte*) (env->GetStringUTFChars(ename, 0)); jint result = (jint) alGetEnumValue(functionname); env->ReleaseStringUTFChars((jstring)functionname, 0); @@ -205,7 +328,7 @@ JNIEXPORT jint JNICALL Java_org_lwjgl_openal_AL10_alGetEnumValue (JNIEnv *env, j * C Specification: * ALvoid alListeneri(ALenum pname,ALint value); */ -JNIEXPORT void JNICALL Java_org_lwjgl_openal_AL10_alListeneri (JNIEnv *env, jclass clazz, jint pname, jint value) { +static void JNICALL Java_org_lwjgl_openal_AL10_alListeneri (JNIEnv *env, jclass clazz, jint pname, jint value) { alListeneri((ALenum) pname, (ALint) value); CHECK_AL_ERROR } @@ -216,7 +339,7 @@ JNIEXPORT void JNICALL Java_org_lwjgl_openal_AL10_alListeneri (JNIEnv *env, jcla * C Specification: * ALvoid alListenerf(ALenum pname,ALfloat value); */ -JNIEXPORT void JNICALL Java_org_lwjgl_openal_AL10_alListenerf (JNIEnv *env, jclass clazz, jint pname, jfloat value) { +static void JNICALL Java_org_lwjgl_openal_AL10_alListenerf (JNIEnv *env, jclass clazz, jint pname, jfloat value) { alListenerf((ALenum) pname, (ALfloat) value); CHECK_AL_ERROR } @@ -226,7 +349,7 @@ JNIEXPORT void JNICALL Java_org_lwjgl_openal_AL10_alListenerf (JNIEnv *env, jcla * Method: nalListenerf * Signature: (ILjava/nio/FloatBuffer;I)V */ -JNIEXPORT void JNICALL Java_org_lwjgl_openal_AL10_nalListenerfv (JNIEnv *env, jclass clazz, jint pname, jobject values, jint offset) { +static void JNICALL Java_org_lwjgl_openal_AL10_nalListenerfv (JNIEnv *env, jclass clazz, jint pname, jobject values, jint offset) { alListenerfv((ALenum) pname, offset + (ALfloat*) env->GetDirectBufferAddress(values)); } @@ -236,7 +359,7 @@ JNIEXPORT void JNICALL Java_org_lwjgl_openal_AL10_nalListenerfv (JNIEnv *env, jc * C Specification: * ALvoid alListener3f(ALenum pname,ALfloat v1,ALfloat v2,ALfloat v3); */ -JNIEXPORT void JNICALL Java_org_lwjgl_openal_AL10_alListener3f (JNIEnv *env, jclass clazz, jint pname, jfloat v1, jfloat v2, jfloat v3) { +static void JNICALL Java_org_lwjgl_openal_AL10_alListener3f (JNIEnv *env, jclass clazz, jint pname, jfloat v1, jfloat v2, jfloat v3) { alListener3f((ALenum) pname, (ALfloat) v1, (ALfloat) v2, (ALfloat) v3); CHECK_AL_ERROR } @@ -248,7 +371,7 @@ JNIEXPORT void JNICALL Java_org_lwjgl_openal_AL10_alListener3f (JNIEnv *env, jcl * C Specification: * ALvoid alGetListeneri(ALenum pname,ALint *value); */ -JNIEXPORT jint JNICALL Java_org_lwjgl_openal_AL10_alGetListeneri (JNIEnv *env, jclass clazz, jint pname) { +static jint JNICALL Java_org_lwjgl_openal_AL10_alGetListeneri (JNIEnv *env, jclass clazz, jint pname) { ALint value = 0; alGetListeneri((ALenum) pname, &value); CHECK_AL_ERROR @@ -261,7 +384,7 @@ JNIEXPORT jint JNICALL Java_org_lwjgl_openal_AL10_alGetListeneri (JNIEnv *env, j * C Specification: * ALvoid alGetListenerf(ALenum pname,ALfloat *value); */ -JNIEXPORT jfloat JNICALL Java_org_lwjgl_openal_AL10_alGetListenerf (JNIEnv *env, jclass clazz, jint pname) { +static jfloat JNICALL Java_org_lwjgl_openal_AL10_alGetListenerf (JNIEnv *env, jclass clazz, jint pname) { ALfloat value = 0.0f; alGetListenerf((ALenum) pname, &value); CHECK_AL_ERROR @@ -274,7 +397,7 @@ JNIEXPORT jfloat JNICALL Java_org_lwjgl_openal_AL10_alGetListenerf (JNIEnv *env, * C Specification: * ALvoid alGetListenerfv(ALenum pname,ALfloat *values); */ -JNIEXPORT void JNICALL Java_org_lwjgl_openal_AL10_nalGetListenerfv (JNIEnv *env, jclass clazz, jint pname, jobject values, jint offset) { +static void JNICALL Java_org_lwjgl_openal_AL10_nalGetListenerfv (JNIEnv *env, jclass clazz, jint pname, jobject values, jint offset) { alGetListenerfv((ALenum) pname, offset + (ALfloat*) env->GetDirectBufferAddress(values)); CHECK_AL_ERROR } @@ -285,7 +408,7 @@ JNIEXPORT void JNICALL Java_org_lwjgl_openal_AL10_nalGetListenerfv (JNIEnv *env, * C Specification: * ALvoid alGenSources(ALsizei n,ALuint *sources); */ -JNIEXPORT void JNICALL Java_org_lwjgl_openal_AL10_nalGenSources (JNIEnv *env, jclass clazz, jint n, jobject sources, jint offset) { +static void JNICALL Java_org_lwjgl_openal_AL10_nalGenSources (JNIEnv *env, jclass clazz, jint n, jobject sources, jint offset) { alGenSources(n, offset + (ALuint*) env->GetDirectBufferAddress(sources)); CHECK_AL_ERROR } @@ -296,7 +419,7 @@ JNIEXPORT void JNICALL Java_org_lwjgl_openal_AL10_nalGenSources (JNIEnv *env, jc * C Specification: * ALvoid alDeleteSources(ALsizei n,ALuint *sources); */ -JNIEXPORT void JNICALL Java_org_lwjgl_openal_AL10_nalDeleteSources (JNIEnv *env, jclass clazz, jint n, jobject sources, jint offset) { +static void JNICALL Java_org_lwjgl_openal_AL10_nalDeleteSources (JNIEnv *env, jclass clazz, jint n, jobject sources, jint offset) { alDeleteSources(n, offset + (ALuint*) env->GetDirectBufferAddress(sources)); CHECK_AL_ERROR } @@ -307,7 +430,7 @@ JNIEXPORT void JNICALL Java_org_lwjgl_openal_AL10_nalDeleteSources (JNIEnv *env, * C Specification: * Alboolean alIsSource(ALuint source); */ -JNIEXPORT jboolean JNICALL Java_org_lwjgl_openal_AL10_alIsSource (JNIEnv *env, jclass clazz, jint source) { +static jboolean JNICALL Java_org_lwjgl_openal_AL10_alIsSource (JNIEnv *env, jclass clazz, jint source) { jboolean result = (jboolean) alIsSource((ALuint) source); CHECK_AL_ERROR @@ -320,7 +443,7 @@ JNIEXPORT jboolean JNICALL Java_org_lwjgl_openal_AL10_alIsSource (JNIEnv *env, j * C Specification: * ALvoid alSourcei(ALuint source,ALenum pname,ALint value); */ -JNIEXPORT void JNICALL Java_org_lwjgl_openal_AL10_alSourcei (JNIEnv *env, jclass clazz, jint source, jint pname, jint value) { +static void JNICALL Java_org_lwjgl_openal_AL10_alSourcei (JNIEnv *env, jclass clazz, jint source, jint pname, jint value) { alSourcei((ALuint) source, (ALenum) pname, (ALint) value); CHECK_AL_ERROR } @@ -331,7 +454,7 @@ JNIEXPORT void JNICALL Java_org_lwjgl_openal_AL10_alSourcei (JNIEnv *env, jclass * C Specification: * ALvoid alSourcef(ALuint source,ALenum pname,ALfloat value); */ -JNIEXPORT void JNICALL Java_org_lwjgl_openal_AL10_alSourcef (JNIEnv *env, jclass clazz, jint source, jint pname, jfloat value) { +static void JNICALL Java_org_lwjgl_openal_AL10_alSourcef (JNIEnv *env, jclass clazz, jint source, jint pname, jfloat value) { alSourcef((ALuint) source, (ALenum) pname, (ALfloat) value); CHECK_AL_ERROR } @@ -341,7 +464,7 @@ JNIEXPORT void JNICALL Java_org_lwjgl_openal_AL10_alSourcef (JNIEnv *env, jclass * Method: nalSourcefv * Signature: (IILjava/nio/FloatBuffer;I)V */ -JNIEXPORT void JNICALL Java_org_lwjgl_openal_AL10_nalSourcefv (JNIEnv *env, jclass clazz, jint source, jint pname, jobject values, jint offset) { +static void JNICALL Java_org_lwjgl_openal_AL10_nalSourcefv (JNIEnv *env, jclass clazz, jint source, jint pname, jobject values, jint offset) { alSourcefv((ALuint) source, (ALenum) pname, offset + (ALfloat*) env->GetDirectBufferAddress(values)); CHECK_AL_ERROR } @@ -352,7 +475,7 @@ JNIEXPORT void JNICALL Java_org_lwjgl_openal_AL10_nalSourcefv (JNIEnv *env, jcla * C Specification: * ALvoid alSource3f(ALuint source,ALenum pname,ALfloat v1,ALfloat v2,ALfloat v3); */ -JNIEXPORT void JNICALL Java_org_lwjgl_openal_AL10_alSource3f (JNIEnv *env, jclass clazz, jint source, jint pname, jfloat v1, jfloat v2, jfloat v3) { +static void JNICALL Java_org_lwjgl_openal_AL10_alSource3f (JNIEnv *env, jclass clazz, jint source, jint pname, jfloat v1, jfloat v2, jfloat v3) { alSource3f((ALuint) source, (ALenum) pname, (ALfloat) v1, (ALfloat) v2, (ALfloat) v3); CHECK_AL_ERROR } @@ -363,7 +486,7 @@ JNIEXPORT void JNICALL Java_org_lwjgl_openal_AL10_alSource3f (JNIEnv *env, jclas * C Specification: * ALvoid alGetSourcei(ALuint source,ALenum pname,ALint *value); */ -JNIEXPORT jint JNICALL Java_org_lwjgl_openal_AL10_alGetSourcei (JNIEnv *env, jclass clazz, jint source, jint pname) { +static jint JNICALL Java_org_lwjgl_openal_AL10_alGetSourcei (JNIEnv *env, jclass clazz, jint source, jint pname) { ALint value = 0; alGetSourcei((ALuint) source, (ALenum) pname, &value); CHECK_AL_ERROR @@ -376,7 +499,7 @@ JNIEXPORT jint JNICALL Java_org_lwjgl_openal_AL10_alGetSourcei (JNIEnv *env, jcl * C Specification: * ALvoid alGetSourcef(ALuint source,ALenum pname,ALfloat *value); */ -JNIEXPORT jfloat JNICALL Java_org_lwjgl_openal_AL10_alGetSourcef (JNIEnv *env, jclass clazz, jint source, jint pname) { +static jfloat JNICALL Java_org_lwjgl_openal_AL10_alGetSourcef (JNIEnv *env, jclass clazz, jint source, jint pname) { ALfloat value = 0.0f; alGetSourcef((ALuint) source, (ALenum) pname, &value); CHECK_AL_ERROR @@ -389,7 +512,7 @@ JNIEXPORT jfloat JNICALL Java_org_lwjgl_openal_AL10_alGetSourcef (JNIEnv *env, j * C Specification: * ALvoid alGetSourcefv(ALuint source,ALenum pname,ALfloat *values); */ -JNIEXPORT void JNICALL Java_org_lwjgl_openal_AL10_nalGetSourcefv (JNIEnv *env, jclass clazz, jint source, jint pname, jobject values, jint offset) { +static void JNICALL Java_org_lwjgl_openal_AL10_nalGetSourcefv (JNIEnv *env, jclass clazz, jint source, jint pname, jobject values, jint offset) { alGetSourcefv((ALuint) source, (ALenum) pname, offset + (ALfloat*) env->GetDirectBufferAddress(values)); CHECK_AL_ERROR } @@ -400,7 +523,7 @@ JNIEXPORT void JNICALL Java_org_lwjgl_openal_AL10_nalGetSourcefv (JNIEnv *env, j * C Specification: * ALvoid alSourcePlayv(ALsizei n,ALuint *sources); */ -JNIEXPORT void JNICALL Java_org_lwjgl_openal_AL10_nalSourcePlayv (JNIEnv *env, jclass clazz, jint n, jobject sources, jint offset) { +static void JNICALL Java_org_lwjgl_openal_AL10_nalSourcePlayv (JNIEnv *env, jclass clazz, jint n, jobject sources, jint offset) { alSourcePlayv(n, offset + (ALuint*) env->GetDirectBufferAddress(sources)); CHECK_AL_ERROR } @@ -411,7 +534,7 @@ JNIEXPORT void JNICALL Java_org_lwjgl_openal_AL10_nalSourcePlayv (JNIEnv *env, j * C Specification: * ALvoid alSourcePausev(ALsizei n,ALuint *sources); */ -JNIEXPORT void JNICALL Java_org_lwjgl_openal_AL10_nalSourcePausev (JNIEnv *env, jclass clazz, jint n, jobject sources, jint offset) { +static void JNICALL Java_org_lwjgl_openal_AL10_nalSourcePausev (JNIEnv *env, jclass clazz, jint n, jobject sources, jint offset) { alSourcePausev(n, offset + (ALuint*) env->GetDirectBufferAddress(sources)); CHECK_AL_ERROR } @@ -422,7 +545,7 @@ JNIEXPORT void JNICALL Java_org_lwjgl_openal_AL10_nalSourcePausev (JNIEnv *env, * C Specification: * ALvoid alSourceStopv(ALsizei n,ALuint *sources); */ -JNIEXPORT void JNICALL Java_org_lwjgl_openal_AL10_nalSourceStopv (JNIEnv *env, jclass clazz, jint n, jobject sources, jint offset) { +static void JNICALL Java_org_lwjgl_openal_AL10_nalSourceStopv (JNIEnv *env, jclass clazz, jint n, jobject sources, jint offset) { alSourceStopv(n, offset + (ALuint*) env->GetDirectBufferAddress(sources)); CHECK_AL_ERROR } @@ -433,7 +556,7 @@ JNIEXPORT void JNICALL Java_org_lwjgl_openal_AL10_nalSourceStopv (JNIEnv *env, j * C Specification: * ALvoid alSourceRewindv(ALsizei n,ALuint *sources); */ -JNIEXPORT void JNICALL Java_org_lwjgl_openal_AL10_nalSourceRewindv (JNIEnv *env, jclass clazz, jint n, jobject sources, jint offset) { +static void JNICALL Java_org_lwjgl_openal_AL10_nalSourceRewindv (JNIEnv *env, jclass clazz, jint n, jobject sources, jint offset) { alSourceRewindv(n, offset + (ALuint*) env->GetDirectBufferAddress(sources)); CHECK_AL_ERROR } @@ -444,7 +567,7 @@ JNIEXPORT void JNICALL Java_org_lwjgl_openal_AL10_nalSourceRewindv (JNIEnv *env, * C Specification: * ALvoid alSourcePlay(ALuint source); */ -JNIEXPORT void JNICALL Java_org_lwjgl_openal_AL10_alSourcePlay (JNIEnv *env, jclass clazz, jint source) { +static void JNICALL Java_org_lwjgl_openal_AL10_alSourcePlay (JNIEnv *env, jclass clazz, jint source) { alSourcePlay((ALuint) source); CHECK_AL_ERROR } @@ -455,7 +578,7 @@ JNIEXPORT void JNICALL Java_org_lwjgl_openal_AL10_alSourcePlay (JNIEnv *env, jcl * C Specification: * ALvoid alSourcePause(ALuint source); */ -JNIEXPORT void JNICALL Java_org_lwjgl_openal_AL10_alSourcePause (JNIEnv *env, jclass clazz, jint source) { +static void JNICALL Java_org_lwjgl_openal_AL10_alSourcePause (JNIEnv *env, jclass clazz, jint source) { alSourcePause((ALuint) source); CHECK_AL_ERROR } @@ -466,7 +589,7 @@ JNIEXPORT void JNICALL Java_org_lwjgl_openal_AL10_alSourcePause (JNIEnv *env, jc * C Specification: * ALvoid alSourceStop(ALuint source); */ -JNIEXPORT void JNICALL Java_org_lwjgl_openal_AL10_alSourceStop (JNIEnv *env, jclass clazz, jint source) { +static void JNICALL Java_org_lwjgl_openal_AL10_alSourceStop (JNIEnv *env, jclass clazz, jint source) { alSourceStop((ALuint) source); CHECK_AL_ERROR } @@ -477,7 +600,7 @@ JNIEXPORT void JNICALL Java_org_lwjgl_openal_AL10_alSourceStop (JNIEnv *env, jcl * C Specification: * ALvoid alSourceRewind(ALuint source); */ -JNIEXPORT void JNICALL Java_org_lwjgl_openal_AL10_alSourceRewind (JNIEnv *env, jclass clazz, jint source) { +static void JNICALL Java_org_lwjgl_openal_AL10_alSourceRewind (JNIEnv *env, jclass clazz, jint source) { alSourceRewind((ALuint) source); CHECK_AL_ERROR } @@ -488,7 +611,7 @@ JNIEXPORT void JNICALL Java_org_lwjgl_openal_AL10_alSourceRewind (JNIEnv *env, j * C Specification: * ALvoid alGenBuffers(ALsizei n,ALuint *buffers); */ -JNIEXPORT void JNICALL Java_org_lwjgl_openal_AL10_nalGenBuffers (JNIEnv *env, jclass clazz, jint n, jobject buffers, jint offset) { +static void JNICALL Java_org_lwjgl_openal_AL10_nalGenBuffers (JNIEnv *env, jclass clazz, jint n, jobject buffers, jint offset) { alGenBuffers(n, offset + (ALuint*) env->GetDirectBufferAddress(buffers)); CHECK_AL_ERROR } @@ -499,7 +622,7 @@ JNIEXPORT void JNICALL Java_org_lwjgl_openal_AL10_nalGenBuffers (JNIEnv *env, jc * C Specification: * ALvoid alDeleteBuffers(ALsizei n,ALuint *buffers); */ -JNIEXPORT void JNICALL Java_org_lwjgl_openal_AL10_nalDeleteBuffers (JNIEnv *env, jclass clazz, jint n, jobject buffers, jint offset) { +static void JNICALL Java_org_lwjgl_openal_AL10_nalDeleteBuffers (JNIEnv *env, jclass clazz, jint n, jobject buffers, jint offset) { alDeleteBuffers(n, offset + (ALuint*) env->GetDirectBufferAddress(buffers)); CHECK_AL_ERROR } @@ -510,7 +633,7 @@ JNIEXPORT void JNICALL Java_org_lwjgl_openal_AL10_nalDeleteBuffers (JNIEnv *env, * C Specification: * Alboolean alIsBuffer(ALuint buffer); */ -JNIEXPORT jboolean JNICALL Java_org_lwjgl_openal_AL10_alIsBuffer (JNIEnv *env, jclass clazz, jint buffer) { +static jboolean JNICALL Java_org_lwjgl_openal_AL10_alIsBuffer (JNIEnv *env, jclass clazz, jint buffer) { jboolean result = (jboolean) alIsBuffer((ALuint) buffer); CHECK_AL_ERROR @@ -523,7 +646,7 @@ JNIEXPORT jboolean JNICALL Java_org_lwjgl_openal_AL10_alIsBuffer (JNIEnv *env, j * C Specification: * ALvoid alBufferData(ALuint buffer,ALenum format,ALvoid *data,ALsizei size,ALsizei freq); */ -JNIEXPORT void JNICALL Java_org_lwjgl_openal_AL10_nalBufferData (JNIEnv *env, jclass clazz, jint buffer, jint format, jobject data, jint offset, jint size, jint freq) { +static void JNICALL Java_org_lwjgl_openal_AL10_nalBufferData (JNIEnv *env, jclass clazz, jint buffer, jint format, jobject data, jint offset, jint size, jint freq) { alBufferData(buffer, format, (void*) (offset + (ALubyte *)env->GetDirectBufferAddress(data)), size, freq); CHECK_AL_ERROR } @@ -534,7 +657,7 @@ JNIEXPORT void JNICALL Java_org_lwjgl_openal_AL10_nalBufferData (JNIEnv *env, jc * C Specification: * ALvoid alGetBufferi(ALuint buffer,ALenum pname,ALint *value); */ -JNIEXPORT jint JNICALL Java_org_lwjgl_openal_AL10_alGetBufferi (JNIEnv *env, jclass clazz, jint buffer, jint pname) { +static jint JNICALL Java_org_lwjgl_openal_AL10_alGetBufferi (JNIEnv *env, jclass clazz, jint buffer, jint pname) { ALint value = 0; alGetBufferi((ALuint) buffer, (ALenum) pname, &value); CHECK_AL_ERROR @@ -547,7 +670,7 @@ JNIEXPORT jint JNICALL Java_org_lwjgl_openal_AL10_alGetBufferi (JNIEnv *env, jcl * C Specification: * ALvoid alGetBufferf(ALuint buffer,ALenum pname,ALfloat *value); */ -JNIEXPORT jfloat JNICALL Java_org_lwjgl_openal_AL10_alGetBufferf (JNIEnv *env, jclass clazz, jint buffer, jint pname) { +static jfloat JNICALL Java_org_lwjgl_openal_AL10_alGetBufferf (JNIEnv *env, jclass clazz, jint buffer, jint pname) { ALfloat value = 0.0f; alGetBufferf((ALuint) buffer, (ALenum) pname, &value); CHECK_AL_ERROR @@ -560,7 +683,7 @@ JNIEXPORT jfloat JNICALL Java_org_lwjgl_openal_AL10_alGetBufferf (JNIEnv *env, j * C Specification: * ALvoid alSourceQueueBuffers( ALuint source, ALsizei n, ALuint* buffers ); */ -JNIEXPORT void JNICALL Java_org_lwjgl_openal_AL10_nalSourceQueueBuffers (JNIEnv *env, jclass clazz, jint source, jint n, jobject buffers, jint offset) { +static void JNICALL Java_org_lwjgl_openal_AL10_nalSourceQueueBuffers (JNIEnv *env, jclass clazz, jint source, jint n, jobject buffers, jint offset) { alSourceQueueBuffers((ALuint) source, (ALsizei) n, offset + (ALuint*) env->GetDirectBufferAddress(buffers)); CHECK_AL_ERROR } @@ -571,7 +694,7 @@ JNIEXPORT void JNICALL Java_org_lwjgl_openal_AL10_nalSourceQueueBuffers (JNIEnv * C Specification: * ALvoid alSourceUnqueueBuffers( ALuint source, ALsizei n, ALuint* buffers ); */ -JNIEXPORT void JNICALL Java_org_lwjgl_openal_AL10_nalSourceUnqueueBuffers (JNIEnv *env, jclass clazz, jint source, jint n, jobject buffers, jint offset) { +static void JNICALL Java_org_lwjgl_openal_AL10_nalSourceUnqueueBuffers (JNIEnv *env, jclass clazz, jint source, jint n, jobject buffers, jint offset) { alSourceUnqueueBuffers((ALuint) source, (ALsizei) n, offset + (ALuint*) env->GetDirectBufferAddress(buffers)); CHECK_AL_ERROR } @@ -583,7 +706,7 @@ JNIEXPORT void JNICALL Java_org_lwjgl_openal_AL10_nalSourceUnqueueBuffers (JNIEn * ALvoid alDistanceModel( ALenum value ); */ -JNIEXPORT void JNICALL Java_org_lwjgl_openal_AL10_alDistanceModel (JNIEnv *env, jclass clazz, jint value) { +static void JNICALL Java_org_lwjgl_openal_AL10_alDistanceModel (JNIEnv *env, jclass clazz, jint value) { alDistanceModel((ALenum) value); CHECK_AL_ERROR } @@ -594,7 +717,7 @@ JNIEXPORT void JNICALL Java_org_lwjgl_openal_AL10_alDistanceModel (JNIEnv *env, * C Specification: * ALvoid alDopplerFactor( ALfloat value ); */ -JNIEXPORT void JNICALL Java_org_lwjgl_openal_AL10_alDopplerFactor (JNIEnv *env, jclass clazz, jfloat value) { +static void JNICALL Java_org_lwjgl_openal_AL10_alDopplerFactor (JNIEnv *env, jclass clazz, jfloat value) { alDopplerFactor((ALfloat) value); CHECK_AL_ERROR } @@ -605,7 +728,69 @@ JNIEXPORT void JNICALL Java_org_lwjgl_openal_AL10_alDopplerFactor (JNIEnv *env, * C Specification: * ALvoid alDopplerVelocity( ALfloat value ); */ -JNIEXPORT void JNICALL Java_org_lwjgl_openal_AL10_alDopplerVelocity (JNIEnv *env, jclass clazz, jfloat value) { +static void JNICALL Java_org_lwjgl_openal_AL10_alDopplerVelocity (JNIEnv *env, jclass clazz, jfloat value) { alDopplerVelocity((ALfloat) value); CHECK_AL_ERROR } + +/** + * Loads the basic OpenAL functions + * + * @return true if all methods were loaded, false if one of the methods could not be loaded + */ +bool LoadAL(JNIEnv *env) { + JavaMethodAndExtFunction functions[] = { + {"alEnable", "(I)V", (void*)&Java_org_lwjgl_openal_AL10_alEnable, "alEnable", (void**)&alEnable}, + {"alDisable", "(I)V", (void*)&Java_org_lwjgl_openal_AL10_alDisable, "alDisable", (void**)&alDisable}, + {"alIsEnabled", "(I)Z", (void*)&Java_org_lwjgl_openal_AL10_alIsEnabled, "alIsEnabled", (void**)&alIsEnabled}, +// {"alHint", "(II)V", (void*)&Java_org_lwjgl_openal_AL10_alHint, "alHint", (void**)&alHint}, + {"alGetBoolean", "(I)Z", (void*)&Java_org_lwjgl_openal_AL10_alGetBoolean, "alGetBoolean", (void**)&alGetBoolean}, + {"alGetInteger", "(I)I", (void*)&Java_org_lwjgl_openal_AL10_alGetInteger, "alGetInteger", (void**)&alGetInteger}, + {"alGetFloat", "(I)F", (void*)&Java_org_lwjgl_openal_AL10_alGetFloat, "alGetFloat", (void**)&alGetFloat}, + {"nalGetIntegerv", "(ILjava/nio/IntBuffer;I)V", (void*)&Java_org_lwjgl_openal_AL10_nalGetIntegerv, "alGetIntegerv", (void**)&alGetIntegerv}, + {"nalGetFloatv", "(ILjava/nio/FloatBuffer;I)V", (void*)&Java_org_lwjgl_openal_AL10_nalGetFloatv, "alGetFloatv", (void**)&alGetFloatv}, + {"alGetString", "(I)Ljava/lang/String;", (void*)&Java_org_lwjgl_openal_AL10_alGetString, "alGetString", (void**)&alGetString}, + {"alGetError", "()I", (void*)&Java_org_lwjgl_openal_AL10_alGetError, "alGetError", (void**)&alGetError}, + {"alIsExtensionPresent", "(Ljava/lang/String;)Z", (void*)&Java_org_lwjgl_openal_AL10_alIsExtensionPresent, "alIsExtensionPresent", (void**)&alIsExtensionPresent}, + {"alGetEnumValue", "(Ljava/lang/String;)I", (void*)&Java_org_lwjgl_openal_AL10_alGetEnumValue, "alGetEnumValue", (void**)&alGetEnumValue}, + {"alListeneri", "(II)V", (void*)&Java_org_lwjgl_openal_AL10_alListeneri, "alListeneri", (void**)&alListeneri}, + {"alListenerf", "(IF)V", (void*)&Java_org_lwjgl_openal_AL10_alListenerf, "alListenerf", (void**)&alListenerf}, + {"nalListenerfv", "(ILjava/nio/FloatBuffer;I)V", (void*)&Java_org_lwjgl_openal_AL10_nalListenerfv, "alListenerfv", (void**)&alListenerfv}, + {"alListener3f", "(IFFF)V", (void*)&Java_org_lwjgl_openal_AL10_alListener3f, "alListener3f", (void**)&alListener3f}, + {"alGetListeneri", "(I)I", (void*)&Java_org_lwjgl_openal_AL10_alGetListeneri, "alGetListeneri", (void**)&alGetListeneri}, + {"alGetListenerf", "(I)F", (void*)&Java_org_lwjgl_openal_AL10_alGetListenerf, "alGetListenerf", (void**)&alGetListenerf}, + {"nalGetListenerfv", "(ILjava/nio/FloatBuffer;I)V", (void*)&Java_org_lwjgl_openal_AL10_nalGetListenerfv, "alGetListenerfv", (void**)&alGetListenerfv}, + {"nalGenSources", "(ILjava/nio/IntBuffer;I)V", (void*)&Java_org_lwjgl_openal_AL10_nalGenSources, "alGenSources", (void**)&alGenSources}, + {"nalDeleteSources", "(ILjava/nio/IntBuffer;I)V", (void*)&Java_org_lwjgl_openal_AL10_nalDeleteSources, "alDeleteSources", (void**)&alDeleteSources}, + {"alIsSource", "(I)Z", (void*)&Java_org_lwjgl_openal_AL10_alIsSource, "alIsSource", (void**)&alIsSource}, + {"alSourcei", "(III)V", (void*)&Java_org_lwjgl_openal_AL10_alSourcei, "alSourcei", (void**)&alSourcei}, + {"alSourcef", "(IIF)V", (void*)&Java_org_lwjgl_openal_AL10_alSourcef, "alSourcef", (void**)&alSourcef}, + {"nalSourcefv", "(IILjava/nio/FloatBuffer;I)V", (void*)&Java_org_lwjgl_openal_AL10_nalSourcefv, "alSourcefv", (void**)&alSourcefv}, + {"alSource3f", "(IIFFF)V", (void*)&Java_org_lwjgl_openal_AL10_alSource3f, "alSource3f", (void**)&alSource3f}, + {"alGetSourcei", "(II)I", (void*)&Java_org_lwjgl_openal_AL10_alGetSourcei, "alGetSourcei", (void**)&alGetSourcei}, + {"alGetSourcef", "(II)F", (void*)&Java_org_lwjgl_openal_AL10_alGetSourcef, "alGetSourcef", (void**)&alGetSourcef}, + {"nalGetSourcefv", "(IILjava/nio/FloatBuffer;I)V", (void*)&Java_org_lwjgl_openal_AL10_nalGetSourcefv, "alGetSourcefv", (void**)&alGetSourcefv}, + {"alSourcePlay", "(I)V", (void*)&Java_org_lwjgl_openal_AL10_alSourcePlay, "alSourcePlay", (void**)&alSourcePlay}, + {"nalSourcePlayv", "(ILjava/nio/IntBuffer;I)V", (void*)&Java_org_lwjgl_openal_AL10_nalSourcePlayv, "alSourcePlayv", (void**)&alSourcePlayv}, + {"alSourcePause", "(I)V", (void*)&Java_org_lwjgl_openal_AL10_alSourcePause, "alSourcePause", (void**)&alSourcePause}, + {"nalSourcePausev", "(ILjava/nio/IntBuffer;I)V", (void*)&Java_org_lwjgl_openal_AL10_nalSourcePausev, "alSourcePausev", (void**)&alSourcePausev}, + {"alSourceStop", "(I)V", (void*)&Java_org_lwjgl_openal_AL10_alSourceStop, "alSourceStop", (void**)&alSourceStop}, + {"nalSourceStopv", "(ILjava/nio/IntBuffer;I)V", (void*)&Java_org_lwjgl_openal_AL10_nalSourceStopv, "alSourceStopv", (void**)&alSourceStopv}, + {"alSourceRewind", "(I)V", (void*)&Java_org_lwjgl_openal_AL10_alSourceRewind, "alSourceRewind", (void**)&alSourceRewind}, + {"nalSourceRewindv", "(ILjava/nio/IntBuffer;I)V", (void*)&Java_org_lwjgl_openal_AL10_nalSourceRewindv, "alSourceRewindv", (void**)&alSourceRewindv}, + {"nalGenBuffers", "(ILjava/nio/IntBuffer;I)V", (void*)&Java_org_lwjgl_openal_AL10_nalGenBuffers, "alGenBuffers", (void**)&alGenBuffers}, + {"nalDeleteBuffers", "(ILjava/nio/IntBuffer;I)V", (void*)&Java_org_lwjgl_openal_AL10_nalDeleteBuffers, "alDeleteBuffers", (void**)&alDeleteBuffers}, + {"alIsBuffer", "(I)Z", (void*)&Java_org_lwjgl_openal_AL10_alIsBuffer, "alIsBuffer", (void**)&alIsBuffer}, + {"nalBufferData", "(IILjava/nio/ByteBuffer;III)V", (void*)&Java_org_lwjgl_openal_AL10_nalBufferData, "alBufferData", (void**)&alBufferData}, + {"alGetBufferi", "(II)I", (void*)&Java_org_lwjgl_openal_AL10_alGetBufferi, "alGetBufferi", (void**)&alGetBufferi}, + {"alGetBufferf", "(II)F", (void*)&Java_org_lwjgl_openal_AL10_alGetBufferf, "alGetBufferf", (void**)&alGetBufferf}, + {"nalSourceQueueBuffers", "(IILjava/nio/IntBuffer;I)V", (void*)&Java_org_lwjgl_openal_AL10_nalSourceQueueBuffers, "alSourceQueueBuffers", (void**)&alSourceQueueBuffers}, + {"nalSourceUnqueueBuffers", "(IILjava/nio/IntBuffer;I)V", (void*)&Java_org_lwjgl_openal_AL10_nalSourceUnqueueBuffers, "alSourceUnqueueBuffers", (void**)&alSourceUnqueueBuffers}, + {"alDistanceModel", "(I)V", (void*)&Java_org_lwjgl_openal_AL10_alDistanceModel, "alDistanceModel", (void**)&alDistanceModel}, + {"alDopplerFactor", "(F)V", (void*)&Java_org_lwjgl_openal_AL10_alDopplerFactor, "alDopplerFactor", (void**)&alDopplerFactor}, + {"alDopplerVelocity", "(F)V", (void*)&Java_org_lwjgl_openal_AL10_alDopplerVelocity, "alDopplerVelocity", (void**)&alDopplerVelocity} + }; + int num_functions = NUMFUNCTIONS(functions); + jclass clazz = ext_ResetClass(env, "org/lwjgl/openal/AL10"); + return extal_InitializeClass(env, clazz, NULL, NULL, num_functions, functions); +} diff --git a/src/native/common/org_lwjgl_openal_AL10.h b/src/native/common/org_lwjgl_openal_AL10.h deleted file mode 100644 index 0a7d31df..00000000 --- a/src/native/common/org_lwjgl_openal_AL10.h +++ /dev/null @@ -1,533 +0,0 @@ -/* DO NOT EDIT THIS FILE - it is machine generated */ -#include -/* Header for class org_lwjgl_openal_AL10 */ - -#ifndef _Included_org_lwjgl_openal_AL10 -#define _Included_org_lwjgl_openal_AL10 -#ifdef __cplusplus -extern "C" { -#endif -/* Inaccessible static: _00024assertionsDisabled */ -#undef org_lwjgl_openal_AL10_AL_INVALID -#define org_lwjgl_openal_AL10_AL_INVALID -1L -#undef org_lwjgl_openal_AL10_AL_NONE -#define org_lwjgl_openal_AL10_AL_NONE 0L -#undef org_lwjgl_openal_AL10_AL_FALSE -#define org_lwjgl_openal_AL10_AL_FALSE 0L -#undef org_lwjgl_openal_AL10_AL_TRUE -#define org_lwjgl_openal_AL10_AL_TRUE 1L -#undef org_lwjgl_openal_AL10_AL_SOURCE_TYPE -#define org_lwjgl_openal_AL10_AL_SOURCE_TYPE 512L -#undef org_lwjgl_openal_AL10_AL_SOURCE_ABSOLUTE -#define org_lwjgl_openal_AL10_AL_SOURCE_ABSOLUTE 513L -#undef org_lwjgl_openal_AL10_AL_SOURCE_RELATIVE -#define org_lwjgl_openal_AL10_AL_SOURCE_RELATIVE 514L -#undef org_lwjgl_openal_AL10_AL_CONE_INNER_ANGLE -#define org_lwjgl_openal_AL10_AL_CONE_INNER_ANGLE 4097L -#undef org_lwjgl_openal_AL10_AL_CONE_OUTER_ANGLE -#define org_lwjgl_openal_AL10_AL_CONE_OUTER_ANGLE 4098L -#undef org_lwjgl_openal_AL10_AL_PITCH -#define org_lwjgl_openal_AL10_AL_PITCH 4099L -#undef org_lwjgl_openal_AL10_AL_POSITION -#define org_lwjgl_openal_AL10_AL_POSITION 4100L -#undef org_lwjgl_openal_AL10_AL_DIRECTION -#define org_lwjgl_openal_AL10_AL_DIRECTION 4101L -#undef org_lwjgl_openal_AL10_AL_VELOCITY -#define org_lwjgl_openal_AL10_AL_VELOCITY 4102L -#undef org_lwjgl_openal_AL10_AL_LOOPING -#define org_lwjgl_openal_AL10_AL_LOOPING 4103L -#undef org_lwjgl_openal_AL10_AL_BUFFER -#define org_lwjgl_openal_AL10_AL_BUFFER 4105L -#undef org_lwjgl_openal_AL10_AL_GAIN -#define org_lwjgl_openal_AL10_AL_GAIN 4106L -#undef org_lwjgl_openal_AL10_AL_MIN_GAIN -#define org_lwjgl_openal_AL10_AL_MIN_GAIN 4109L -#undef org_lwjgl_openal_AL10_AL_MAX_GAIN -#define org_lwjgl_openal_AL10_AL_MAX_GAIN 4110L -#undef org_lwjgl_openal_AL10_AL_ORIENTATION -#define org_lwjgl_openal_AL10_AL_ORIENTATION 4111L -#undef org_lwjgl_openal_AL10_AL_REFERENCE_DISTANCE -#define org_lwjgl_openal_AL10_AL_REFERENCE_DISTANCE 4128L -#undef org_lwjgl_openal_AL10_AL_ROLLOFF_FACTOR -#define org_lwjgl_openal_AL10_AL_ROLLOFF_FACTOR 4129L -#undef org_lwjgl_openal_AL10_AL_CONE_OUTER_GAIN -#define org_lwjgl_openal_AL10_AL_CONE_OUTER_GAIN 4130L -#undef org_lwjgl_openal_AL10_AL_MAX_DISTANCE -#define org_lwjgl_openal_AL10_AL_MAX_DISTANCE 4131L -#undef org_lwjgl_openal_AL10_AL_CHANNEL_MASK -#define org_lwjgl_openal_AL10_AL_CHANNEL_MASK 12288L -#undef org_lwjgl_openal_AL10_AL_SOURCE_STATE -#define org_lwjgl_openal_AL10_AL_SOURCE_STATE 4112L -#undef org_lwjgl_openal_AL10_AL_INITIAL -#define org_lwjgl_openal_AL10_AL_INITIAL 4113L -#undef org_lwjgl_openal_AL10_AL_PLAYING -#define org_lwjgl_openal_AL10_AL_PLAYING 4114L -#undef org_lwjgl_openal_AL10_AL_PAUSED -#define org_lwjgl_openal_AL10_AL_PAUSED 4115L -#undef org_lwjgl_openal_AL10_AL_STOPPED -#define org_lwjgl_openal_AL10_AL_STOPPED 4116L -#undef org_lwjgl_openal_AL10_AL_BUFFERS_QUEUED -#define org_lwjgl_openal_AL10_AL_BUFFERS_QUEUED 4117L -#undef org_lwjgl_openal_AL10_AL_BUFFERS_PROCESSED -#define org_lwjgl_openal_AL10_AL_BUFFERS_PROCESSED 4118L -#undef org_lwjgl_openal_AL10_AL_FORMAT_MONO8 -#define org_lwjgl_openal_AL10_AL_FORMAT_MONO8 4352L -#undef org_lwjgl_openal_AL10_AL_FORMAT_MONO16 -#define org_lwjgl_openal_AL10_AL_FORMAT_MONO16 4353L -#undef org_lwjgl_openal_AL10_AL_FORMAT_STEREO8 -#define org_lwjgl_openal_AL10_AL_FORMAT_STEREO8 4354L -#undef org_lwjgl_openal_AL10_AL_FORMAT_STEREO16 -#define org_lwjgl_openal_AL10_AL_FORMAT_STEREO16 4355L -#undef org_lwjgl_openal_AL10_AL_FORMAT_VORBIS_EXT -#define org_lwjgl_openal_AL10_AL_FORMAT_VORBIS_EXT 65539L -#undef org_lwjgl_openal_AL10_AL_FREQUENCY -#define org_lwjgl_openal_AL10_AL_FREQUENCY 8193L -#undef org_lwjgl_openal_AL10_AL_BITS -#define org_lwjgl_openal_AL10_AL_BITS 8194L -#undef org_lwjgl_openal_AL10_AL_CHANNELS -#define org_lwjgl_openal_AL10_AL_CHANNELS 8195L -#undef org_lwjgl_openal_AL10_AL_SIZE -#define org_lwjgl_openal_AL10_AL_SIZE 8196L -#undef org_lwjgl_openal_AL10_AL_DATA -#define org_lwjgl_openal_AL10_AL_DATA 8197L -#undef org_lwjgl_openal_AL10_AL_UNUSED -#define org_lwjgl_openal_AL10_AL_UNUSED 8208L -#undef org_lwjgl_openal_AL10_AL_PENDING -#define org_lwjgl_openal_AL10_AL_PENDING 8209L -#undef org_lwjgl_openal_AL10_AL_PROCESSED -#define org_lwjgl_openal_AL10_AL_PROCESSED 8210L -#undef org_lwjgl_openal_AL10_AL_NO_ERROR -#define org_lwjgl_openal_AL10_AL_NO_ERROR 0L -#undef org_lwjgl_openal_AL10_AL_INVALID_NAME -#define org_lwjgl_openal_AL10_AL_INVALID_NAME 40961L -#undef org_lwjgl_openal_AL10_AL_INVALID_ENUM -#define org_lwjgl_openal_AL10_AL_INVALID_ENUM 40962L -#undef org_lwjgl_openal_AL10_AL_INVALID_VALUE -#define org_lwjgl_openal_AL10_AL_INVALID_VALUE 40963L -#undef org_lwjgl_openal_AL10_AL_INVALID_OPERATION -#define org_lwjgl_openal_AL10_AL_INVALID_OPERATION 40964L -#undef org_lwjgl_openal_AL10_AL_OUT_OF_MEMORY -#define org_lwjgl_openal_AL10_AL_OUT_OF_MEMORY 40965L -#undef org_lwjgl_openal_AL10_AL_VENDOR -#define org_lwjgl_openal_AL10_AL_VENDOR 45057L -#undef org_lwjgl_openal_AL10_AL_VERSION -#define org_lwjgl_openal_AL10_AL_VERSION 45058L -#undef org_lwjgl_openal_AL10_AL_RENDERER -#define org_lwjgl_openal_AL10_AL_RENDERER 45059L -#undef org_lwjgl_openal_AL10_AL_EXTENSIONS -#define org_lwjgl_openal_AL10_AL_EXTENSIONS 45060L -#undef org_lwjgl_openal_AL10_AL_DOPPLER_FACTOR -#define org_lwjgl_openal_AL10_AL_DOPPLER_FACTOR 49152L -#undef org_lwjgl_openal_AL10_AL_DOPPLER_VELOCITY -#define org_lwjgl_openal_AL10_AL_DOPPLER_VELOCITY 49153L -#undef org_lwjgl_openal_AL10_AL_DISTANCE_MODEL -#define org_lwjgl_openal_AL10_AL_DISTANCE_MODEL 53248L -#undef org_lwjgl_openal_AL10_AL_INVERSE_DISTANCE -#define org_lwjgl_openal_AL10_AL_INVERSE_DISTANCE 53249L -#undef org_lwjgl_openal_AL10_AL_INVERSE_DISTANCE_CLAMPED -#define org_lwjgl_openal_AL10_AL_INVERSE_DISTANCE_CLAMPED 53250L -/* Inaccessible static: class_00024org_00024lwjgl_00024openal_00024AL10 */ -/* - * Class: org_lwjgl_openal_AL10 - * Method: alEnable - * Signature: (I)V - */ -JNIEXPORT void JNICALL Java_org_lwjgl_openal_AL10_alEnable - (JNIEnv *, jclass, jint); - -/* - * Class: org_lwjgl_openal_AL10 - * Method: alDisable - * Signature: (I)V - */ -JNIEXPORT void JNICALL Java_org_lwjgl_openal_AL10_alDisable - (JNIEnv *, jclass, jint); - -/* - * Class: org_lwjgl_openal_AL10 - * Method: alIsEnabled - * Signature: (I)Z - */ -JNIEXPORT jboolean JNICALL Java_org_lwjgl_openal_AL10_alIsEnabled - (JNIEnv *, jclass, jint); - -/* - * Class: org_lwjgl_openal_AL10 - * Method: alHint - * Signature: (II)V - */ -JNIEXPORT void JNICALL Java_org_lwjgl_openal_AL10_alHint - (JNIEnv *, jclass, jint, jint); - -/* - * Class: org_lwjgl_openal_AL10 - * Method: alGetBoolean - * Signature: (I)Z - */ -JNIEXPORT jboolean JNICALL Java_org_lwjgl_openal_AL10_alGetBoolean - (JNIEnv *, jclass, jint); - -/* - * Class: org_lwjgl_openal_AL10 - * Method: alGetInteger - * Signature: (I)I - */ -JNIEXPORT jint JNICALL Java_org_lwjgl_openal_AL10_alGetInteger - (JNIEnv *, jclass, jint); - -/* - * Class: org_lwjgl_openal_AL10 - * Method: alGetFloat - * Signature: (I)F - */ -JNIEXPORT jfloat JNICALL Java_org_lwjgl_openal_AL10_alGetFloat - (JNIEnv *, jclass, jint); - -/* - * Class: org_lwjgl_openal_AL10 - * Method: nalGetBooleanv - * Signature: (ILjava/nio/ByteBuffer;I)V - */ -JNIEXPORT void JNICALL Java_org_lwjgl_openal_AL10_nalGetBooleanv - (JNIEnv *, jclass, jint, jobject, jint); - -/* - * Class: org_lwjgl_openal_AL10 - * Method: nalGetIntegerv - * Signature: (ILjava/nio/IntBuffer;I)V - */ -JNIEXPORT void JNICALL Java_org_lwjgl_openal_AL10_nalGetIntegerv - (JNIEnv *, jclass, jint, jobject, jint); - -/* - * Class: org_lwjgl_openal_AL10 - * Method: nalGetFloatv - * Signature: (ILjava/nio/FloatBuffer;I)V - */ -JNIEXPORT void JNICALL Java_org_lwjgl_openal_AL10_nalGetFloatv - (JNIEnv *, jclass, jint, jobject, jint); - -/* - * Class: org_lwjgl_openal_AL10 - * Method: alGetString - * Signature: (I)Ljava/lang/String; - */ -JNIEXPORT jstring JNICALL Java_org_lwjgl_openal_AL10_alGetString - (JNIEnv *, jclass, jint); - -/* - * Class: org_lwjgl_openal_AL10 - * Method: alGetError - * Signature: ()I - */ -JNIEXPORT jint JNICALL Java_org_lwjgl_openal_AL10_alGetError - (JNIEnv *, jclass); - -/* - * Class: org_lwjgl_openal_AL10 - * Method: alIsExtensionPresent - * Signature: (Ljava/lang/String;)Z - */ -JNIEXPORT jboolean JNICALL Java_org_lwjgl_openal_AL10_alIsExtensionPresent - (JNIEnv *, jclass, jstring); - -/* - * Class: org_lwjgl_openal_AL10 - * Method: alGetEnumValue - * Signature: (Ljava/lang/String;)I - */ -JNIEXPORT jint JNICALL Java_org_lwjgl_openal_AL10_alGetEnumValue - (JNIEnv *, jclass, jstring); - -/* - * Class: org_lwjgl_openal_AL10 - * Method: alListeneri - * Signature: (II)V - */ -JNIEXPORT void JNICALL Java_org_lwjgl_openal_AL10_alListeneri - (JNIEnv *, jclass, jint, jint); - -/* - * Class: org_lwjgl_openal_AL10 - * Method: alListenerf - * Signature: (IF)V - */ -JNIEXPORT void JNICALL Java_org_lwjgl_openal_AL10_alListenerf - (JNIEnv *, jclass, jint, jfloat); - -/* - * Class: org_lwjgl_openal_AL10 - * Method: nalListenerfv - * Signature: (ILjava/nio/FloatBuffer;I)V - */ -JNIEXPORT void JNICALL Java_org_lwjgl_openal_AL10_nalListenerfv - (JNIEnv *, jclass, jint, jobject, jint); - -/* - * Class: org_lwjgl_openal_AL10 - * Method: alListener3f - * Signature: (IFFF)V - */ -JNIEXPORT void JNICALL Java_org_lwjgl_openal_AL10_alListener3f - (JNIEnv *, jclass, jint, jfloat, jfloat, jfloat); - -/* - * Class: org_lwjgl_openal_AL10 - * Method: alGetListeneri - * Signature: (I)I - */ -JNIEXPORT jint JNICALL Java_org_lwjgl_openal_AL10_alGetListeneri - (JNIEnv *, jclass, jint); - -/* - * Class: org_lwjgl_openal_AL10 - * Method: alGetListenerf - * Signature: (I)F - */ -JNIEXPORT jfloat JNICALL Java_org_lwjgl_openal_AL10_alGetListenerf - (JNIEnv *, jclass, jint); - -/* - * Class: org_lwjgl_openal_AL10 - * Method: nalGetListenerfv - * Signature: (ILjava/nio/FloatBuffer;I)V - */ -JNIEXPORT void JNICALL Java_org_lwjgl_openal_AL10_nalGetListenerfv - (JNIEnv *, jclass, jint, jobject, jint); - -/* - * Class: org_lwjgl_openal_AL10 - * Method: nalGenSources - * Signature: (ILjava/nio/IntBuffer;I)V - */ -JNIEXPORT void JNICALL Java_org_lwjgl_openal_AL10_nalGenSources - (JNIEnv *, jclass, jint, jobject, jint); - -/* - * Class: org_lwjgl_openal_AL10 - * Method: nalDeleteSources - * Signature: (ILjava/nio/IntBuffer;I)V - */ -JNIEXPORT void JNICALL Java_org_lwjgl_openal_AL10_nalDeleteSources - (JNIEnv *, jclass, jint, jobject, jint); - -/* - * Class: org_lwjgl_openal_AL10 - * Method: alIsSource - * Signature: (I)Z - */ -JNIEXPORT jboolean JNICALL Java_org_lwjgl_openal_AL10_alIsSource - (JNIEnv *, jclass, jint); - -/* - * Class: org_lwjgl_openal_AL10 - * Method: alSourcei - * Signature: (III)V - */ -JNIEXPORT void JNICALL Java_org_lwjgl_openal_AL10_alSourcei - (JNIEnv *, jclass, jint, jint, jint); - -/* - * Class: org_lwjgl_openal_AL10 - * Method: alSourcef - * Signature: (IIF)V - */ -JNIEXPORT void JNICALL Java_org_lwjgl_openal_AL10_alSourcef - (JNIEnv *, jclass, jint, jint, jfloat); - -/* - * Class: org_lwjgl_openal_AL10 - * Method: nalSourcefv - * Signature: (IILjava/nio/FloatBuffer;I)V - */ -JNIEXPORT void JNICALL Java_org_lwjgl_openal_AL10_nalSourcefv - (JNIEnv *, jclass, jint, jint, jobject, jint); - -/* - * Class: org_lwjgl_openal_AL10 - * Method: alSource3f - * Signature: (IIFFF)V - */ -JNIEXPORT void JNICALL Java_org_lwjgl_openal_AL10_alSource3f - (JNIEnv *, jclass, jint, jint, jfloat, jfloat, jfloat); - -/* - * Class: org_lwjgl_openal_AL10 - * Method: alGetSourcei - * Signature: (II)I - */ -JNIEXPORT jint JNICALL Java_org_lwjgl_openal_AL10_alGetSourcei - (JNIEnv *, jclass, jint, jint); - -/* - * Class: org_lwjgl_openal_AL10 - * Method: alGetSourcef - * Signature: (II)F - */ -JNIEXPORT jfloat JNICALL Java_org_lwjgl_openal_AL10_alGetSourcef - (JNIEnv *, jclass, jint, jint); - -/* - * Class: org_lwjgl_openal_AL10 - * Method: nalGetSourcefv - * Signature: (IILjava/nio/FloatBuffer;I)V - */ -JNIEXPORT void JNICALL Java_org_lwjgl_openal_AL10_nalGetSourcefv - (JNIEnv *, jclass, jint, jint, jobject, jint); - -/* - * Class: org_lwjgl_openal_AL10 - * Method: nalSourcePlayv - * Signature: (ILjava/nio/IntBuffer;I)V - */ -JNIEXPORT void JNICALL Java_org_lwjgl_openal_AL10_nalSourcePlayv - (JNIEnv *, jclass, jint, jobject, jint); - -/* - * Class: org_lwjgl_openal_AL10 - * Method: nalSourcePausev - * Signature: (ILjava/nio/IntBuffer;I)V - */ -JNIEXPORT void JNICALL Java_org_lwjgl_openal_AL10_nalSourcePausev - (JNIEnv *, jclass, jint, jobject, jint); - -/* - * Class: org_lwjgl_openal_AL10 - * Method: nalSourceStopv - * Signature: (ILjava/nio/IntBuffer;I)V - */ -JNIEXPORT void JNICALL Java_org_lwjgl_openal_AL10_nalSourceStopv - (JNIEnv *, jclass, jint, jobject, jint); - -/* - * Class: org_lwjgl_openal_AL10 - * Method: nalSourceRewindv - * Signature: (ILjava/nio/IntBuffer;I)V - */ -JNIEXPORT void JNICALL Java_org_lwjgl_openal_AL10_nalSourceRewindv - (JNIEnv *, jclass, jint, jobject, jint); - -/* - * Class: org_lwjgl_openal_AL10 - * Method: alSourcePlay - * Signature: (I)V - */ -JNIEXPORT void JNICALL Java_org_lwjgl_openal_AL10_alSourcePlay - (JNIEnv *, jclass, jint); - -/* - * Class: org_lwjgl_openal_AL10 - * Method: alSourcePause - * Signature: (I)V - */ -JNIEXPORT void JNICALL Java_org_lwjgl_openal_AL10_alSourcePause - (JNIEnv *, jclass, jint); - -/* - * Class: org_lwjgl_openal_AL10 - * Method: alSourceStop - * Signature: (I)V - */ -JNIEXPORT void JNICALL Java_org_lwjgl_openal_AL10_alSourceStop - (JNIEnv *, jclass, jint); - -/* - * Class: org_lwjgl_openal_AL10 - * Method: alSourceRewind - * Signature: (I)V - */ -JNIEXPORT void JNICALL Java_org_lwjgl_openal_AL10_alSourceRewind - (JNIEnv *, jclass, jint); - -/* - * Class: org_lwjgl_openal_AL10 - * Method: nalGenBuffers - * Signature: (ILjava/nio/IntBuffer;I)V - */ -JNIEXPORT void JNICALL Java_org_lwjgl_openal_AL10_nalGenBuffers - (JNIEnv *, jclass, jint, jobject, jint); - -/* - * Class: org_lwjgl_openal_AL10 - * Method: nalDeleteBuffers - * Signature: (ILjava/nio/IntBuffer;I)V - */ -JNIEXPORT void JNICALL Java_org_lwjgl_openal_AL10_nalDeleteBuffers - (JNIEnv *, jclass, jint, jobject, jint); - -/* - * Class: org_lwjgl_openal_AL10 - * Method: alIsBuffer - * Signature: (I)Z - */ -JNIEXPORT jboolean JNICALL Java_org_lwjgl_openal_AL10_alIsBuffer - (JNIEnv *, jclass, jint); - -/* - * Class: org_lwjgl_openal_AL10 - * Method: nalBufferData - * Signature: (IILjava/nio/ByteBuffer;III)V - */ -JNIEXPORT void JNICALL Java_org_lwjgl_openal_AL10_nalBufferData - (JNIEnv *, jclass, jint, jint, jobject, jint, jint, jint); - -/* - * Class: org_lwjgl_openal_AL10 - * Method: alGetBufferi - * Signature: (II)I - */ -JNIEXPORT jint JNICALL Java_org_lwjgl_openal_AL10_alGetBufferi - (JNIEnv *, jclass, jint, jint); - -/* - * Class: org_lwjgl_openal_AL10 - * Method: alGetBufferf - * Signature: (II)F - */ -JNIEXPORT jfloat JNICALL Java_org_lwjgl_openal_AL10_alGetBufferf - (JNIEnv *, jclass, jint, jint); - -/* - * Class: org_lwjgl_openal_AL10 - * Method: nalSourceQueueBuffers - * Signature: (IILjava/nio/IntBuffer;I)V - */ -JNIEXPORT void JNICALL Java_org_lwjgl_openal_AL10_nalSourceQueueBuffers - (JNIEnv *, jclass, jint, jint, jobject, jint); - -/* - * Class: org_lwjgl_openal_AL10 - * Method: nalSourceUnqueueBuffers - * Signature: (IILjava/nio/IntBuffer;I)V - */ -JNIEXPORT void JNICALL Java_org_lwjgl_openal_AL10_nalSourceUnqueueBuffers - (JNIEnv *, jclass, jint, jint, jobject, jint); - -/* - * Class: org_lwjgl_openal_AL10 - * Method: alDistanceModel - * Signature: (I)V - */ -JNIEXPORT void JNICALL Java_org_lwjgl_openal_AL10_alDistanceModel - (JNIEnv *, jclass, jint); - -/* - * Class: org_lwjgl_openal_AL10 - * Method: alDopplerFactor - * Signature: (F)V - */ -JNIEXPORT void JNICALL Java_org_lwjgl_openal_AL10_alDopplerFactor - (JNIEnv *, jclass, jfloat); - -/* - * Class: org_lwjgl_openal_AL10 - * Method: alDopplerVelocity - * Signature: (F)V - */ -JNIEXPORT void JNICALL Java_org_lwjgl_openal_AL10_alDopplerVelocity - (JNIEnv *, jclass, jfloat); - -#ifdef __cplusplus -} -#endif -#endif diff --git a/src/native/common/org_lwjgl_openal_ALC.cpp b/src/native/common/org_lwjgl_openal_ALC.cpp index 5f7e4061..a51b0315 100644 --- a/src/native/common/org_lwjgl_openal_ALC.cpp +++ b/src/native/common/org_lwjgl_openal_ALC.cpp @@ -38,35 +38,43 @@ * @author Brian Matzon * @version $Revision$ */ -#include "org_lwjgl_openal_ALC.h" /* OpenAL includes */ #include "checkALerror.h" #include "extal.h" -/* - * Class: org_lwjgl_openal_ALC - * Method: nCreate - * Signature: ()Z - */ -JNIEXPORT jboolean JNICALL Java_org_lwjgl_openal_ALC_nCreate (JNIEnv *env, jclass clazz) { - //check that our methods have been loaded - if(alEnable == NULL) { - jclass cls = env->FindClass("org/lwjgl/openal/OpenALException"); - env->ThrowNew(cls, (const char*) "Unable to loacate OpenAL Methods. Please assert that AL was created successfully."); - env->DeleteLocalRef(cls); - return false; - } - return true; -} +//alc +typedef ALCubyte* (ALCAPIENTRY *alcGetStringPROC)(ALCdevice *device,ALCenum param); +typedef ALCvoid (ALCAPIENTRY *alcGetIntegervPROC)(ALCdevice *device,ALCenum param,ALCsizei size,ALCint *data); +typedef ALCdevice* (ALCAPIENTRY *alcOpenDevicePROC)(ALCubyte *deviceName); +typedef ALCvoid (ALCAPIENTRY *alcCloseDevicePROC)(ALCdevice *device); +typedef ALCcontext* (ALCAPIENTRY *alcCreateContextPROC)(ALCdevice *device,ALCint *attrList); +typedef ALCboolean (ALCAPIENTRY *alcMakeContextCurrentPROC)(ALCcontext *context); +typedef ALCvoid (ALCAPIENTRY *alcProcessContextPROC)(ALCcontext *context); +typedef ALCcontext* (ALCAPIENTRY *alcGetCurrentContextPROC)(ALCvoid); +typedef ALCdevice* (ALCAPIENTRY *alcGetContextsDevicePROC)(ALCcontext *context); +typedef ALCvoid (ALCAPIENTRY *alcSuspendContextPROC)(ALCcontext *context); +typedef ALCvoid (ALCAPIENTRY *alcDestroyContextPROC)(ALCcontext *context); +typedef ALCenum (ALCAPIENTRY *alcGetErrorPROC)(ALCdevice *device); +typedef ALCboolean (ALCAPIENTRY *alcIsExtensionPresentPROC)(ALCdevice *device,ALCubyte *extName); +//typedef ALCvoid* (ALCAPIENTRY *alcGetProcAddressPROC)(ALCdevice *device,ALCubyte *funcName); +typedef ALCenum (ALCAPIENTRY *alcGetEnumValuePROC)(ALCdevice *device,ALCubyte *enumName); -/* - * Class: org_lwjgl_openal_ALC - * Method: nDestroy - * Signature: ()V - */ -JNIEXPORT void JNICALL Java_org_lwjgl_openal_ALC_nDestroy (JNIEnv *env, jclass clazz) { -} +static alcGetStringPROC alcGetString; +static alcGetIntegervPROC alcGetIntegerv; +static alcOpenDevicePROC alcOpenDevice; +static alcCloseDevicePROC alcCloseDevice; +static alcCreateContextPROC alcCreateContext; +static alcMakeContextCurrentPROC alcMakeContextCurrent; +static alcProcessContextPROC alcProcessContext; +static alcGetCurrentContextPROC alcGetCurrentContext; +static alcGetContextsDevicePROC alcGetContextsDevice; +static alcSuspendContextPROC alcSuspendContext; +static alcDestroyContextPROC alcDestroyContext; +static alcGetErrorPROC alcGetError; +static alcIsExtensionPresentPROC alcIsExtensionPresent; +//static alcGetProcAddressPROC alcGetProcAddress; +static alcGetEnumValuePROC alcGetEnumValue; /** * This function returns strings related to the context. @@ -74,7 +82,7 @@ JNIEXPORT void JNICALL Java_org_lwjgl_openal_ALC_nDestroy (JNIEnv *env, jclass c * C Specification: * ALubyte * alcGetString(ALCdevice *device, ALenum token); */ -JNIEXPORT jstring JNICALL Java_org_lwjgl_openal_ALC_nalcGetString (JNIEnv *env, jclass clazz, jint deviceaddress, jint token) { +static jstring JNICALL Java_org_lwjgl_openal_ALC_nalcGetString (JNIEnv *env, jclass clazz, jint deviceaddress, jint token) { const char* alcString = (const char*) alcGetString((ALCdevice*) deviceaddress, (ALenum) token); if(alcString == NULL) { return NULL; @@ -92,7 +100,7 @@ JNIEXPORT jstring JNICALL Java_org_lwjgl_openal_ALC_nalcGetString (JNIEnv *env, * C Specification: * ALvoid alcGetIntegerv(ALCdevice *device, ALenum token, ALsizei size, ALint *dest); */ -JNIEXPORT void JNICALL Java_org_lwjgl_openal_ALC_nalcGetIntegerv (JNIEnv *env, jclass clazz, jint deviceaddress, jint token, jint size, jobject dest, jint offset) { +static void JNICALL Java_org_lwjgl_openal_ALC_nalcGetIntegerv (JNIEnv *env, jclass clazz, jint deviceaddress, jint token, jint size, jobject dest, jint offset) { ALint* address = NULL; if (dest != NULL) { address = offset + (ALint*) env->GetDirectBufferAddress(dest); @@ -107,7 +115,7 @@ JNIEXPORT void JNICALL Java_org_lwjgl_openal_ALC_nalcGetIntegerv (JNIEnv *env, j * C Specification: * ALCdevice *alcOpenDevice( const ALubyte *tokstr ); */ -JNIEXPORT jobject JNICALL Java_org_lwjgl_openal_ALC_alcOpenDevice (JNIEnv *env, jclass clazz, jstring tokstr) { +static jobject JNICALL Java_org_lwjgl_openal_ALC_alcOpenDevice (JNIEnv *env, jclass clazz, jstring tokstr) { const char * tokenstring; jboolean isCopy = JNI_FALSE; @@ -153,7 +161,7 @@ JNIEXPORT jobject JNICALL Java_org_lwjgl_openal_ALC_alcOpenDevice (JNIEnv *env, * C Specification: * void alcCloseDevice( ALCdevice *dev ); */ -JNIEXPORT void JNICALL Java_org_lwjgl_openal_ALC_alcCloseDevice (JNIEnv *env, jclass clazz, jint deviceaddress) { +static void JNICALL Java_org_lwjgl_openal_ALC_alcCloseDevice (JNIEnv *env, jclass clazz, jint deviceaddress) { alcCloseDevice((ALCdevice*) deviceaddress); CHECK_ALC_ERROR } @@ -164,7 +172,7 @@ JNIEXPORT void JNICALL Java_org_lwjgl_openal_ALC_alcCloseDevice (JNIEnv *env, jc * C Specification: * ALCcontext* alcCreateContext( ALCdevice *dev, ALint* attrlist ); */ -JNIEXPORT jobject JNICALL Java_org_lwjgl_openal_ALC_alcCreateContext (JNIEnv *env, jclass clazz, jint deviceaddress, jobject attrlist) { +static jobject JNICALL Java_org_lwjgl_openal_ALC_alcCreateContext (JNIEnv *env, jclass clazz, jint deviceaddress, jobject attrlist) { ALint* address = NULL; if (attrlist != NULL) { address = (ALint*) env->GetDirectBufferAddress(attrlist); @@ -198,7 +206,7 @@ JNIEXPORT jobject JNICALL Java_org_lwjgl_openal_ALC_alcCreateContext (JNIEnv *en * C Specification: * ALCboolean alcMakeContextCurrent(ALCcontext *context); */ -JNIEXPORT jboolean JNICALL Java_org_lwjgl_openal_ALC_alcMakeContextCurrent (JNIEnv *env, jclass clazz, jint contextaddress) { +static jboolean JNICALL Java_org_lwjgl_openal_ALC_alcMakeContextCurrent (JNIEnv *env, jclass clazz, jint contextaddress) { ALCcontext* context = (ALCcontext*) contextaddress; if(context == NULL) { return alcMakeContextCurrent(NULL); @@ -212,7 +220,7 @@ JNIEXPORT jboolean JNICALL Java_org_lwjgl_openal_ALC_alcMakeContextCurrent (JNIE * C Specification: * void alcProcessContext(ALCcontext *context); */ -JNIEXPORT void JNICALL Java_org_lwjgl_openal_ALC_nalcProcessContext (JNIEnv *env, jclass clazz, jint contextaddress) { +static void JNICALL Java_org_lwjgl_openal_ALC_nalcProcessContext (JNIEnv *env, jclass clazz, jint contextaddress) { alcProcessContext((ALCcontext*) contextaddress); } @@ -222,7 +230,7 @@ JNIEXPORT void JNICALL Java_org_lwjgl_openal_ALC_nalcProcessContext (JNIEnv *env * C Specification: * ALCcontext* alcGetCurrentContext( ALvoid ); */ -JNIEXPORT jobject JNICALL Java_org_lwjgl_openal_ALC_alcGetCurrentContext (JNIEnv *env, jclass clazz) { +static jobject JNICALL Java_org_lwjgl_openal_ALC_alcGetCurrentContext (JNIEnv *env, jclass clazz) { ALCcontext* context = alcGetCurrentContext(); if(context == NULL) { @@ -250,7 +258,7 @@ JNIEXPORT jobject JNICALL Java_org_lwjgl_openal_ALC_alcGetCurrentContext (JNIEnv * C Specification: * ALCdevice* alcGetContextsDevice(ALCcontext *context); */ -JNIEXPORT jobject JNICALL Java_org_lwjgl_openal_ALC_alcGetContextsDevice (JNIEnv *env, jclass clazz, jint contextaddress) { +static jobject JNICALL Java_org_lwjgl_openal_ALC_alcGetContextsDevice (JNIEnv *env, jclass clazz, jint contextaddress) { ALCdevice* device = alcGetContextsDevice((ALCcontext*) contextaddress); if(device == NULL) { @@ -278,7 +286,7 @@ JNIEXPORT jobject JNICALL Java_org_lwjgl_openal_ALC_alcGetContextsDevice (JNIEnv * C Specification: * void alcSuspendContext(ALCcontext *context); */ -JNIEXPORT void JNICALL Java_org_lwjgl_openal_ALC_alcSuspendContext (JNIEnv *env, jclass clazz, jint contextaddress) { +static void JNICALL Java_org_lwjgl_openal_ALC_alcSuspendContext (JNIEnv *env, jclass clazz, jint contextaddress) { alcSuspendContext((ALCcontext*) contextaddress); } @@ -288,7 +296,7 @@ JNIEXPORT void JNICALL Java_org_lwjgl_openal_ALC_alcSuspendContext (JNIEnv *env, * C Specification: * void alcDestroyContext(ALCcontext *context); */ -JNIEXPORT void JNICALL Java_org_lwjgl_openal_ALC_alcDestroyContext (JNIEnv *env, jclass clazz, jint contextaddress) { +static void JNICALL Java_org_lwjgl_openal_ALC_alcDestroyContext (JNIEnv *env, jclass clazz, jint contextaddress) { alcDestroyContext((ALCcontext*) contextaddress); } @@ -298,7 +306,7 @@ JNIEXPORT void JNICALL Java_org_lwjgl_openal_ALC_alcDestroyContext (JNIEnv *env, * C Specification: * ALCenum alcGetError(ALCdevice *device); */ -JNIEXPORT jint JNICALL Java_org_lwjgl_openal_ALC_nalcGetError (JNIEnv *env, jclass clazz, jint deviceaddress) { +static jint JNICALL Java_org_lwjgl_openal_ALC_nalcGetError (JNIEnv *env, jclass clazz, jint deviceaddress) { jint result = alcGetError((ALCdevice*) deviceaddress); CHECK_ALC_ERROR return result; @@ -310,7 +318,7 @@ JNIEXPORT jint JNICALL Java_org_lwjgl_openal_ALC_nalcGetError (JNIEnv *env, jcla * C Specification: * ALboolean alcIsExtensionPresent(ALCdevice *device, ALubyte *extName); */ -JNIEXPORT jboolean JNICALL Java_org_lwjgl_openal_ALC_nalcIsExtensionPresent (JNIEnv *env, jclass clazz, jint deviceaddress, jstring extName) { +static jboolean JNICALL Java_org_lwjgl_openal_ALC_nalcIsExtensionPresent (JNIEnv *env, jclass clazz, jint deviceaddress, jstring extName) { /* get extension */ ALubyte* functionname = (ALubyte*) (env->GetStringUTFChars(extName, 0)); @@ -328,7 +336,7 @@ JNIEXPORT jboolean JNICALL Java_org_lwjgl_openal_ALC_nalcIsExtensionPresent (JNI * C Specification: * ALenum alcGetEnumValue(ALCdevice *device, ALubyte *enumName); */ -JNIEXPORT jint JNICALL Java_org_lwjgl_openal_ALC_nalcGetEnumValue (JNIEnv *env, jclass clazz, jint deviceaddress, jstring enumName) { +static jint JNICALL Java_org_lwjgl_openal_ALC_nalcGetEnumValue (JNIEnv *env, jclass clazz, jint deviceaddress, jstring enumName) { /* get extension */ ALubyte* enumerationname = (ALubyte*) (env->GetStringUTFChars(enumName, 0)); @@ -339,3 +347,30 @@ JNIEXPORT jint JNICALL Java_org_lwjgl_openal_ALC_nalcGetEnumValue (JNIEnv *env, CHECK_ALC_ERROR return result; } + +/** + * Loads the context OpenAL functions + * + * @return true if all methods were loaded, false if one of the methods could not be loaded + */ +bool LoadALC(JNIEnv *env) { + JavaMethodAndExtFunction functions[] = { + {"nalcGetString", "(II)Ljava/lang/String;", (void*)&Java_org_lwjgl_openal_ALC_nalcGetString, "alcGetString", (void**)&alcGetString}, + {"nalcGetIntegerv", "(IIILjava/nio/Buffer;I)V", (void*)&Java_org_lwjgl_openal_ALC_nalcGetIntegerv, "alcGetIntegerv", (void**)&alcGetIntegerv}, + {"alcOpenDevice", "(Ljava/lang/String;)Lorg/lwjgl/openal/ALCdevice;", (void*)&Java_org_lwjgl_openal_ALC_alcOpenDevice, "alcOpenDevice", (void**)&alcOpenDevice}, + {"alcCloseDevice", "(I)V", (void*)&Java_org_lwjgl_openal_ALC_alcCloseDevice, "alcCloseDevice", (void**)&alcCloseDevice}, + {"alcCreateContext", "(ILjava/nio/IntBuffer;)Lorg/lwjgl/openal/ALCcontext;", (void*)&Java_org_lwjgl_openal_ALC_alcCreateContext, "alcCreateContext", (void**)&alcCreateContext}, + {"alcMakeContextCurrent", "(I)Z", (void*)&Java_org_lwjgl_openal_ALC_alcMakeContextCurrent, "alcMakeContextCurrent", (void**)&alcMakeContextCurrent}, + {"nalcProcessContext", "(I)V", (void*)&Java_org_lwjgl_openal_ALC_nalcProcessContext, "alcProcessContext", (void**)&alcProcessContext}, + {"alcGetCurrentContext", "()Lorg/lwjgl/openal/ALCcontext;", (void*)&Java_org_lwjgl_openal_ALC_alcGetCurrentContext, "alcGetCurrentContext", (void**)&alcGetCurrentContext}, + {"alcGetContextsDevice", "(I)Lorg/lwjgl/openal/ALCdevice;", (void*)&Java_org_lwjgl_openal_ALC_alcGetContextsDevice, "alcGetContextsDevice", (void**)&alcGetContextsDevice}, + {"alcSuspendContext", "(I)V", (void*)&Java_org_lwjgl_openal_ALC_alcSuspendContext, "alcSuspendContext", (void**)&alcSuspendContext}, + {"alcDestroyContext", "(I)V", (void*)&Java_org_lwjgl_openal_ALC_alcDestroyContext, "alcDestroyContext", (void**)&alcDestroyContext}, + {"nalcGetError", "(I)I", (void*)&Java_org_lwjgl_openal_ALC_nalcGetError, "alcGetError", (void**)&alcGetError}, + {"nalcIsExtensionPresent", "(ILjava/lang/String;)Z", (void*)&Java_org_lwjgl_openal_ALC_nalcIsExtensionPresent, "alcIsExtensionPresent", (void**)&alcIsExtensionPresent}, + {"nalcGetEnumValue", "(ILjava/lang/String;)I", (void*)&Java_org_lwjgl_openal_ALC_nalcGetEnumValue, "alcGetEnumValue", (void**)&alcGetEnumValue} + }; + int num_functions = NUMFUNCTIONS(functions); + jclass clazz = ext_ResetClass(env, "org/lwjgl/openal/ALC"); + return extal_InitializeClass(env, clazz, NULL, NULL, num_functions, functions); +} diff --git a/src/native/common/org_lwjgl_openal_ALC.h b/src/native/common/org_lwjgl_openal_ALC.h deleted file mode 100644 index c8180070..00000000 --- a/src/native/common/org_lwjgl_openal_ALC.h +++ /dev/null @@ -1,180 +0,0 @@ -/* DO NOT EDIT THIS FILE - it is machine generated */ -#include -/* Header for class org_lwjgl_openal_ALC */ - -#ifndef _Included_org_lwjgl_openal_ALC -#define _Included_org_lwjgl_openal_ALC -#ifdef __cplusplus -extern "C" { -#endif -/* Inaccessible static: created */ -#undef org_lwjgl_openal_ALC_ALC_INVALID -#define org_lwjgl_openal_ALC_ALC_INVALID -1L -#undef org_lwjgl_openal_ALC_ALC_FALSE -#define org_lwjgl_openal_ALC_ALC_FALSE 0L -#undef org_lwjgl_openal_ALC_ALC_TRUE -#define org_lwjgl_openal_ALC_ALC_TRUE 1L -#undef org_lwjgl_openal_ALC_ALC_NO_ERROR -#define org_lwjgl_openal_ALC_ALC_NO_ERROR 0L -#undef org_lwjgl_openal_ALC_ALC_MAJOR_VERSION -#define org_lwjgl_openal_ALC_ALC_MAJOR_VERSION 4096L -#undef org_lwjgl_openal_ALC_ALC_MINOR_VERSION -#define org_lwjgl_openal_ALC_ALC_MINOR_VERSION 4097L -#undef org_lwjgl_openal_ALC_ALC_ATTRIBUTES_SIZE -#define org_lwjgl_openal_ALC_ALC_ATTRIBUTES_SIZE 4098L -#undef org_lwjgl_openal_ALC_ALC_ALL_ATTRIBUTES -#define org_lwjgl_openal_ALC_ALC_ALL_ATTRIBUTES 4099L -#undef org_lwjgl_openal_ALC_ALC_DEFAULT_DEVICE_SPECIFIER -#define org_lwjgl_openal_ALC_ALC_DEFAULT_DEVICE_SPECIFIER 4100L -#undef org_lwjgl_openal_ALC_ALC_DEVICE_SPECIFIER -#define org_lwjgl_openal_ALC_ALC_DEVICE_SPECIFIER 4101L -#undef org_lwjgl_openal_ALC_ALC_EXTENSIONS -#define org_lwjgl_openal_ALC_ALC_EXTENSIONS 4102L -#undef org_lwjgl_openal_ALC_ALC_FREQUENCY -#define org_lwjgl_openal_ALC_ALC_FREQUENCY 4103L -#undef org_lwjgl_openal_ALC_ALC_REFRESH -#define org_lwjgl_openal_ALC_ALC_REFRESH 4104L -#undef org_lwjgl_openal_ALC_ALC_SYNC -#define org_lwjgl_openal_ALC_ALC_SYNC 4105L -#undef org_lwjgl_openal_ALC_ALC_INVALID_DEVICE -#define org_lwjgl_openal_ALC_ALC_INVALID_DEVICE 40961L -#undef org_lwjgl_openal_ALC_ALC_INVALID_CONTEXT -#define org_lwjgl_openal_ALC_ALC_INVALID_CONTEXT 40962L -#undef org_lwjgl_openal_ALC_ALC_INVALID_ENUM -#define org_lwjgl_openal_ALC_ALC_INVALID_ENUM 40963L -#undef org_lwjgl_openal_ALC_ALC_INVALID_VALUE -#define org_lwjgl_openal_ALC_ALC_INVALID_VALUE 40964L -#undef org_lwjgl_openal_ALC_ALC_OUT_OF_MEMORY -#define org_lwjgl_openal_ALC_ALC_OUT_OF_MEMORY 40965L -/* - * Class: org_lwjgl_openal_ALC - * Method: nCreate - * Signature: ()Z - */ -JNIEXPORT jboolean JNICALL Java_org_lwjgl_openal_ALC_nCreate - (JNIEnv *, jclass); - -/* - * Class: org_lwjgl_openal_ALC - * Method: nDestroy - * Signature: ()V - */ -JNIEXPORT void JNICALL Java_org_lwjgl_openal_ALC_nDestroy - (JNIEnv *, jclass); - -/* - * Class: org_lwjgl_openal_ALC - * Method: nalcGetString - * Signature: (II)Ljava/lang/String; - */ -JNIEXPORT jstring JNICALL Java_org_lwjgl_openal_ALC_nalcGetString - (JNIEnv *, jclass, jint, jint); - -/* - * Class: org_lwjgl_openal_ALC - * Method: nalcGetIntegerv - * Signature: (IIILjava/nio/Buffer;I)V - */ -JNIEXPORT void JNICALL Java_org_lwjgl_openal_ALC_nalcGetIntegerv - (JNIEnv *, jclass, jint, jint, jint, jobject, jint); - -/* - * Class: org_lwjgl_openal_ALC - * Method: alcOpenDevice - * Signature: (Ljava/lang/String;)Lorg/lwjgl/openal/ALCdevice; - */ -JNIEXPORT jobject JNICALL Java_org_lwjgl_openal_ALC_alcOpenDevice - (JNIEnv *, jclass, jstring); - -/* - * Class: org_lwjgl_openal_ALC - * Method: alcCloseDevice - * Signature: (I)V - */ -JNIEXPORT void JNICALL Java_org_lwjgl_openal_ALC_alcCloseDevice - (JNIEnv *, jclass, jint); - -/* - * Class: org_lwjgl_openal_ALC - * Method: alcCreateContext - * Signature: (ILjava/nio/IntBuffer;)Lorg/lwjgl/openal/ALCcontext; - */ -JNIEXPORT jobject JNICALL Java_org_lwjgl_openal_ALC_alcCreateContext - (JNIEnv *, jclass, jint, jobject); - -/* - * Class: org_lwjgl_openal_ALC - * Method: alcMakeContextCurrent - * Signature: (I)Z - */ -JNIEXPORT jboolean JNICALL Java_org_lwjgl_openal_ALC_alcMakeContextCurrent - (JNIEnv *, jclass, jint); - -/* - * Class: org_lwjgl_openal_ALC - * Method: nalcProcessContext - * Signature: (I)V - */ -JNIEXPORT void JNICALL Java_org_lwjgl_openal_ALC_nalcProcessContext - (JNIEnv *, jclass, jint); - -/* - * Class: org_lwjgl_openal_ALC - * Method: alcGetCurrentContext - * Signature: ()Lorg/lwjgl/openal/ALCcontext; - */ -JNIEXPORT jobject JNICALL Java_org_lwjgl_openal_ALC_alcGetCurrentContext - (JNIEnv *, jclass); - -/* - * Class: org_lwjgl_openal_ALC - * Method: alcGetContextsDevice - * Signature: (I)Lorg/lwjgl/openal/ALCdevice; - */ -JNIEXPORT jobject JNICALL Java_org_lwjgl_openal_ALC_alcGetContextsDevice - (JNIEnv *, jclass, jint); - -/* - * Class: org_lwjgl_openal_ALC - * Method: alcSuspendContext - * Signature: (I)V - */ -JNIEXPORT void JNICALL Java_org_lwjgl_openal_ALC_alcSuspendContext - (JNIEnv *, jclass, jint); - -/* - * Class: org_lwjgl_openal_ALC - * Method: alcDestroyContext - * Signature: (I)V - */ -JNIEXPORT void JNICALL Java_org_lwjgl_openal_ALC_alcDestroyContext - (JNIEnv *, jclass, jint); - -/* - * Class: org_lwjgl_openal_ALC - * Method: nalcGetError - * Signature: (I)I - */ -JNIEXPORT jint JNICALL Java_org_lwjgl_openal_ALC_nalcGetError - (JNIEnv *, jclass, jint); - -/* - * Class: org_lwjgl_openal_ALC - * Method: nalcIsExtensionPresent - * Signature: (ILjava/lang/String;)Z - */ -JNIEXPORT jboolean JNICALL Java_org_lwjgl_openal_ALC_nalcIsExtensionPresent - (JNIEnv *, jclass, jint, jstring); - -/* - * Class: org_lwjgl_openal_ALC - * Method: nalcGetEnumValue - * Signature: (ILjava/lang/String;)I - */ -JNIEXPORT jint JNICALL Java_org_lwjgl_openal_ALC_nalcGetEnumValue - (JNIEnv *, jclass, jint, jstring); - -#ifdef __cplusplus -} -#endif -#endif diff --git a/src/native/common/org_lwjgl_opengl_GL11.cpp b/src/native/common/org_lwjgl_opengl_GL11.cpp index 42040f13..1468a405 100644 --- a/src/native/common/org_lwjgl_opengl_GL11.cpp +++ b/src/native/common/org_lwjgl_opengl_GL11.cpp @@ -40,7 +40,6 @@ */ #include "extgl.h" -#include "common_tools.h" typedef void (APIENTRY * glAccumPROC) (GLenum op, GLfloat value); typedef void (APIENTRY * glAlphaFuncPROC) (GLenum func, GLclampf ref); @@ -2572,7 +2571,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL11_glViewport(JNIEnv * env, jclass c } -void extgl_InitOpenGL1_1(JNIEnv *env) +bool extgl_InitOpenGL1_1(JNIEnv *env) { JavaMethodAndExtFunction functions[] = { {"glAccum", "(IF)V", (void*)&Java_org_lwjgl_opengl_GL11_glAccum, "glAccum", (void**)&glAccum}, @@ -2784,7 +2783,6 @@ void extgl_InitOpenGL1_1(JNIEnv *env) }; int num_functions = NUMFUNCTIONS(functions); jclass clazz = ext_ResetClass(env, "org/lwjgl/opengl/GL11"); - if (true) - extgl_InitializeClass(env, clazz, NULL, "GL11", num_functions, functions); + return extgl_InitializeClass(env, clazz, NULL, "GL11", num_functions, functions); }