From 874edcb3ecd55b11797fb7a24856969015a8ba45 Mon Sep 17 00:00:00 2001 From: Brian Matzon Date: Wed, 13 Aug 2003 21:03:30 +0000 Subject: [PATCH] fix: naming --- src/java/org/lwjgl/openal/ALC.java | 24 +++++++++++----------- src/native/common/org_lwjgl_openal_ALC.cpp | 12 +++++------ src/native/common/org_lwjgl_openal_ALC.h | 24 +++++++++++----------- 3 files changed, 30 insertions(+), 30 deletions(-) diff --git a/src/java/org/lwjgl/openal/ALC.java b/src/java/org/lwjgl/openal/ALC.java index 1a6a59bc..d9e66e84 100644 --- a/src/java/org/lwjgl/openal/ALC.java +++ b/src/java/org/lwjgl/openal/ALC.java @@ -215,10 +215,10 @@ public class ALC { * @return String property from device */ public static String alcGetString(int pname) { - return nGetString(AL.device.device, pname); + return nalcGetString(AL.device.device, pname); } - native static String nGetString(int device, int pname); + native static String nalcGetString(int device, int pname); /** * The application can query ALC for information using an integer query function. @@ -241,10 +241,10 @@ public class ALC { * @param integerdata ByteBuffer to write integers to */ public static void alcGetInteger(int pname, IntBuffer integerdata) { - nGetIntegerv(AL.device.device, pname, integerdata.remaining(), integerdata, integerdata.position()); + nalcGetIntegerv(AL.device.device, pname, integerdata.remaining(), integerdata, integerdata.position()); } - native static void nGetIntegerv(int device, int pname, int size, Buffer integerdata, int offset); + native static void nalcGetIntegerv(int device, int pname, int size, Buffer integerdata, int offset); /** * The alcOpenDevice function allows the application (i.e. the client program) to @@ -316,10 +316,10 @@ public class ALC { * alcCreateContext is that it is not marked as processing. */ public static void alcProcessContext() { - nProcessContext(AL.context.context); + nalcProcessContext(AL.context.context); } - native static void nProcessContext(int context); + native static void nalcProcessContext(int context); /** * The application can query for, and obtain an handle to, the current context for the @@ -375,10 +375,10 @@ public class ALC { * @return Errorcode from ALC statemachine */ public static int alcGetError() { - return nGetError(AL.device.device); + return nalcGetError(AL.device.device); } - native static int nGetError(int device); + native static int nalcGetError(int device); /** * Verify that a given extension is available for the current context and the device it @@ -390,10 +390,10 @@ public class ALC { * @return true if extension is available, false if not */ public static boolean alcIsExtensionPresent(String extName) { - return nIsExtensionPresent(AL.device.device, extName); + return nalcIsExtensionPresent(AL.device.device, extName); } - native static boolean nIsExtensionPresent(int device, String extName); + native static boolean nalcIsExtensionPresent(int device, String extName); /** * Enumeration/token values are device independend, but tokens defined for @@ -406,8 +406,8 @@ public class ALC { * @return value of enumeration */ public static int alcGetEnumValue(String enumName) { - return nGetEnumValue(AL.device.device, enumName); + return nalcGetEnumValue(AL.device.device, enumName); } - native static int nGetEnumValue(int device, String enumName); + native static int nalcGetEnumValue(int device, String enumName); } \ No newline at end of file diff --git a/src/native/common/org_lwjgl_openal_ALC.cpp b/src/native/common/org_lwjgl_openal_ALC.cpp index 7d8af52a..7124ac63 100644 --- a/src/native/common/org_lwjgl_openal_ALC.cpp +++ b/src/native/common/org_lwjgl_openal_ALC.cpp @@ -74,7 +74,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_nGetString (JNIEnv *env, jclass clazz, jint deviceaddress, jint token) { +JNIEXPORT 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 +92,7 @@ JNIEXPORT jstring JNICALL Java_org_lwjgl_openal_ALC_nGetString (JNIEnv *env, jcl * C Specification: * ALvoid alcGetIntegerv(ALCdevice *device, ALenum token, ALsizei size, ALint *dest); */ -JNIEXPORT void JNICALL Java_org_lwjgl_openal_ALC_nGetIntegerv (JNIEnv *env, jclass clazz, jint deviceaddress, jint token, jint size, jobject dest, int offset) { +JNIEXPORT void JNICALL Java_org_lwjgl_openal_ALC_nalcGetIntegerv (JNIEnv *env, jclass clazz, jint deviceaddress, jint token, jint size, jobject dest, int offset) { ALint* address = NULL; if (dest != NULL) { address = offset + (ALint*) env->GetDirectBufferAddress(dest); @@ -212,7 +212,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_nProcessContext (JNIEnv *env, jclass clazz, jint contextaddress) { +JNIEXPORT void JNICALL Java_org_lwjgl_openal_ALC_nalcProcessContext (JNIEnv *env, jclass clazz, jint contextaddress) { alcProcessContext((ALCcontext*) contextaddress); } @@ -298,7 +298,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_nGetError (JNIEnv *env, jclass clazz, jint deviceaddress) { +JNIEXPORT 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 +310,7 @@ JNIEXPORT jint JNICALL Java_org_lwjgl_openal_ALC_nGetError (JNIEnv *env, jclass * C Specification: * ALboolean alcIsExtensionPresent(ALCdevice *device, ALubyte *extName); */ -JNIEXPORT jboolean JNICALL Java_org_lwjgl_openal_ALC_nIsExtensionPresent (JNIEnv *env, jclass clazz, jint deviceaddress, jstring extName) { +JNIEXPORT 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 +328,7 @@ JNIEXPORT jboolean JNICALL Java_org_lwjgl_openal_ALC_nIsExtensionPresent (JNIEnv * C Specification: * ALenum alcGetEnumValue(ALCdevice *device, ALubyte *enumName); */ -JNIEXPORT jint JNICALL Java_org_lwjgl_openal_ALC_nGetEnumValue (JNIEnv *env, jclass clazz, jint deviceaddress, jstring enumName) { +JNIEXPORT 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)); diff --git a/src/native/common/org_lwjgl_openal_ALC.h b/src/native/common/org_lwjgl_openal_ALC.h index 6515b359..c8180070 100644 --- a/src/native/common/org_lwjgl_openal_ALC.h +++ b/src/native/common/org_lwjgl_openal_ALC.h @@ -64,18 +64,18 @@ JNIEXPORT void JNICALL Java_org_lwjgl_openal_ALC_nDestroy /* * Class: org_lwjgl_openal_ALC - * Method: nGetString + * Method: nalcGetString * Signature: (II)Ljava/lang/String; */ -JNIEXPORT jstring JNICALL Java_org_lwjgl_openal_ALC_nGetString +JNIEXPORT jstring JNICALL Java_org_lwjgl_openal_ALC_nalcGetString (JNIEnv *, jclass, jint, jint); /* * Class: org_lwjgl_openal_ALC - * Method: nGetIntegerv + * Method: nalcGetIntegerv * Signature: (IIILjava/nio/Buffer;I)V */ -JNIEXPORT void JNICALL Java_org_lwjgl_openal_ALC_nGetIntegerv +JNIEXPORT void JNICALL Java_org_lwjgl_openal_ALC_nalcGetIntegerv (JNIEnv *, jclass, jint, jint, jint, jobject, jint); /* @@ -112,10 +112,10 @@ JNIEXPORT jboolean JNICALL Java_org_lwjgl_openal_ALC_alcMakeContextCurrent /* * Class: org_lwjgl_openal_ALC - * Method: nProcessContext + * Method: nalcProcessContext * Signature: (I)V */ -JNIEXPORT void JNICALL Java_org_lwjgl_openal_ALC_nProcessContext +JNIEXPORT void JNICALL Java_org_lwjgl_openal_ALC_nalcProcessContext (JNIEnv *, jclass, jint); /* @@ -152,26 +152,26 @@ JNIEXPORT void JNICALL Java_org_lwjgl_openal_ALC_alcDestroyContext /* * Class: org_lwjgl_openal_ALC - * Method: nGetError + * Method: nalcGetError * Signature: (I)I */ -JNIEXPORT jint JNICALL Java_org_lwjgl_openal_ALC_nGetError +JNIEXPORT jint JNICALL Java_org_lwjgl_openal_ALC_nalcGetError (JNIEnv *, jclass, jint); /* * Class: org_lwjgl_openal_ALC - * Method: nIsExtensionPresent + * Method: nalcIsExtensionPresent * Signature: (ILjava/lang/String;)Z */ -JNIEXPORT jboolean JNICALL Java_org_lwjgl_openal_ALC_nIsExtensionPresent +JNIEXPORT jboolean JNICALL Java_org_lwjgl_openal_ALC_nalcIsExtensionPresent (JNIEnv *, jclass, jint, jstring); /* * Class: org_lwjgl_openal_ALC - * Method: nGetEnumValue + * Method: nalcGetEnumValue * Signature: (ILjava/lang/String;)I */ -JNIEXPORT jint JNICALL Java_org_lwjgl_openal_ALC_nGetEnumValue +JNIEXPORT jint JNICALL Java_org_lwjgl_openal_ALC_nalcGetEnumValue (JNIEnv *, jclass, jint, jstring); #ifdef __cplusplus