From d9ed524c547de9f69bdb5414b9b0176e6b6ff1ef Mon Sep 17 00:00:00 2001 From: Brian Matzon Date: Wed, 14 Aug 2002 10:55:41 +0000 Subject: [PATCH] CoreAL10 -> CoreAL --- src/java/org/lwjgl/openal/AL.java | 2 +- .../openal/{CoreAL10.java => CoreAL.java} | 8 +- src/native/common/org_lwjgl_openal_CoreAL.h | 93 +++++++++++++++++++ src/native/common/org_lwjgl_openal_CoreAL10.h | 93 ------------------- ...l_CoreAL10.c => org_lwjgl_openal_CoreAL.c} | 22 ++--- 5 files changed, 109 insertions(+), 109 deletions(-) rename src/java/org/lwjgl/openal/{CoreAL10.java => CoreAL.java} (92%) create mode 100644 src/native/common/org_lwjgl_openal_CoreAL.h delete mode 100644 src/native/common/org_lwjgl_openal_CoreAL10.h rename src/native/win32/{org_lwjgl_openal_CoreAL10.c => org_lwjgl_openal_CoreAL.c} (65%) diff --git a/src/java/org/lwjgl/openal/AL.java b/src/java/org/lwjgl/openal/AL.java index cceb29ee..fb1da7a7 100644 --- a/src/java/org/lwjgl/openal/AL.java +++ b/src/java/org/lwjgl/openal/AL.java @@ -8,7 +8,7 @@ package org.lwjgl.openal; * @author Brian Matzon * @version $Revision$ */ -public class AL extends CoreAL10 { +public class AL extends CoreAL { /** * Nothing to se here - please move along diff --git a/src/java/org/lwjgl/openal/CoreAL10.java b/src/java/org/lwjgl/openal/CoreAL.java similarity index 92% rename from src/java/org/lwjgl/openal/CoreAL10.java rename to src/java/org/lwjgl/openal/CoreAL.java index 829754f5..b38d281b 100644 --- a/src/java/org/lwjgl/openal/CoreAL10.java +++ b/src/java/org/lwjgl/openal/CoreAL.java @@ -3,16 +3,16 @@ package org.lwjgl.openal; /** * $Id$ * - * This is the core OpenAL 1.0 class. This class implements + * This is the core OpenAL class. This class implements * AL.h version 1.0 * * @author Brian Matzon * @version $Revision$ */ -public class CoreAL10 extends BaseAL implements BaseALConstants { +public class CoreAL extends BaseAL implements BaseALConstants { - /** Creates a new instance of CoreAL10 */ - public CoreAL10() { + /** Creates a new instance of CoreAL */ + public CoreAL() { } /** diff --git a/src/native/common/org_lwjgl_openal_CoreAL.h b/src/native/common/org_lwjgl_openal_CoreAL.h new file mode 100644 index 00000000..5556d4ca --- /dev/null +++ b/src/native/common/org_lwjgl_openal_CoreAL.h @@ -0,0 +1,93 @@ +/* DO NOT EDIT THIS FILE - it is machine generated */ +#include +/* Header for class org_lwjgl_openal_CoreAL */ + +#ifndef _Included_org_lwjgl_openal_CoreAL +#define _Included_org_lwjgl_openal_CoreAL +#ifdef __cplusplus +extern "C" { +#endif +/* + * Class: org_lwjgl_openal_CoreAL + * Method: alGetError + * Signature: ()I + */ +JNIEXPORT jint JNICALL Java_org_lwjgl_openal_CoreAL_alGetError + (JNIEnv *, jobject); + +/* + * Class: org_lwjgl_openal_CoreAL + * Method: alGetString + * Signature: (I)Ljava/lang/String; + */ +JNIEXPORT jstring JNICALL Java_org_lwjgl_openal_CoreAL_alGetString + (JNIEnv *, jobject, jint); + +/* + * Class: org_lwjgl_openal_CoreAL + * Method: alGenBuffers + * Signature: (I[I)V + */ +JNIEXPORT void JNICALL Java_org_lwjgl_openal_CoreAL_alGenBuffers + (JNIEnv *, jobject, jint, jintArray); + +/* + * Class: org_lwjgl_openal_CoreAL + * Method: alGenSources + * Signature: (I[I)V + */ +JNIEXPORT void JNICALL Java_org_lwjgl_openal_CoreAL_alGenSources + (JNIEnv *, jobject, jint, jintArray); + +/* + * Class: org_lwjgl_openal_CoreAL + * Method: alBufferData + * Signature: (IIIII)V + */ +JNIEXPORT void JNICALL Java_org_lwjgl_openal_CoreAL_alBufferData + (JNIEnv *, jobject, jint, jint, jint, jint, jint); + +/* + * Class: org_lwjgl_openal_CoreAL + * Method: alSourcei + * Signature: (III)V + */ +JNIEXPORT void JNICALL Java_org_lwjgl_openal_CoreAL_alSourcei + (JNIEnv *, jobject, jint, jint, jint); + +/* + * Class: org_lwjgl_openal_CoreAL + * Method: alSourcePlay + * Signature: (I)V + */ +JNIEXPORT void JNICALL Java_org_lwjgl_openal_CoreAL_alSourcePlay + (JNIEnv *, jobject, jint); + +/* + * Class: org_lwjgl_openal_CoreAL + * Method: alSourceStop + * Signature: (I)V + */ +JNIEXPORT void JNICALL Java_org_lwjgl_openal_CoreAL_alSourceStop + (JNIEnv *, jobject, jint); + +/* + * Class: org_lwjgl_openal_CoreAL + * Method: alDeleteSources + * Signature: (I[I)V + */ +JNIEXPORT void JNICALL Java_org_lwjgl_openal_CoreAL_alDeleteSources + (JNIEnv *, jobject, jint, jintArray); + +/* + * Class: org_lwjgl_openal_CoreAL + * Method: alDeleteBuffers + * Signature: (I[I)V + */ +JNIEXPORT void JNICALL Java_org_lwjgl_openal_CoreAL_alDeleteBuffers + (JNIEnv *, jobject, jint, jintArray); + +#ifdef __cplusplus +} +#endif +#endif diff --git a/src/native/common/org_lwjgl_openal_CoreAL10.h b/src/native/common/org_lwjgl_openal_CoreAL10.h deleted file mode 100644 index 691bbffb..00000000 --- a/src/native/common/org_lwjgl_openal_CoreAL10.h +++ /dev/null @@ -1,93 +0,0 @@ -/* DO NOT EDIT THIS FILE - it is machine generated */ -#include -/* Header for class org_lwjgl_openal_CoreAL10 */ - -#ifndef _Included_org_lwjgl_openal_CoreAL10 -#define _Included_org_lwjgl_openal_CoreAL10 -#ifdef __cplusplus -extern "C" { -#endif -/* - * Class: org_lwjgl_openal_CoreAL10 - * Method: alGetError - * Signature: ()I - */ -JNIEXPORT jint JNICALL Java_org_lwjgl_openal_CoreAL10_alGetError - (JNIEnv *, jobject); - -/* - * Class: org_lwjgl_openal_CoreAL10 - * Method: alGetString - * Signature: (I)Ljava/lang/String; - */ -JNIEXPORT jstring JNICALL Java_org_lwjgl_openal_CoreAL10_alGetString - (JNIEnv *, jobject, jint); - -/* - * Class: org_lwjgl_openal_CoreAL10 - * Method: alGenBuffers - * Signature: (I[I)V - */ -JNIEXPORT void JNICALL Java_org_lwjgl_openal_CoreAL10_alGenBuffers - (JNIEnv *, jobject, jint, jintArray); - -/* - * Class: org_lwjgl_openal_CoreAL10 - * Method: alGenSources - * Signature: (I[I)V - */ -JNIEXPORT void JNICALL Java_org_lwjgl_openal_CoreAL10_alGenSources - (JNIEnv *, jobject, jint, jintArray); - -/* - * Class: org_lwjgl_openal_CoreAL10 - * Method: alBufferData - * Signature: (IIIII)V - */ -JNIEXPORT void JNICALL Java_org_lwjgl_openal_CoreAL10_alBufferData - (JNIEnv *, jobject, jint, jint, jint, jint, jint); - -/* - * Class: org_lwjgl_openal_CoreAL10 - * Method: alSourcei - * Signature: (III)V - */ -JNIEXPORT void JNICALL Java_org_lwjgl_openal_CoreAL10_alSourcei - (JNIEnv *, jobject, jint, jint, jint); - -/* - * Class: org_lwjgl_openal_CoreAL10 - * Method: alSourcePlay - * Signature: (I)V - */ -JNIEXPORT void JNICALL Java_org_lwjgl_openal_CoreAL10_alSourcePlay - (JNIEnv *, jobject, jint); - -/* - * Class: org_lwjgl_openal_CoreAL10 - * Method: alSourceStop - * Signature: (I)V - */ -JNIEXPORT void JNICALL Java_org_lwjgl_openal_CoreAL10_alSourceStop - (JNIEnv *, jobject, jint); - -/* - * Class: org_lwjgl_openal_CoreAL10 - * Method: alDeleteSources - * Signature: (I[I)V - */ -JNIEXPORT void JNICALL Java_org_lwjgl_openal_CoreAL10_alDeleteSources - (JNIEnv *, jobject, jint, jintArray); - -/* - * Class: org_lwjgl_openal_CoreAL10 - * Method: alDeleteBuffers - * Signature: (I[I)V - */ -JNIEXPORT void JNICALL Java_org_lwjgl_openal_CoreAL10_alDeleteBuffers - (JNIEnv *, jobject, jint, jintArray); - -#ifdef __cplusplus -} -#endif -#endif diff --git a/src/native/win32/org_lwjgl_openal_CoreAL10.c b/src/native/win32/org_lwjgl_openal_CoreAL.c similarity index 65% rename from src/native/win32/org_lwjgl_openal_CoreAL10.c rename to src/native/win32/org_lwjgl_openal_CoreAL.c index 895411d0..0d905586 100644 --- a/src/native/win32/org_lwjgl_openal_CoreAL10.c +++ b/src/native/win32/org_lwjgl_openal_CoreAL.c @@ -7,7 +7,7 @@ * @author Brian Matzon * @version $Revision$ */ -#include "org_lwjgl_openal_CoreAL10.h" +#include "org_lwjgl_openal_CoreAL.h" /* OpenAL includes */ #include @@ -18,7 +18,7 @@ * C Specification: * ALenum alGetError(ALvoid); */ -JNIEXPORT jint JNICALL Java_org_lwjgl_openal_CoreAL10_alGetError (JNIEnv *env, jobject obj) { +JNIEXPORT jint JNICALL Java_org_lwjgl_openal_CoreAL_alGetError (JNIEnv *env, jobject obj) { return alGetError(); } /** @@ -27,7 +27,7 @@ JNIEXPORT jint JNICALL Java_org_lwjgl_openal_CoreAL10_alGetError (JNIEnv *env, j * C Specification: * ALubyte * alGetString(ALenum pname); */ -JNIEXPORT jstring JNICALL Java_org_lwjgl_openal_CoreAL10_alGetString (JNIEnv *env, jobject obj, jint param) { +JNIEXPORT jstring JNICALL Java_org_lwjgl_openal_CoreAL_alGetString (JNIEnv *env, jobject obj, jint param) { return (*env)->NewStringUTF(env, alGetString(param)); } @@ -37,7 +37,7 @@ JNIEXPORT jstring JNICALL Java_org_lwjgl_openal_CoreAL10_alGetString (JNIEnv *en * C Specification: * ALvoid alGenBuffers(ALsizei n,ALuint *buffers); */ -JNIEXPORT void JNICALL Java_org_lwjgl_openal_CoreAL10_alGenBuffers (JNIEnv *env, jobject obj, jint n, jintArray buffers) { +JNIEXPORT void JNICALL Java_org_lwjgl_openal_CoreAL_alGenBuffers (JNIEnv *env, jobject obj, jint n, jintArray buffers) { int* array = (*env)->GetIntArrayElements(env, buffers, 0); alGenBuffers(n, array); (*env)->ReleaseIntArrayElements(env, buffers, array, 0); @@ -48,7 +48,7 @@ JNIEXPORT void JNICALL Java_org_lwjgl_openal_CoreAL10_alGenBuffers (JNIEnv *env, * C Specification: * ALvoid alGenSources(ALsizei n,ALuint *sources); */ -JNIEXPORT void JNICALL Java_org_lwjgl_openal_CoreAL10_alGenSources (JNIEnv *env, jobject obj, jint n, jintArray sources) { +JNIEXPORT void JNICALL Java_org_lwjgl_openal_CoreAL_alGenSources (JNIEnv *env, jobject obj, jint n, jintArray sources) { int* array = (*env)->GetIntArrayElements(env, sources, 0); alGenSources(n, array); (*env)->ReleaseIntArrayElements(env, sources, array, 0); @@ -60,7 +60,7 @@ JNIEXPORT void JNICALL Java_org_lwjgl_openal_CoreAL10_alGenSources (JNIEnv *env, * C Specification: * ALvoid alBufferData(ALuint buffer,ALenum format,ALvoid *data,ALsizei size,ALsizei freq); */ -JNIEXPORT void JNICALL Java_org_lwjgl_openal_CoreAL10_alBufferData (JNIEnv *env, jobject obj, jint buffer, jint format, jint data, jint size, jint freq) { +JNIEXPORT void JNICALL Java_org_lwjgl_openal_CoreAL_alBufferData (JNIEnv *env, jobject obj, jint buffer, jint format, jint data, jint size, jint freq) { alBufferData(buffer, format, (void**) data, size, freq); } @@ -70,7 +70,7 @@ JNIEXPORT void JNICALL Java_org_lwjgl_openal_CoreAL10_alBufferData (JNIEnv *env, * C Specification: * ALvoid alSourcei(ALuint source,ALenum pname,ALint value); */ -JNIEXPORT void JNICALL Java_org_lwjgl_openal_CoreAL10_alSourcei (JNIEnv *env, jobject obj, jint source, jint param, jint value) { +JNIEXPORT void JNICALL Java_org_lwjgl_openal_CoreAL_alSourcei (JNIEnv *env, jobject obj, jint source, jint param, jint value) { alSourcei(source, param, value); } @@ -80,7 +80,7 @@ JNIEXPORT void JNICALL Java_org_lwjgl_openal_CoreAL10_alSourcei (JNIEnv *env, jo * C Specification: * ALvoid alSourcePlay(ALuint source); */ -JNIEXPORT void JNICALL Java_org_lwjgl_openal_CoreAL10_alSourcePlay (JNIEnv *env, jobject obj, jint source) { +JNIEXPORT void JNICALL Java_org_lwjgl_openal_CoreAL_alSourcePlay (JNIEnv *env, jobject obj, jint source) { alSourcePlay(source); } @@ -90,7 +90,7 @@ JNIEXPORT void JNICALL Java_org_lwjgl_openal_CoreAL10_alSourcePlay (JNIEnv *env, * C Specification: * ALvoid alSourceStop(ALuint source); */ -JNIEXPORT void JNICALL Java_org_lwjgl_openal_CoreAL10_alSourceStop (JNIEnv *env, jobject obj, jint source) { +JNIEXPORT void JNICALL Java_org_lwjgl_openal_CoreAL_alSourceStop (JNIEnv *env, jobject obj, jint source) { alSourceStop(source); } @@ -100,7 +100,7 @@ JNIEXPORT void JNICALL Java_org_lwjgl_openal_CoreAL10_alSourceStop (JNIEnv *env, * C Specification: * ALvoid alDeleteSources(ALsizei n,ALuint *sources); */ -JNIEXPORT void JNICALL Java_org_lwjgl_openal_CoreAL10_alDeleteSources (JNIEnv *env, jobject obj, jint n, jintArray source) { +JNIEXPORT void JNICALL Java_org_lwjgl_openal_CoreAL_alDeleteSources (JNIEnv *env, jobject obj, jint n, jintArray source) { int* array = (*env)->GetIntArrayElements(env, source, 0); alDeleteSources(n, array); (*env)->ReleaseIntArrayElements(env, source, array, 0); @@ -112,7 +112,7 @@ JNIEXPORT void JNICALL Java_org_lwjgl_openal_CoreAL10_alDeleteSources (JNIEnv *e * C Specification: * ALvoid alDeleteBuffers(ALsizei n,ALuint *buffers); */ -JNIEXPORT void JNICALL Java_org_lwjgl_openal_CoreAL10_alDeleteBuffers (JNIEnv *env, jobject obj, jint n, jintArray buffer) { +JNIEXPORT void JNICALL Java_org_lwjgl_openal_CoreAL_alDeleteBuffers (JNIEnv *env, jobject obj, jint n, jintArray buffer) { int* array = (*env)->GetIntArrayElements(env, buffer, 0); alDeleteBuffers(n, array); (*env)->ReleaseIntArrayElements(env, buffer, array, 0);