diff --git a/src/java/org/lwjgl/openal/AL.java b/src/java/org/lwjgl/openal/AL.java index 3b09299e..cd9c6949 100644 --- a/src/java/org/lwjgl/openal/AL.java +++ b/src/java/org/lwjgl/openal/AL.java @@ -31,6 +31,13 @@ */ package org.lwjgl.openal; +import java.io.File; +import java.lang.reflect.Method; +import java.util.StringTokenizer; + +import org.lwjgl.Display; +import org.lwjgl.Sys; + /** * $Id$ *
@@ -39,7 +46,7 @@ package org.lwjgl.openal; * @author Brian Matzon * @version $Revision$ */ -public abstract class AL extends CoreAL { +public abstract class AL { /** ALC instance. */ protected static ALC alc; @@ -53,7 +60,8 @@ public abstract class AL extends CoreAL { /** * String that requests a certain device or device configuration. * If null is specified, the implementation will provide an - * implementation specific default. */ + * implementation specific default. + */ protected static String deviceArguments; /** Frequency for mixing output buffer, in units of Hz. */ @@ -65,6 +73,40 @@ public abstract class AL extends CoreAL { /** Flag, indicating a synchronous context. */ protected static int contextSynchronized = ALC.ALC_FALSE; + /** Have we been created? */ + protected static boolean created; + + static { + initialize(); + } + + /** + * Static initialization + */ + private static void initialize() { + System.loadLibrary(org.lwjgl.Sys.getLibraryName()); + } + + /** + * Native method to create AL instance + * + * @param oalPaths Array of strings containing paths to search for OpenAL library + * @return true if the AL creation process succeeded + */ + protected static native void nCreate(String[] oalPaths) throws OpenALException; + + /** + * Native method the destroy the AL + */ + protected static native void nDestroy(); + + /** + * @return true if AL has been created + */ + public static boolean isCreated() { + return created; + } + /** * Creates an OpenAL instance. Using this constructor will cause OpenAL to * open the device using supplied device argument, and create a context using the context values @@ -99,10 +141,52 @@ public abstract class AL extends CoreAL { if(created) { return; } - - BaseAL.create(); - ALC.create(); + // need to pass path of possible locations of OAL to native side + String libpath = System.getProperty("java.library.path"); + String seperator = System.getProperty("path.separator"); + String libname; + String jwsLibname; + + // libname is hardcoded atm - this will change in a near future... + switch (Display.getPlatform()) { + case Display.PLATFORM_WGL: + libname = "lwjglaudio.dll"; + jwsLibname = "lwjglaudio"; + break; + case Display.PLATFORM_GLX: + libname = "libopenal.so"; + jwsLibname = "openal"; + break; + case Display.PLATFORM_AGL: + libname = "openal.dylib"; + jwsLibname = "openal"; + break; + default: + throw new OpenALException("Unknown platform"); + } + + String jwsPath = getPathFromJWS(jwsLibname); + if (jwsPath != null) { + libpath += seperator + + jwsPath.substring(0, jwsPath.lastIndexOf(File.separator)); + } + + StringTokenizer st = new StringTokenizer(libpath, seperator); + + //create needed string array + String[] oalPaths = new String[st.countTokens() + 1]; + + //build paths + for (int i = 0; i < oalPaths.length - 1; i++) { + oalPaths[i] = st.nextToken() + File.separator + libname; + } + + //add cwd path + oalPaths[oalPaths.length - 1] = libname; + nCreate(oalPaths); + + ALC.create(); device = ALC.alcOpenDevice(deviceArguments); @@ -118,6 +202,7 @@ public abstract class AL extends CoreAL { ALC.alcMakeContextCurrent(context.context); + created = true; } /** @@ -140,7 +225,36 @@ public abstract class AL extends CoreAL { contextFrequency = -1; contextRefresh = -1; contextSynchronized = ALC.ALC_FALSE; - - BaseAL.destroy(); + + created = false; + nDestroy(); } + + /** + * Tries to locate OpenAL from the JWS Library path + * This method exists because OpenAL is loaded from native code, and as such + * is exempt from JWS library loading rutines. OpenAL therefore always fails. + * We therefore invoke the protected method of the JWS classloader to see if it can + * locate it. + * + * @param libname Name of library to search for + * @return Absolute path to library if found, otherwise null + */ + private static String getPathFromJWS(String libname) { + try { + + Sys.log("JWS Classloader looking for: " + libname); + + Object o = AL.class.getClassLoader(); + Class c = o.getClass(); + Method findLibrary = + c.getMethod("findLibrary", new Class[] { String.class }); + Object[] arguments = new Object[] { libname }; + return (String) findLibrary.invoke(o, arguments); + + } catch (Exception e) { + Sys.log("Failure locating OpenAL using classloader:" + e); + } + return null; + } } \ No newline at end of file diff --git a/src/java/org/lwjgl/openal/CoreAL.java b/src/java/org/lwjgl/openal/AL10.java similarity index 80% rename from src/java/org/lwjgl/openal/CoreAL.java rename to src/java/org/lwjgl/openal/AL10.java index 1ab786ab..6f990f8b 100644 --- a/src/java/org/lwjgl/openal/CoreAL.java +++ b/src/java/org/lwjgl/openal/AL10.java @@ -43,7 +43,317 @@ import java.nio.IntBuffer; * @author Brian Matzon * @version $Revision$ */ -public abstract class CoreAL extends BaseAL implements BaseALConstants { +public final class AL10 { + + /** Bad value */ + public static final int AL_INVALID = -1; + + /** Disable value */ + public static final int AL_NONE = 0; + + /** Boolean False */ + public static final int AL_FALSE = 0; + + /** Boolean True */ + public static final int AL_TRUE = 1; + + /** + * Indicate the type of SOURCE. + * Sources can be spatialized + */ + public static final int AL_SOURCE_TYPE = 0x200; + + /** Indicate source has absolute coordinates */ + public static final int AL_SOURCE_ABSOLUTE = 0x201; + + /** Indicate Source has listener relative coordinates */ + public static final int AL_SOURCE_RELATIVE = 0x202; + + /** + * Directional source, inner cone angle, in degrees + * Range: [0-360] + * Default: 360 + */ + public static final int AL_CONE_INNER_ANGLE = 0x1001; + + /** + * Directional source, outer cone angle, in degrees. + * Range: [0-360] + * Default: 360 + */ + public static final int AL_CONE_OUTER_ANGLE = 0x1002; + + /** + * Specify the pitch to be applied, either at source, + * or on mixer results, at listener. + * Range: [0.5-2.0] + * Default: 1.0 + */ + public static final int AL_PITCH = 0x1003; + + /** + * Specify the current location in three dimensional space. + * OpenAL, like OpenGL, uses a right handed coordinate system, + * where in a frontal default view X (thumb) points right, + * Y points up (index finger), and Z points towards the + * viewer/camera (middle finger). + * To switch from a left handed coordinate system, flip the + * sign on the Z coordinate. + * Listener position is always in the world coordinate system. + */ + public static final int AL_POSITION = 0x1004; + + /** Specify the current direction as forward vector. */ + public static final int AL_DIRECTION = 0x1005; + + /** Specify the current velocity in three dimensional space. */ + public static final int AL_VELOCITY = 0x1006; + + /** + * Indicate whether source has to loop infinite. + * Type: ALboolean + * Range: [TRUE, FALSE] + * Default: FALSE + */ + public static final int AL_LOOPING = 0x1007; + + /** + * Indicate the buffer to provide sound samples. + * Type: ALuint. + * Range: any valid Buffer id. + */ + public static final int AL_BUFFER = 0x1009; + + /** + * Indicate the gain (volume amplification) applied. + * Type: ALfloat. + * Range: ]0.0- ] + * A value of 1.0 means un-attenuated/unchanged. + * Each division by 2 equals an attenuation of -6dB. + * Each multiplicaton with 2 equals an amplification of +6dB. + * A value of 0.0 is meaningless with respect to a logarithmic + * scale; it is interpreted as zero volume - the channel + * is effectively disabled. + */ + public static final int AL_GAIN = 0x100A; + + /** + * Indicate minimum source attenuation. + * Type: ALfloat + * Range: [0.0 - 1.0] + */ + public static final int AL_MIN_GAIN = 0x100D; + + /** + * Indicate maximum source attenuation. + * Type: ALfloat + * Range: [0.0 - 1.0] + */ + public static final int AL_MAX_GAIN = 0x100E; + + /** + * Specify the current orientation. + * Type: ALfv6 (at/up) + * Range: N/A + */ + public static final int AL_ORIENTATION = 0x100F; + + /* byte offset into source (in canon format). -1 if source + * is not playing. Don't set this, get this. + * + * Type: ALfloat + * Range: [0.0 - ] + * Default: 1.0 + */ + public static final int AL_REFERENCE_DISTANCE = 0x1020; + + /** + * Indicate the rolloff factor for the source. + * Type: ALfloat + * Range: [0.0 - ] + * Default: 1.0 + */ + public static final int AL_ROLLOFF_FACTOR = 0x1021; + + /** + * Indicate the gain (volume amplification) applied. + * Type: ALfloat. + * Range: ]0.0- ] + * A value of 1.0 means un-attenuated/unchanged. + * Each division by 2 equals an attenuation of -6dB. + * Each multiplicaton with 2 equals an amplification of +6dB. + * A value of 0.0 is meaningless with respect to a logarithmic + * scale; it is interpreted as zero volume - the channel + * is effectively disabled. + */ + public static final int AL_CONE_OUTER_GAIN = 0x1022; + + /** + * Specify the maximum distance. + * Type: ALfloat + * Range: [0.0 - ] + */ + public static final int AL_MAX_DISTANCE = 0x1023; + + /** + * Specify the channel mask. (Creative) + * Type: ALuint + * Range: [0 - 255] + */ + public static final int AL_CHANNEL_MASK = 0x3000; + + /** Source state information */ + public static final int AL_SOURCE_STATE = 0x1010; + + /** Source state information */ + public static final int AL_INITIAL = 0x1011; + + /** Source state information */ + public static final int AL_PLAYING = 0x1012; + + /** Source state information */ + public static final int AL_PAUSED = 0x1013; + + /** Source state information */ + public static final int AL_STOPPED = 0x1014; + + /** Buffer Queue params */ + public static final int AL_BUFFERS_QUEUED = 0x1015; + + /** Buffer Queue params */ + public static final int AL_BUFFERS_PROCESSED = 0x1016; + + /** Sound buffers: format specifier. */ + public static final int AL_FORMAT_MONO8 = 0x1100; + + /** Sound buffers: format specifier. */ + public static final int AL_FORMAT_MONO16 = 0x1101; + + /** Sound buffers: format specifier. */ + public static final int AL_FORMAT_STEREO8 = 0x1102; + + /** Sound buffers: format specifier. */ + public static final int AL_FORMAT_STEREO16 = 0x1103; + + /** Ogg Vorbis format specifier. */ + public static final int AL_FORMAT_VORBIS_EXT = 0x10003; + + /** + * Sound buffers: frequency, in units of Hertz [Hz]. + * This is the number of samples per second. Half of the + * sample frequency marks the maximum significant + * frequency component. + */ + public static final int AL_FREQUENCY = 0x2001; + + /** + * Sound buffers: frequency, in units of Hertz [Hz]. + * This is the number of samples per second. Half of the + * sample frequency marks the maximum significant + * frequency component. + */ + public static final int AL_BITS = 0x2002; + + /** + * Sound buffers: frequency, in units of Hertz [Hz]. + * This is the number of samples per second. Half of the + * sample frequency marks the maximum significant + * frequency component. + */ + public static final int AL_CHANNELS = 0x2003; + + /** + * Sound buffers: frequency, in units of Hertz [Hz]. + * This is the number of samples per second. Half of the + * sample frequency marks the maximum significant + * frequency component. + */ + public static final int AL_SIZE = 0x2004; + + /** + * Sound buffers: frequency, in units of Hertz [Hz]. + * This is the number of samples per second. Half of the + * sample frequency marks the maximum significant + * frequency component. + */ + public static final int AL_DATA = 0x2005; + + /** + * Buffer state. + * + * Not supported for public use (yet). + */ + public static final int AL_UNUSED = 0x2010; + + /** + * Buffer state. + * + * Not supported for public use (yet). + */ + public static final int AL_PENDING = 0x2011; + + /** + * Buffer state. + * + * Not supported for public use (yet). + */ + public static final int AL_PROCESSED = 0x2012; + + /** Errors: No Error. */ + public static final int AL_NO_ERROR = AL_FALSE; + + /** Illegal name passed as an argument to an AL call. */ + public static final int AL_INVALID_NAME = 0xA001; + + /** Illegal enum passed as an argument to an AL call. */ + public static final int AL_INVALID_ENUM = 0xA002; + + /** + * Illegal value passed as an argument to an AL call. + * Applies to parameter values, but not to enumerations. + */ + public static final int AL_INVALID_VALUE = 0xA003; + + /** + * A function was called at inappropriate time, + * or in an inappropriate way, causing an illegal state. + * This can be an incompatible ALenum, object ID, + * and/or function. + */ + public static final int AL_INVALID_OPERATION = 0xA004; + + /** + * A function could not be completed, + * because there is not enough memory available. + */ + public static final int AL_OUT_OF_MEMORY = 0xA005; + + /** Context strings: Vendor */ + public static final int AL_VENDOR = 0xB001; + + /** Context strings: Version */ + public static final int AL_VERSION = 0xB002; + + /** Context strings: Renderer */ + public static final int AL_RENDERER = 0xB003; + + /** Context strings: Extensions */ + public static final int AL_EXTENSIONS = 0xB004; + + /** Doppler scale. Default 1.0 */ + public static final int AL_DOPPLER_FACTOR = 0xC000; + + /** Doppler velocity. Default 1.0 */ + public static final int AL_DOPPLER_VELOCITY = 0xC001; + + /** Distance model. Default INVERSE_DISTANCE_CLAMPED */ + public static final int AL_DISTANCE_MODEL = 0xD000; + + /** Distance model */ + public static final int AL_INVERSE_DISTANCE = 0xD001; + + /** Distance model */ + public static final int AL_INVERSE_DISTANCE_CLAMPED = 0xD002; /** * The application can temporarily disable certain AL capabilities on a per Context diff --git a/src/java/org/lwjgl/openal/ALConstants.java b/src/java/org/lwjgl/openal/ALConstants.java deleted file mode 100644 index 75ca670c..00000000 --- a/src/java/org/lwjgl/openal/ALConstants.java +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Copyright (c) 2002 Lightweight Java Game Library Project - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are - * met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * * Neither the name of 'Light Weight Java Game Library' nor the names of - * its contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED - * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package org.lwjgl.openal; - -/** - * $Id$ - *
- * This class contains all OpenAL constants, including extensions. - * - * @author Brian Matzon - * @version $Revision$ - */ -public interface ALConstants extends BaseALConstants { -} \ No newline at end of file diff --git a/src/java/org/lwjgl/openal/BaseAL.java b/src/java/org/lwjgl/openal/BaseAL.java deleted file mode 100644 index e0806ab1..00000000 --- a/src/java/org/lwjgl/openal/BaseAL.java +++ /dev/null @@ -1,191 +0,0 @@ -/* - * Copyright (c) 2002 Lightweight Java Game Library Project - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are - * met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * * Neither the name of 'Light Weight Java Game Library' nor the names of - * its contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED - * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package org.lwjgl.openal; - -import java.io.File; -import java.lang.reflect.Method; -import java.util.StringTokenizer; - -import org.lwjgl.Display; -import org.lwjgl.Sys; - -/** - * $Id$ - *
- * The base AL functionality (no actual AL methods). - * - * This has been provided as a base class that we can use for either the - * full AL 1.0 specification or as a cut-down OpenAL embedded spec. (aka - * a mini-driver). - * - * @author Brian Matzon - * @version $Revision$ - */ -public abstract class BaseAL { - /** Have we been created? */ - protected static boolean created; - - static { - initialize(); - } - - /** - * Override to provide any initialization code after creation. - */ - protected static void init() throws OpenALException { - } - - /** - * Static initialization - */ - private static void initialize() { - System.loadLibrary(org.lwjgl.Sys.getLibraryName()); - } - - /** - * Creates the AL instance - * - * @throws Exception if a failiure occured in the AL creation process - */ - public static void create() throws OpenALException { - if (created) { - return; - } - - // need to pass path of possible locations of OAL to native side - String libpath = System.getProperty("java.library.path"); - String seperator = System.getProperty("path.separator"); - String libname; - String jwsLibname; - - // libname is hardcoded atm - this will change in a near future... - switch (Display.getPlatform()) { - case Display.PLATFORM_WGL: - libname = "lwjglaudio.dll"; - jwsLibname = "lwjglaudio"; - break; - case Display.PLATFORM_GLX: - libname = "libopenal.so"; - jwsLibname = "openal"; - break; - case Display.PLATFORM_AGL: - libname = "openal.dylib"; - jwsLibname = "openal"; - break; - default: - throw new OpenALException("Unknown platform"); - } - - String jwsPath = getPathFromJWS(jwsLibname); - if (jwsPath != null) { - libpath += seperator - + jwsPath.substring(0, jwsPath.lastIndexOf(File.separator)); - } - - StringTokenizer st = new StringTokenizer(libpath, seperator); - - //create needed string array - String[] oalPaths = new String[st.countTokens() + 1]; - - //build paths - for (int i = 0; i < oalPaths.length - 1; i++) { - oalPaths[i] = st.nextToken() + File.separator + libname; - } - - //add cwd path - oalPaths[oalPaths.length - 1] = libname; - nCreate(oalPaths); - - init(); - created = true; - } - - /** - * Tries to locate OpenAL from the JWS Library path - * This method exists because OpenAL is loaded from native code, and as such - * is exempt from JWS library loading rutines. OpenAL therefore always fails. - * We therefore invoke the protected method of the JWS classloader to see if it can - * locate it. - * - * @param libname Name of library to search for - * @return Absolute path to library if found, otherwise null - */ - private static String getPathFromJWS(String libname) { - try { - - Sys.log("JWS Classloader looking for: " + libname); - - Object o = BaseAL.class.getClassLoader(); - Class c = o.getClass(); - Method findLibrary = - c.getMethod("findLibrary", new Class[] { String.class }); - Object[] arguments = new Object[] { libname }; - return (String) findLibrary.invoke(o, arguments); - - } catch (Exception e) { - Sys.log("Failure locating OpenAL using classloader:" + e); - } - return null; - } - - /** - * Native method to create AL instance - * - * @param oalPaths Array of strings containing paths to search for OpenAL library - * @return true if the AL creation process succeeded - */ - protected static native void nCreate(String[] oalPaths) throws OpenALException; - - /** - * Calls whatever destruction rutines that are needed - */ - public static void destroy() { - if (!created) { - return; - } - created = false; - nDestroy(); - } - - /** - * Native method the destroy the AL - */ - protected static native void nDestroy(); - - - /** - * @return true if AL has been created - */ - public static boolean isCreated() { - return created; - } -} diff --git a/src/java/org/lwjgl/openal/BaseALConstants.java b/src/java/org/lwjgl/openal/BaseALConstants.java deleted file mode 100644 index 1e23c4a4..00000000 --- a/src/java/org/lwjgl/openal/BaseALConstants.java +++ /dev/null @@ -1,353 +0,0 @@ -/* - * Copyright (c) 2002 Lightweight Java Game Library Project - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are - * met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * * Neither the name of 'Light Weight Java Game Library' nor the names of - * its contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED - * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package org.lwjgl.openal; - -/** - * $Id$ - *
- * This class implements all basic OpenAL constants. - * - * @author Brian Matzon - * @version $Revision$ - */ -public interface BaseALConstants { - - /** Bad value */ - public static final int AL_INVALID = -1; - - /** Disable value */ - public static final int AL_NONE = 0; - - /** Boolean False */ - public static final int AL_FALSE = 0; - - /** Boolean True */ - public static final int AL_TRUE = 1; - - /** - * Indicate the type of SOURCE. - * Sources can be spatialized - */ - public static final int AL_SOURCE_TYPE = 0x200; - - /** Indicate source has absolute coordinates */ - public static final int AL_SOURCE_ABSOLUTE = 0x201; - - /** Indicate Source has listener relative coordinates */ - public static final int AL_SOURCE_RELATIVE = 0x202; - - /** - * Directional source, inner cone angle, in degrees - * Range: [0-360] - * Default: 360 - */ - public static final int AL_CONE_INNER_ANGLE = 0x1001; - - /** - * Directional source, outer cone angle, in degrees. - * Range: [0-360] - * Default: 360 - */ - public static final int AL_CONE_OUTER_ANGLE = 0x1002; - - /** - * Specify the pitch to be applied, either at source, - * or on mixer results, at listener. - * Range: [0.5-2.0] - * Default: 1.0 - */ - public static final int AL_PITCH = 0x1003; - - /** - * Specify the current location in three dimensional space. - * OpenAL, like OpenGL, uses a right handed coordinate system, - * where in a frontal default view X (thumb) points right, - * Y points up (index finger), and Z points towards the - * viewer/camera (middle finger). - * To switch from a left handed coordinate system, flip the - * sign on the Z coordinate. - * Listener position is always in the world coordinate system. - */ - public static final int AL_POSITION = 0x1004; - - /** Specify the current direction as forward vector. */ - public static final int AL_DIRECTION = 0x1005; - - /** Specify the current velocity in three dimensional space. */ - public static final int AL_VELOCITY = 0x1006; - - /** - * Indicate whether source has to loop infinite. - * Type: ALboolean - * Range: [TRUE, FALSE] - * Default: FALSE - */ - public static final int AL_LOOPING = 0x1007; - - /** - * Indicate the buffer to provide sound samples. - * Type: ALuint. - * Range: any valid Buffer id. - */ - public static final int AL_BUFFER = 0x1009; - - /** - * Indicate the gain (volume amplification) applied. - * Type: ALfloat. - * Range: ]0.0- ] - * A value of 1.0 means un-attenuated/unchanged. - * Each division by 2 equals an attenuation of -6dB. - * Each multiplicaton with 2 equals an amplification of +6dB. - * A value of 0.0 is meaningless with respect to a logarithmic - * scale; it is interpreted as zero volume - the channel - * is effectively disabled. - */ - public static final int AL_GAIN = 0x100A; - - /** - * Indicate minimum source attenuation. - * Type: ALfloat - * Range: [0.0 - 1.0] - */ - public static final int AL_MIN_GAIN = 0x100D; - - /** - * Indicate maximum source attenuation. - * Type: ALfloat - * Range: [0.0 - 1.0] - */ - public static final int AL_MAX_GAIN = 0x100E; - - /** - * Specify the current orientation. - * Type: ALfv6 (at/up) - * Range: N/A - */ - public static final int AL_ORIENTATION = 0x100F; - - /* byte offset into source (in canon format). -1 if source - * is not playing. Don't set this, get this. - * - * Type: ALfloat - * Range: [0.0 - ] - * Default: 1.0 - */ - public static final int AL_REFERENCE_DISTANCE = 0x1020; - - /** - * Indicate the rolloff factor for the source. - * Type: ALfloat - * Range: [0.0 - ] - * Default: 1.0 - */ - public static final int AL_ROLLOFF_FACTOR = 0x1021; - - /** - * Indicate the gain (volume amplification) applied. - * Type: ALfloat. - * Range: ]0.0- ] - * A value of 1.0 means un-attenuated/unchanged. - * Each division by 2 equals an attenuation of -6dB. - * Each multiplicaton with 2 equals an amplification of +6dB. - * A value of 0.0 is meaningless with respect to a logarithmic - * scale; it is interpreted as zero volume - the channel - * is effectively disabled. - */ - public static final int AL_CONE_OUTER_GAIN = 0x1022; - - /** - * Specify the maximum distance. - * Type: ALfloat - * Range: [0.0 - ] - */ - public static final int AL_MAX_DISTANCE = 0x1023; - - /** - * Specify the channel mask. (Creative) - * Type: ALuint - * Range: [0 - 255] - */ - public static final int AL_CHANNEL_MASK = 0x3000; - - /** Source state information */ - public static final int AL_SOURCE_STATE = 0x1010; - - /** Source state information */ - public static final int AL_INITIAL = 0x1011; - - /** Source state information */ - public static final int AL_PLAYING = 0x1012; - - /** Source state information */ - public static final int AL_PAUSED = 0x1013; - - /** Source state information */ - public static final int AL_STOPPED = 0x1014; - - /** Buffer Queue params */ - public static final int AL_BUFFERS_QUEUED = 0x1015; - - /** Buffer Queue params */ - public static final int AL_BUFFERS_PROCESSED = 0x1016; - - /** Sound buffers: format specifier. */ - public static final int AL_FORMAT_MONO8 = 0x1100; - - /** Sound buffers: format specifier. */ - public static final int AL_FORMAT_MONO16 = 0x1101; - - /** Sound buffers: format specifier. */ - public static final int AL_FORMAT_STEREO8 = 0x1102; - - /** Sound buffers: format specifier. */ - public static final int AL_FORMAT_STEREO16 = 0x1103; - - /** Ogg Vorbis format specifier. */ - public static final int AL_FORMAT_VORBIS_EXT = 0x1110; - - /** - * Sound buffers: frequency, in units of Hertz [Hz]. - * This is the number of samples per second. Half of the - * sample frequency marks the maximum significant - * frequency component. - */ - public static final int AL_FREQUENCY = 0x2001; - - /** - * Sound buffers: frequency, in units of Hertz [Hz]. - * This is the number of samples per second. Half of the - * sample frequency marks the maximum significant - * frequency component. - */ - public static final int AL_BITS = 0x2002; - - /** - * Sound buffers: frequency, in units of Hertz [Hz]. - * This is the number of samples per second. Half of the - * sample frequency marks the maximum significant - * frequency component. - */ - public static final int AL_CHANNELS = 0x2003; - - /** - * Sound buffers: frequency, in units of Hertz [Hz]. - * This is the number of samples per second. Half of the - * sample frequency marks the maximum significant - * frequency component. - */ - public static final int AL_SIZE = 0x2004; - - /** - * Sound buffers: frequency, in units of Hertz [Hz]. - * This is the number of samples per second. Half of the - * sample frequency marks the maximum significant - * frequency component. - */ - public static final int AL_DATA = 0x2005; - - /** - * Buffer state. - * - * Not supported for public use (yet). - */ - public static final int AL_UNUSED = 0x2010; - - /** - * Buffer state. - * - * Not supported for public use (yet). - */ - public static final int AL_PENDING = 0x2011; - - /** - * Buffer state. - * - * Not supported for public use (yet). - */ - public static final int AL_PROCESSED = 0x2012; - - /** Errors: No Error. */ - public static final int AL_NO_ERROR = AL_FALSE; - - /** Illegal name passed as an argument to an AL call. */ - public static final int AL_INVALID_NAME = 0xA001; - - /** Illegal enum passed as an argument to an AL call. */ - public static final int AL_INVALID_ENUM = 0xA002; - - /** - * Illegal value passed as an argument to an AL call. - * Applies to parameter values, but not to enumerations. - */ - public static final int AL_INVALID_VALUE = 0xA003; - - /** - * A function was called at inappropriate time, - * or in an inappropriate way, causing an illegal state. - * This can be an incompatible ALenum, object ID, - * and/or function. - */ - public static final int AL_INVALID_OPERATION = 0xA004; - - /** - * A function could not be completed, - * because there is not enough memory available. - */ - public static final int AL_OUT_OF_MEMORY = 0xA005; - - /** Context strings: Vendor */ - public static final int AL_VENDOR = 0xB001; - - /** Context strings: Version */ - public static final int AL_VERSION = 0xB002; - - /** Context strings: Renderer */ - public static final int AL_RENDERER = 0xB003; - - /** Context strings: Extensions */ - public static final int AL_EXTENSIONS = 0xB004; - - /** Doppler scale. Default 1.0 */ - public static final int AL_DOPPLER_FACTOR = 0xC000; - - /** Doppler velocity. Default 1.0 */ - public static final int AL_DOPPLER_VELOCITY = 0xC001; - - /** Distance model. Default INVERSE_DISTANCE_CLAMPED */ - public static final int AL_DISTANCE_MODEL = 0xD000; - - /** Distance model */ - public static final int AL_INVERSE_DISTANCE = 0xD001; - - /** Distance model */ - public static final int AL_INVERSE_DISTANCE_CLAMPED = 0xD002; -} \ No newline at end of file diff --git a/src/java/org/lwjgl/openal/eax/BaseEAX.java b/src/java/org/lwjgl/openal/eax/BaseEAX.java deleted file mode 100644 index d94426a7..00000000 --- a/src/java/org/lwjgl/openal/eax/BaseEAX.java +++ /dev/null @@ -1,108 +0,0 @@ -/* - * Copyright (c) 2002 Lightweight Java Game Library Project - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are - * met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * * Neither the name of 'Light Weight Java Game Library' nor the names of - * its contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED - * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package org.lwjgl.openal.eax; - -/** - * $Id$ - * - * The base OpenAL EAX functionality. - * - * This has been provided as a base class that we can use for either the - * full EAX specification or as a cut-down OpenAL EAX embedded spec. (aka - * a mini-driver). - * - * @author Brian Matzon - * @version $Revision$ - */ -public abstract class BaseEAX { - - /** Has the EAX object been created? */ - protected static boolean created; - - static { - initialize(); - } - - /** - * Static initialization - */ - private static void initialize() { - System.loadLibrary(org.lwjgl.Sys.getLibraryName()); - } - - /** - * Loads the EAX functions - * - * @throws Exception if the EAX extensions couldn't be loaded - */ - public static void create() throws Exception { - if (created) { - return; - } - - if (!nCreate()) { - throw new Exception("EAX instance could not be created."); - } - CoreEAX.init(); - created = true; - } - - /** - * Native method to create EAX instance - * - * @return true if the EAX extensions could be found - */ - protected static native boolean nCreate(); - - /** - * "Destroy" the EAX object - */ - public static void destroy() { - if (!created) { - return; - } - created = false; - nDestroy(); - } - - /** - * Native method the destroy the EAX - */ - protected static native void nDestroy(); - - /** - * @return true if EAX has been created - */ - public static boolean isCreated() { - return created; - } -} \ No newline at end of file diff --git a/src/java/org/lwjgl/openal/eax/BaseEAXConstants.java b/src/java/org/lwjgl/openal/eax/BaseEAXConstants.java deleted file mode 100644 index ffa58a4a..00000000 --- a/src/java/org/lwjgl/openal/eax/BaseEAXConstants.java +++ /dev/null @@ -1,110 +0,0 @@ -/* - * Copyright (c) 2002 Lightweight Java Game Library Project - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are - * met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * * Neither the name of 'Light Weight Java Game Library' nor the names of - * its contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED - * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package org.lwjgl.openal.eax; - -/** - * $Id$ - * - * This class implements the basic EAX extension constants. - * - * @author Brian Matzon - * @version $Revision$ - */ -public interface BaseEAXConstants { - public static final int EAX_ENVIRONMENT_GENERIC = 0; - public static final int EAX_ENVIRONMENT_PADDEDCELL = 1; - public static final int EAX_ENVIRONMENT_ROOM = 2; - public static final int EAX_ENVIRONMENT_BATHROOM = 3; - public static final int EAX_ENVIRONMENT_LIVINGROOM = 4; - public static final int EAX_ENVIRONMENT_STONEROOM = 5; - public static final int EAX_ENVIRONMENT_AUDITORIUM = 6; - public static final int EAX_ENVIRONMENT_CONCERTHALL = 7; - public static final int EAX_ENVIRONMENT_CAVE = 8; - public static final int EAX_ENVIRONMENT_ARENA = 9; - public static final int EAX_ENVIRONMENT_HANGAR = 10; - public static final int EAX_ENVIRONMENT_CARPETEDHALLWAY = 11; - public static final int EAX_ENVIRONMENT_HALLWAY = 12; - public static final int EAX_ENVIRONMENT_STONECORRIDOR = 13; - public static final int EAX_ENVIRONMENT_ALLEY = 14; - public static final int EAX_ENVIRONMENT_FOREST = 15; - public static final int EAX_ENVIRONMENT_CITY = 16; - public static final int EAX_ENVIRONMENT_MOUNTAINS = 17; - public static final int EAX_ENVIRONMENT_QUARRY = 18; - public static final int EAX_ENVIRONMENT_PLAIN = 19; - public static final int EAX_ENVIRONMENT_PARKINGLOT = 20; - public static final int EAX_ENVIRONMENT_SEWERPIPE = 21; - public static final int EAX_ENVIRONMENT_UNDERWATER = 22; - public static final int EAX_ENVIRONMENT_DRUGGED = 23; - public static final int EAX_ENVIRONMENT_DIZZY = 24; - public static final int EAX_ENVIRONMENT_PSYCHOTIC = 25; - public static final int EAX_ENVIRONMENT_COUNT = 26; - - // Single window material preset - public static final int EAX_MATERIAL_SINGLEWINDOW = -2800; - public static final float EAX_MATERIAL_SINGLEWINDOWLF = 0.71f; - public static final float EAX_MATERIAL_SINGLEWINDOWROOMRATIO = 0.43f; - - // Double window material preset - public static final int EAX_MATERIAL_DOUBLEWINDOW = -5000; - public static final float EAX_MATERIAL_DOUBLEWINDOWHF = 0.40f; - public static final float EAX_MATERIAL_DOUBLEWINDOWROOMRATIO = 0.24f; - - // Thin door material preset - public static final int EAX_MATERIAL_THINDOOR = -1800; - public static final float EAX_MATERIAL_THINDOORLF = 0.66f; - public static final float EAX_MATERIAL_THINDOORROOMRATIO = 0.66f; - - // Thick door material preset - public static final int EAX_MATERIAL_THICKDOOR = -4400; - public static final float EAX_MATERIAL_THICKDOORLF = 0.64f; - public static final float EAX_MATERIAL_THICKDOORROOMRTATION = 0.27f; - - // Wood wall material preset - public static final int EAX_MATERIAL_WOODWALL = -4000; - public static final float EAX_MATERIAL_WOODWALLLF = 0.50f; - public static final float EAX_MATERIAL_WOODWALLROOMRATIO = 0.30f; - - // Brick wall material preset - public static final int EAX_MATERIAL_BRICKWALL = -5000; - public static final float EAX_MATERIAL_BRICKWALLLF = 0.60f; - public static final float EAX_MATERIAL_BRICKWALLROOMRATIO = 0.24f; - - // Stone wall material preset - public static final int EAX_MATERIAL_STONEWALL = -6000; - public static final float EAX_MATERIAL_STONEWALLLF = 0.68f; - public static final float EAX_MATERIAL_STONEWALLROOMRATIO = 0.20f; - - // Curtain material preset - public static final int EAX_MATERIAL_CURTAIN = -1200; - public static final float EAX_MATERIAL_CURTAINLF = 0.15f; - public static final float EAX_MATERIAL_CURTAINROOMRATIO = 1.00f; -} \ No newline at end of file diff --git a/src/java/org/lwjgl/openal/eax/CoreEAX.java b/src/java/org/lwjgl/openal/eax/CoreEAX.java deleted file mode 100644 index 53517fbd..00000000 --- a/src/java/org/lwjgl/openal/eax/CoreEAX.java +++ /dev/null @@ -1,93 +0,0 @@ -/* - * Copyright (c) 2002 Lightweight Java Game Library Project - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are - * met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * * Neither the name of 'Light Weight Java Game Library' nor the names of - * its contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED - * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package org.lwjgl.openal.eax; - -import java.nio.Buffer; - -/** - * $Id$ - * - * This is the OpenAL EAX class. It extends the latest core. - * - * @author Brian Matzon - * @version $Revision$ - */ -public class CoreEAX extends BaseEAX implements BaseEAXConstants { - - /** GUID for buffer */ - public static final int BUFFER_GUID = 1; - - /** GUID for listener */ - public static final int LISTENER_GUID = 2; - - /** - * Load extensions - */ - protected static void init() { - determineAvailableExtensions(); - } - - /** - * Determines available EAX extensions - */ - protected static native void determineAvailableExtensions(); - - /** - * Retrieves an EAX Value - * - * @param propertySetID adress to the property set GUID of the object being queried (a listener or a source) - * @param property property being queried - * @param source the source to be queried - * @param data Buffer to write value to - * @param size size of area being written to - * @return OpenAL Error code - */ - public static int eaxGet(int propertySetID, int property, int source, Buffer data, int size) { - return neaxGet(propertySetID, property, source, data, data.position(), size); - } - private static native int neaxGet(int propertySetID, int property, int source, Buffer data, int position, int size); - - /** - * Sets an EAX Value - * - * @param propertySetID adress to the property set GUID of the object being queried (a listener or a source) - * @param property property being queried - * @param source the source to be queried - * @param data Buffer to write value to - * @param size size of area being written to - * @return OpenAL Error code - */ - public static int eaxSet(int propertySetID, int property, int source, Buffer data, int size) { - return neaxSet(propertySetID, property, source, data, data.position(), size); - } - private static native int neaxSet(int propertySetID, int property, int source, Buffer data, int position, int size); -} \ No newline at end of file diff --git a/src/java/org/lwjgl/openal/eax/EAX.java b/src/java/org/lwjgl/openal/eax/EAX.java index 7a588f0b..91d6ba5c 100644 --- a/src/java/org/lwjgl/openal/eax/EAX.java +++ b/src/java/org/lwjgl/openal/eax/EAX.java @@ -39,5 +39,66 @@ * @author Brian Matzon * @version $Revision$ */ -public class EAX extends CoreEAX { +public class EAX { + + /** Has the EAX object been created? */ + protected static boolean created; + + static { + initialize(); + } + + /** + * Static initialization + */ + private static void initialize() { + System.loadLibrary(org.lwjgl.Sys.getLibraryName()); + } + + /** + * Loads the EAX functions + * + * @throws Exception if the EAX extensions couldn't be loaded + */ + public static void create() throws Exception { + if (created) { + return; + } + + if (!nCreate()) { + throw new Exception("EAX instance could not be created."); + } + EAX20.init(); + created = true; + } + + /** + * Native method to create EAX instance + * + * @return true if the EAX extensions could be found + */ + protected static native boolean nCreate(); + + /** + * "Destroy" the EAX object + */ + public static void destroy() { + if (!created) { + return; + } + created = false; + nDestroy(); + } + + /** + * Native method the destroy the EAX + */ + protected static native void nDestroy(); + + /** + * @return true if EAX has been created + */ + public static boolean isCreated() { + return created; + } } \ No newline at end of file diff --git a/src/java/org/lwjgl/openal/eax/EAX20.java b/src/java/org/lwjgl/openal/eax/EAX20.java new file mode 100644 index 00000000..c4a43182 --- /dev/null +++ b/src/java/org/lwjgl/openal/eax/EAX20.java @@ -0,0 +1,161 @@ +/* + * Copyright (c) 2002 Lightweight Java Game Library Project + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * * Neither the name of 'Light Weight Java Game Library' nor the names of + * its contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED + * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ +package org.lwjgl.openal.eax; + +import java.nio.Buffer; + +/** + * $Id$ + * + * This is the OpenAL EAX class. It extends the latest core. + * + * @author Brian Matzon + * @version $Revision$ + */ +public class EAX20 { + + /** GUID for buffer */ + public static final int BUFFER_GUID = 1; + + /** GUID for listener */ + public static final int LISTENER_GUID = 2; + + public static final int EAX_ENVIRONMENT_GENERIC = 0; + public static final int EAX_ENVIRONMENT_PADDEDCELL = 1; + public static final int EAX_ENVIRONMENT_ROOM = 2; + public static final int EAX_ENVIRONMENT_BATHROOM = 3; + public static final int EAX_ENVIRONMENT_LIVINGROOM = 4; + public static final int EAX_ENVIRONMENT_STONEROOM = 5; + public static final int EAX_ENVIRONMENT_AUDITORIUM = 6; + public static final int EAX_ENVIRONMENT_CONCERTHALL = 7; + public static final int EAX_ENVIRONMENT_CAVE = 8; + public static final int EAX_ENVIRONMENT_ARENA = 9; + public static final int EAX_ENVIRONMENT_HANGAR = 10; + public static final int EAX_ENVIRONMENT_CARPETEDHALLWAY = 11; + public static final int EAX_ENVIRONMENT_HALLWAY = 12; + public static final int EAX_ENVIRONMENT_STONECORRIDOR = 13; + public static final int EAX_ENVIRONMENT_ALLEY = 14; + public static final int EAX_ENVIRONMENT_FOREST = 15; + public static final int EAX_ENVIRONMENT_CITY = 16; + public static final int EAX_ENVIRONMENT_MOUNTAINS = 17; + public static final int EAX_ENVIRONMENT_QUARRY = 18; + public static final int EAX_ENVIRONMENT_PLAIN = 19; + public static final int EAX_ENVIRONMENT_PARKINGLOT = 20; + public static final int EAX_ENVIRONMENT_SEWERPIPE = 21; + public static final int EAX_ENVIRONMENT_UNDERWATER = 22; + public static final int EAX_ENVIRONMENT_DRUGGED = 23; + public static final int EAX_ENVIRONMENT_DIZZY = 24; + public static final int EAX_ENVIRONMENT_PSYCHOTIC = 25; + public static final int EAX_ENVIRONMENT_COUNT = 26; + + // Single window material preset + public static final int EAX_MATERIAL_SINGLEWINDOW = -2800; + public static final float EAX_MATERIAL_SINGLEWINDOWLF = 0.71f; + public static final float EAX_MATERIAL_SINGLEWINDOWROOMRATIO = 0.43f; + + // Double window material preset + public static final int EAX_MATERIAL_DOUBLEWINDOW = -5000; + public static final float EAX_MATERIAL_DOUBLEWINDOWHF = 0.40f; + public static final float EAX_MATERIAL_DOUBLEWINDOWROOMRATIO = 0.24f; + + // Thin door material preset + public static final int EAX_MATERIAL_THINDOOR = -1800; + public static final float EAX_MATERIAL_THINDOORLF = 0.66f; + public static final float EAX_MATERIAL_THINDOORROOMRATIO = 0.66f; + + // Thick door material preset + public static final int EAX_MATERIAL_THICKDOOR = -4400; + public static final float EAX_MATERIAL_THICKDOORLF = 0.64f; + public static final float EAX_MATERIAL_THICKDOORROOMRTATION = 0.27f; + + // Wood wall material preset + public static final int EAX_MATERIAL_WOODWALL = -4000; + public static final float EAX_MATERIAL_WOODWALLLF = 0.50f; + public static final float EAX_MATERIAL_WOODWALLROOMRATIO = 0.30f; + + // Brick wall material preset + public static final int EAX_MATERIAL_BRICKWALL = -5000; + public static final float EAX_MATERIAL_BRICKWALLLF = 0.60f; + public static final float EAX_MATERIAL_BRICKWALLROOMRATIO = 0.24f; + + // Stone wall material preset + public static final int EAX_MATERIAL_STONEWALL = -6000; + public static final float EAX_MATERIAL_STONEWALLLF = 0.68f; + public static final float EAX_MATERIAL_STONEWALLROOMRATIO = 0.20f; + + // Curtain material preset + public static final int EAX_MATERIAL_CURTAIN = -1200; + public static final float EAX_MATERIAL_CURTAINLF = 0.15f; + public static final float EAX_MATERIAL_CURTAINROOMRATIO = 1.00f; + + /** + * Load extensions + */ + protected static void init() { + determineAvailableExtensions(); + } + + /** + * Determines available EAX extensions + */ + protected static native void determineAvailableExtensions(); + + /** + * Retrieves an EAX Value + * + * @param propertySetID adress to the property set GUID of the object being queried (a listener or a source) + * @param property property being queried + * @param source the source to be queried + * @param data Buffer to write value to + * @param size size of area being written to + * @return OpenAL Error code + */ + public static int eaxGet(int propertySetID, int property, int source, Buffer data, int size) { + return neaxGet(propertySetID, property, source, data, data.position(), size); + } + private static native int neaxGet(int propertySetID, int property, int source, Buffer data, int position, int size); + + /** + * Sets an EAX Value + * + * @param propertySetID adress to the property set GUID of the object being queried (a listener or a source) + * @param property property being queried + * @param source the source to be queried + * @param data Buffer to write value to + * @param size size of area being written to + * @return OpenAL Error code + */ + public static int eaxSet(int propertySetID, int property, int source, Buffer data, int size) { + return neaxSet(propertySetID, property, source, data, data.position(), size); + } + private static native int neaxSet(int propertySetID, int property, int source, Buffer data, int position, int size); +} \ No newline at end of file diff --git a/src/java/org/lwjgl/openal/eax/EAXBufferProperties.java b/src/java/org/lwjgl/openal/eax/EAXBufferProperties.java index ffa5a4b0..e9f1c9fb 100644 --- a/src/java/org/lwjgl/openal/eax/EAXBufferProperties.java +++ b/src/java/org/lwjgl/openal/eax/EAXBufferProperties.java @@ -229,8 +229,8 @@ public class EAXBufferProperties { * Loads current EAX values from current source */ public void loadEAXValues() { - EAX.eaxGet( - CoreEAX.BUFFER_GUID, + EAX20.eaxGet( + EAX20.BUFFER_GUID, EAXBUFFER_ALLPARAMETERS, currentSource, eaxBufferProperties, @@ -271,8 +271,8 @@ public class EAXBufferProperties { */ public void commit() { // call eaxSet with Buffer guid, setting all parameters - EAX.eaxSet( - CoreEAX.BUFFER_GUID, EAXBUFFER_ALLPARAMETERS, + EAX20.eaxSet( + EAX20.BUFFER_GUID, EAXBUFFER_ALLPARAMETERS, currentSource, eaxBufferProperties, EAXBUFFERPROPERTIES_SIZE); } diff --git a/src/java/org/lwjgl/openal/eax/EAXListenerProperties.java b/src/java/org/lwjgl/openal/eax/EAXListenerProperties.java index e9f8621e..f825c1ae 100644 --- a/src/java/org/lwjgl/openal/eax/EAXListenerProperties.java +++ b/src/java/org/lwjgl/openal/eax/EAXListenerProperties.java @@ -184,9 +184,9 @@ public class EAXListenerProperties { public static final int EAXLISTENER_MINENVIRONMENT = 0; public static final int EAXLISTENER_MAXENVIRONMENT = - (EAX.EAX_ENVIRONMENT_COUNT - 1); + (EAX20.EAX_ENVIRONMENT_COUNT - 1); public static final int EAXLISTENER_DEFAULTENVIRONMENT = - EAX.EAX_ENVIRONMENT_GENERIC; + EAX20.EAX_ENVIRONMENT_GENERIC; public static final float EAXLISTENER_MINENVIRONMENTSIZE = 1.0f; public static final float EAXLISTENER_MAXENVIRONMENTSIZE = 100.0f; @@ -226,8 +226,8 @@ public class EAXListenerProperties { * Loads current EAX values */ public void loadEAXValues() { - EAX.eaxGet( - CoreEAX.LISTENER_GUID, + EAX20.eaxGet( + EAX20.LISTENER_GUID, EAXLISTENER_ALLPARAMETERS, 0, eaxListenerProperties, @@ -269,8 +269,8 @@ public class EAXListenerProperties { */ public void commit() { // call eaxSet with Listener guid, setting all parameters - EAX.eaxSet( - CoreEAX.LISTENER_GUID, EAXLISTENER_ALLPARAMETERS | EAXLISTENER_IMMEDIATE, + EAX20.eaxSet( + EAX20.LISTENER_GUID, EAXLISTENER_ALLPARAMETERS | EAXLISTENER_IMMEDIATE, 0, eaxListenerProperties, EAXLISTENERPROPERTIES_SIZE); } @@ -575,8 +575,8 @@ public class EAXListenerProperties { // only the environment value and its size. Also pass the // EAXLISTENER_ENVIRONMENT value (and since we're committing IMMEDIATE too) if (autoCommit) { - EAX.eaxSet( - CoreEAX.LISTENER_GUID, EAXLISTENER_ENVIRONMENT | EAXLISTENER_IMMEDIATE, + EAX20.eaxSet( + EAX20.LISTENER_GUID, EAXLISTENER_ENVIRONMENT | EAXLISTENER_IMMEDIATE, 0, eaxListenerProperties.position(environment_offset), 4); // rewind buffer @@ -609,8 +609,8 @@ public class EAXListenerProperties { // only the environment size value and its size. Also pass the // EAXLISTENER_ENVIRONMENTSIZE value (and since we're committing IMMEDIATE too) if (autoCommit) { - EAX.eaxSet( - CoreEAX.LISTENER_GUID, EAXLISTENER_ENVIRONMENTSIZE | EAXLISTENER_IMMEDIATE, + EAX20.eaxSet( + EAX20.LISTENER_GUID, EAXLISTENER_ENVIRONMENTSIZE | EAXLISTENER_IMMEDIATE, 0, eaxListenerProperties.position(environmentSize_offset), 4); // rewind buffer diff --git a/src/java/org/lwjgl/test/openal/BasicTest.java b/src/java/org/lwjgl/test/openal/BasicTest.java index e310fb13..f5569763 100644 --- a/src/java/org/lwjgl/test/openal/BasicTest.java +++ b/src/java/org/lwjgl/test/openal/BasicTest.java @@ -37,6 +37,7 @@ import java.nio.FloatBuffer; import java.nio.IntBuffer; import org.lwjgl.openal.AL; +import org.lwjgl.openal.AL10; /** * $Id$ @@ -115,7 +116,7 @@ public abstract class BasicTest { * @param error Error code causing exit */ protected void exit(int error) { - System.out.println("OpenAL Error: " + AL.alGetString(error)); + System.out.println("OpenAL Error: " + AL10.alGetString(error)); alExit(); System.exit(-1); } diff --git a/src/java/org/lwjgl/test/openal/EAXTest.java b/src/java/org/lwjgl/test/openal/EAXTest.java index a00cf632..68a325bb 100644 --- a/src/java/org/lwjgl/test/openal/EAXTest.java +++ b/src/java/org/lwjgl/test/openal/EAXTest.java @@ -38,7 +38,9 @@ import java.nio.IntBuffer; import org.lwjgl.Sys; import org.lwjgl.openal.AL; +import org.lwjgl.openal.AL10; import org.lwjgl.openal.eax.EAX; +import org.lwjgl.openal.eax.EAX20; import org.lwjgl.openal.eax.EAXBufferProperties; import org.lwjgl.openal.eax.EAXListenerProperties; @@ -94,9 +96,9 @@ public class EAXTest extends BasicTest { runTest(); // kill sources and buffers - AL.alSourceStop(soundSources.get(0)); - AL.alDeleteSources(soundSources); - AL.alDeleteBuffers(soundBuffers); + AL10.alSourceStop(soundSources.get(0)); + AL10.alDeleteSources(soundSources); + AL10.alDeleteBuffers(soundBuffers); EAX.destroy(); } @@ -108,22 +110,22 @@ public class EAXTest extends BasicTest { private boolean initialize() { // creating buffers Sys.log("Creating buffers"); - AL.alGenBuffers(soundBuffers); + AL10.alGenBuffers(soundBuffers); soundBuffers.rewind(); // creating sources Sys.log("Creating sources"); - AL.alGenSources(soundSources); + AL10.alGenSources(soundSources); soundSources.rewind(); // load sound files (left, center, right).wav Sys.log("Loading Footsteps.wav"); WaveData footsteps = WaveData.create("Footsteps.wav"); - AL.alBufferData(soundBuffers.get(0), footsteps.format, footsteps.data, footsteps.data.capacity(), footsteps.samplerate); - AL.alSourcef(soundSources.get(0), AL.AL_PITCH, 1.0f); - AL.alSourcef(soundSources.get(0), AL.AL_GAIN, 1.0f); - AL.alSourcei(soundSources.get(0), AL.AL_BUFFER, soundBuffers.get(0)); - AL.alSourcei(soundSources.get(0), AL.AL_LOOPING, AL.AL_TRUE); + AL10.alBufferData(soundBuffers.get(0), footsteps.format, footsteps.data, footsteps.data.capacity(), footsteps.samplerate); + AL10.alSourcef(soundSources.get(0), AL10.AL_PITCH, 1.0f); + AL10.alSourcef(soundSources.get(0), AL10.AL_GAIN, 1.0f); + AL10.alSourcei(soundSources.get(0), AL10.AL_BUFFER, soundBuffers.get(0)); + AL10.alSourcei(soundSources.get(0), AL10.AL_LOOPING, AL10.AL_TRUE); // create eax property objects listenerProperties = new EAXListenerProperties(); @@ -132,7 +134,7 @@ public class EAXTest extends BasicTest { // set buffer to work on source 0 bufferProperties.setCurrentSource(soundSources.get(0)); - return AL.alGetError() == AL.AL_NO_ERROR; + return AL10.alGetError() == AL10.AL_NO_ERROR; } /** @@ -142,7 +144,7 @@ public class EAXTest extends BasicTest { boolean running = true; char key; - assert AL.alIsBuffer(soundBuffers.get(0)) : "Failed to validate buffer"; + assert AL10.alIsBuffer(soundBuffers.get(0)) : "Failed to validate buffer"; // handle menu do { @@ -152,25 +154,25 @@ public class EAXTest extends BasicTest { switch (key) { // play sound case '1' : { - AL.alSourcePlay(soundSources.get(0)); + AL10.alSourcePlay(soundSources.get(0)); break; } // stop sound case '2' : { - AL.alSourceStop(soundSources.get(0)); + AL10.alSourceStop(soundSources.get(0)); break; } // add reverb case '3' : { - listenerProperties.setEnvironment(EAX.EAX_ENVIRONMENT_HANGAR); + listenerProperties.setEnvironment(EAX20.EAX_ENVIRONMENT_HANGAR); break; } // remove reverb case '4' : { - listenerProperties.setEnvironment(EAX.EAX_ENVIRONMENT_GENERIC); + listenerProperties.setEnvironment(EAX20.EAX_ENVIRONMENT_GENERIC); break; } diff --git a/src/java/org/lwjgl/test/openal/MovingSoundTest.java b/src/java/org/lwjgl/test/openal/MovingSoundTest.java index 72a83380..70cb8023 100644 --- a/src/java/org/lwjgl/test/openal/MovingSoundTest.java +++ b/src/java/org/lwjgl/test/openal/MovingSoundTest.java @@ -34,8 +34,9 @@ package org.lwjgl.test.openal; import java.nio.IntBuffer; import org.lwjgl.input.Keyboard; -import org.lwjgl.openal.AL; +import org.lwjgl.openal.AL10; import org.lwjgl.openal.eax.EAX; +import org.lwjgl.openal.eax.EAX20; import org.lwjgl.openal.eax.EAXListenerProperties; import org.lwjgl.opengl.Window; import org.lwjgl.vector.Vector3f; @@ -96,14 +97,14 @@ public class MovingSoundTest extends BasicTest { // al generate buffers and sources buffers.position(0).limit(1); - AL.alGenBuffers(buffers); - if ((lastError = AL.alGetError()) != AL.AL_NO_ERROR) { + AL10.alGenBuffers(buffers); + if ((lastError = AL10.alGetError()) != AL10.AL_NO_ERROR) { exit(lastError); } sources.position(0).limit(1); - AL.alGenSources(sources); - if ((lastError = AL.alGetError()) != AL.AL_NO_ERROR) { + AL10.alGenSources(sources); + if ((lastError = AL10.alGetError()) != AL10.AL_NO_ERROR) { exit(lastError); } @@ -111,13 +112,13 @@ public class MovingSoundTest extends BasicTest { WaveData wavefile = WaveData.create(args[0]); //copy to buffers - AL.alBufferData( + AL10.alBufferData( buffers.get(0), wavefile.format, wavefile.data, wavefile.data.capacity(), wavefile.samplerate); - if ((lastError = AL.alGetError()) != AL.AL_NO_ERROR) { + if ((lastError = AL10.alGetError()) != AL10.AL_NO_ERROR) { exit(lastError); } @@ -125,28 +126,28 @@ public class MovingSoundTest extends BasicTest { wavefile.dispose(); //set up source input - AL.alSourcei(sources.get(0), AL.AL_BUFFER, buffers.get(0)); - if ((lastError = AL.alGetError()) != AL.AL_NO_ERROR) { + AL10.alSourcei(sources.get(0), AL10.AL_BUFFER, buffers.get(0)); + if ((lastError = AL10.alGetError()) != AL10.AL_NO_ERROR) { exit(lastError); } - AL.alSourcef(sources.get(0), AL.AL_REFERENCE_DISTANCE, 1024.0f); - AL.alSourcef(sources.get(0), AL.AL_ROLLOFF_FACTOR, 0.5f); + AL10.alSourcef(sources.get(0), AL10.AL_REFERENCE_DISTANCE, 1024.0f); + AL10.alSourcef(sources.get(0), AL10.AL_ROLLOFF_FACTOR, 0.5f); //lets loop the sound - AL.alSourcei(sources.get(0), AL.AL_LOOPING, AL.AL_TRUE); - if ((lastError = AL.alGetError()) != AL.AL_NO_ERROR) { + AL10.alSourcei(sources.get(0), AL10.AL_LOOPING, AL10.AL_TRUE); + if ((lastError = AL10.alGetError()) != AL10.AL_NO_ERROR) { exit(lastError); } //play source 0 - AL.alSourcePlay(sources.get(0)); - if ((lastError = AL.alGetError()) != AL.AL_NO_ERROR) { + AL10.alSourcePlay(sources.get(0)); + if ((lastError = AL10.alGetError()) != AL10.AL_NO_ERROR) { exit(lastError); } //setup EAX if possible - if (AL.alIsExtensionPresent("EAX")) { + if (AL10.alIsExtensionPresent("EAX")) { try { EAX.create(); eaxListenerProp = new EAXListenerProperties(); @@ -163,31 +164,31 @@ public class MovingSoundTest extends BasicTest { if(Keyboard.isKeyDown(Keyboard.KEY_LEFT)) { if(Keyboard.isKeyDown(Keyboard.KEY_RSHIFT)) { listenerPosition.x -= MOVEMENT; - AL.alListener3f(AL.AL_POSITION, listenerPosition.x, listenerPosition.y, listenerPosition.z); + AL10.alListener3f(AL10.AL_POSITION, listenerPosition.x, listenerPosition.y, listenerPosition.z); System.out.println("listenerx: " + listenerPosition.x); } else { sourcePosition.x -= MOVEMENT; - AL.alSource3f(sources.get(0), AL.AL_POSITION, sourcePosition.x, sourcePosition.y, sourcePosition.z); + AL10.alSource3f(sources.get(0), AL10.AL_POSITION, sourcePosition.x, sourcePosition.y, sourcePosition.z); System.out.println("sourcex: " + sourcePosition.x); } } if(Keyboard.isKeyDown(Keyboard.KEY_RIGHT)) { if(Keyboard.isKeyDown(Keyboard.KEY_RSHIFT)) { listenerPosition.x += MOVEMENT; - AL.alListener3f(AL.AL_POSITION, listenerPosition.x, listenerPosition.y, listenerPosition.z); + AL10.alListener3f(AL10.AL_POSITION, listenerPosition.x, listenerPosition.y, listenerPosition.z); System.out.println("listenerx: " + listenerPosition.x); } else { sourcePosition.x += MOVEMENT; - AL.alSource3f(sources.get(0), AL.AL_POSITION, sourcePosition.x, sourcePosition.y, sourcePosition.z); + AL10.alSource3f(sources.get(0), AL10.AL_POSITION, sourcePosition.x, sourcePosition.y, sourcePosition.z); System.out.println("sourcex: " + sourcePosition.x); } } if(Keyboard.isKeyDown(Keyboard.KEY_E)) { if(eaxApplied) { - eaxListenerProp.setEnvironment(EAX.EAX_ENVIRONMENT_GENERIC); + eaxListenerProp.setEnvironment(EAX20.EAX_ENVIRONMENT_GENERIC); } else { - eaxListenerProp.setEnvironment(EAX.EAX_ENVIRONMENT_HANGAR); + eaxListenerProp.setEnvironment(EAX20.EAX_ENVIRONMENT_HANGAR); } eaxApplied = !eaxApplied; } @@ -203,21 +204,21 @@ public class MovingSoundTest extends BasicTest { } //stop source 0 - AL.alSourceStop(sources.get(0)); - if ((lastError = AL.alGetError()) != AL.AL_NO_ERROR) { + AL10.alSourceStop(sources.get(0)); + if ((lastError = AL10.alGetError()) != AL10.AL_NO_ERROR) { exit(lastError); } //delete buffers and sources sources.position(0).limit(1); - AL.alDeleteSources(sources); - if ((lastError = AL.alGetError()) != AL.AL_NO_ERROR) { + AL10.alDeleteSources(sources); + if ((lastError = AL10.alGetError()) != AL10.AL_NO_ERROR) { exit(lastError); } buffers.position(0).limit(1); - AL.alDeleteBuffers(buffers); - if ((lastError = AL.alGetError()) != AL.AL_NO_ERROR) { + AL10.alDeleteBuffers(buffers); + if ((lastError = AL10.alGetError()) != AL10.AL_NO_ERROR) { exit(lastError); } diff --git a/src/java/org/lwjgl/test/openal/OpenALCreationTest.java b/src/java/org/lwjgl/test/openal/OpenALCreationTest.java index a183b738..273350bc 100644 --- a/src/java/org/lwjgl/test/openal/OpenALCreationTest.java +++ b/src/java/org/lwjgl/test/openal/OpenALCreationTest.java @@ -36,6 +36,7 @@ import java.nio.ByteOrder; import java.nio.IntBuffer; import org.lwjgl.openal.AL; +import org.lwjgl.openal.AL10; /** * $Id$ @@ -87,7 +88,7 @@ public class OpenALCreationTest { * @param error Error code causing exit */ protected void exit(int error) { - System.out.println("OpenAL Error: " + AL.alGetString(error)); + System.out.println("OpenAL Error: " + AL10.alGetString(error)); alExit(); System.exit(-1); } @@ -137,14 +138,14 @@ public class OpenALCreationTest { // al generate buffers and sources buffers.position(0).limit(1); - AL.alGenBuffers(buffers); - if ((lastError = AL.alGetError()) != AL.AL_NO_ERROR) { + AL10.alGenBuffers(buffers); + if ((lastError = AL10.alGetError()) != AL10.AL_NO_ERROR) { exit(lastError); } sources.position(0).limit(1); - AL.alGenSources(sources); - if ((lastError = AL.alGetError()) != AL.AL_NO_ERROR) { + AL10.alGenSources(sources); + if ((lastError = AL10.alGetError()) != AL10.AL_NO_ERROR) { exit(lastError); } @@ -152,13 +153,13 @@ public class OpenALCreationTest { WaveData wavefile = WaveData.create("Footsteps.wav"); //copy to buffers - AL.alBufferData( + AL10.alBufferData( buffers.get(0), wavefile.format, wavefile.data, wavefile.data.capacity(), wavefile.samplerate); - if ((lastError = AL.alGetError()) != AL.AL_NO_ERROR) { + if ((lastError = AL10.alGetError()) != AL10.AL_NO_ERROR) { exit(lastError); } @@ -166,20 +167,20 @@ public class OpenALCreationTest { wavefile.dispose(); //set up source input - AL.alSourcei(sources.get(0), AL.AL_BUFFER, buffers.get(0)); - if ((lastError = AL.alGetError()) != AL.AL_NO_ERROR) { + AL10.alSourcei(sources.get(0), AL10.AL_BUFFER, buffers.get(0)); + if ((lastError = AL10.alGetError()) != AL10.AL_NO_ERROR) { exit(lastError); } //lets loop the sound - AL.alSourcei(sources.get(0), AL.AL_LOOPING, AL.AL_TRUE); - if ((lastError = AL.alGetError()) != AL.AL_NO_ERROR) { + AL10.alSourcei(sources.get(0), AL10.AL_LOOPING, AL10.AL_TRUE); + if ((lastError = AL10.alGetError()) != AL10.AL_NO_ERROR) { exit(lastError); } //play source 0 - AL.alSourcePlay(sources.get(0)); - if ((lastError = AL.alGetError()) != AL.AL_NO_ERROR) { + AL10.alSourcePlay(sources.get(0)); + if ((lastError = AL10.alGetError()) != AL10.AL_NO_ERROR) { exit(lastError); } @@ -192,21 +193,21 @@ public class OpenALCreationTest { System.out.println("done"); //stop source 0 - AL.alSourceStop(sources.get(0)); - if ((lastError = AL.alGetError()) != AL.AL_NO_ERROR) { + AL10.alSourceStop(sources.get(0)); + if ((lastError = AL10.alGetError()) != AL10.AL_NO_ERROR) { exit(lastError); } //delete buffers and sources sources.position(0).limit(1); - AL.alDeleteSources(sources); - if ((lastError = AL.alGetError()) != AL.AL_NO_ERROR) { + AL10.alDeleteSources(sources); + if ((lastError = AL10.alGetError()) != AL10.AL_NO_ERROR) { exit(lastError); } buffers.position(0).limit(1); - AL.alDeleteBuffers(buffers); - if ((lastError = AL.alGetError()) != AL.AL_NO_ERROR) { + AL10.alDeleteBuffers(buffers); + if ((lastError = AL10.alGetError()) != AL10.AL_NO_ERROR) { exit(lastError); } } diff --git a/src/java/org/lwjgl/test/openal/PlayTest.java b/src/java/org/lwjgl/test/openal/PlayTest.java index 0741e8cb..b6a85dba 100644 --- a/src/java/org/lwjgl/test/openal/PlayTest.java +++ b/src/java/org/lwjgl/test/openal/PlayTest.java @@ -37,7 +37,7 @@ import java.nio.ByteBuffer; import java.nio.ByteOrder; import java.nio.IntBuffer; -import org.lwjgl.openal.AL; +import org.lwjgl.openal.AL10; /** * $Id$ @@ -70,7 +70,7 @@ public class PlayTest extends BasicTest { if(args[0].endsWith(".ogg")) { System.out.print("Attempting to load Ogg Vorbis file, checking for extension..."); - if(AL.alIsExtensionPresent("AL_EXT_vorbis")) { + if(AL10.alIsExtensionPresent("AL_EXT_vorbis")) { System.out.println("found"); usingVorbis = true; } else { @@ -88,14 +88,14 @@ public class PlayTest extends BasicTest { // al generate buffers and sources buffers.position(0).limit(1); - AL.alGenBuffers(buffers); - if((lastError = AL.alGetError()) != AL.AL_NO_ERROR) { + AL10.alGenBuffers(buffers); + if((lastError = AL10.alGetError()) != AL10.AL_NO_ERROR) { exit(lastError); } sources.position(0).limit(1); - AL.alGenSources(sources); - if((lastError = AL.alGetError()) != AL.AL_NO_ERROR) { + AL10.alGenSources(sources); + if((lastError = AL10.alGetError()) != AL10.AL_NO_ERROR) { exit(lastError); } @@ -103,38 +103,38 @@ public class PlayTest extends BasicTest { ByteBuffer filebuffer = getData(args[0]); // pass directly to buffer data - AL.alBufferData(buffers.get(0), AL.AL_FORMAT_VORBIS_EXT, filebuffer, -1, -1); + AL10.alBufferData(buffers.get(0), AL10.AL_FORMAT_VORBIS_EXT, filebuffer, -1, -1); filebuffer.clear(); } else { // load wave data from buffer WaveData wavefile = WaveData.create(args[0]); //copy to buffers - AL.alBufferData(buffers.get(0), wavefile.format, wavefile.data, wavefile.data.capacity(), wavefile.samplerate); + AL10.alBufferData(buffers.get(0), wavefile.format, wavefile.data, wavefile.data.capacity(), wavefile.samplerate); //unload file again wavefile.dispose(); } - if((lastError = AL.alGetError()) != AL.AL_NO_ERROR) { + if((lastError = AL10.alGetError()) != AL10.AL_NO_ERROR) { exit(lastError); } //set up source input - AL.alSourcei(sources.get(0), AL.AL_BUFFER, buffers.get(0)); - if((lastError = AL.alGetError()) != AL.AL_NO_ERROR) { + AL10.alSourcei(sources.get(0), AL10.AL_BUFFER, buffers.get(0)); + if((lastError = AL10.alGetError()) != AL10.AL_NO_ERROR) { exit(lastError); } //lets loop the sound - AL.alSourcei(sources.get(0), AL.AL_LOOPING, AL.AL_TRUE); - if((lastError = AL.alGetError()) != AL.AL_NO_ERROR) { + AL10.alSourcei(sources.get(0), AL10.AL_LOOPING, AL10.AL_TRUE); + if((lastError = AL10.alGetError()) != AL10.AL_NO_ERROR) { exit(lastError); } //play source 0 - AL.alSourcePlay(sources.get(0)); - if((lastError = AL.alGetError()) != AL.AL_NO_ERROR) { + AL10.alSourcePlay(sources.get(0)); + if((lastError = AL10.alGetError()) != AL10.AL_NO_ERROR) { exit(lastError); } @@ -146,21 +146,21 @@ public class PlayTest extends BasicTest { } //stop source 0 - AL.alSourceStop(sources.get(0)); - if((lastError = AL.alGetError()) != AL.AL_NO_ERROR) { + AL10.alSourceStop(sources.get(0)); + if((lastError = AL10.alGetError()) != AL10.AL_NO_ERROR) { exit(lastError); } //delete buffers and sources sources.position(0).limit(1); - AL.alDeleteSources(sources); - if((lastError = AL.alGetError()) != AL.AL_NO_ERROR) { + AL10.alDeleteSources(sources); + if((lastError = AL10.alGetError()) != AL10.AL_NO_ERROR) { exit(lastError); } buffers.position(0).limit(1); - AL.alDeleteBuffers(buffers); - if((lastError = AL.alGetError()) != AL.AL_NO_ERROR) { + AL10.alDeleteBuffers(buffers); + if((lastError = AL10.alGetError()) != AL10.AL_NO_ERROR) { exit(lastError); } diff --git a/src/java/org/lwjgl/test/openal/PlayTestMemory.java b/src/java/org/lwjgl/test/openal/PlayTestMemory.java index bd7f172a..7ae357c3 100644 --- a/src/java/org/lwjgl/test/openal/PlayTestMemory.java +++ b/src/java/org/lwjgl/test/openal/PlayTestMemory.java @@ -37,7 +37,7 @@ import java.nio.ByteBuffer; import java.nio.ByteOrder; import java.nio.IntBuffer; -import org.lwjgl.openal.AL; +import org.lwjgl.openal.AL10; /** * $Id$ @@ -70,7 +70,7 @@ public class PlayTestMemory extends BasicTest { if(args[0].endsWith(".ogg")) { System.out.print("Attempting to load Ogg Vorbis file, checking for extension..."); - if(AL.alIsExtensionPresent("AL_EXT_vorbis")) { + if(AL10.alIsExtensionPresent("AL_EXT_vorbis")) { System.out.println("found"); usingVorbis = true; } else { @@ -88,14 +88,14 @@ public class PlayTestMemory extends BasicTest { // al generate buffers and sources buffers.position(0).limit(1); - AL.alGenBuffers(buffers); - if((lastError = AL.alGetError()) != AL.AL_NO_ERROR) { + AL10.alGenBuffers(buffers); + if((lastError = AL10.alGetError()) != AL10.AL_NO_ERROR) { exit(lastError); } sources.position(0).limit(1); - AL.alGenSources(sources); - if((lastError = AL.alGetError()) != AL.AL_NO_ERROR) { + AL10.alGenSources(sources); + if((lastError = AL10.alGetError()) != AL10.AL_NO_ERROR) { exit(lastError); } @@ -111,40 +111,40 @@ public class PlayTestMemory extends BasicTest { //ALUTLoadWAVData file = alut.loadWAVMemory(Sys.getDirectBufferAddress(filebuffer)); if(usingVorbis) { // pass directly to buffer data - AL.alBufferData(buffers.get(0), AL.AL_FORMAT_VORBIS_EXT, filebuffer, -1, -1); + AL10.alBufferData(buffers.get(0), AL10.AL_FORMAT_VORBIS_EXT, filebuffer, -1, -1); filebuffer.clear(); } else { // load wave data from buffer WaveData wavefile = WaveData.create(filebuffer.array()); //copy to buffers - AL.alBufferData(buffers.get(0), wavefile.format, wavefile.data, wavefile.data.capacity(), wavefile.samplerate); + AL10.alBufferData(buffers.get(0), wavefile.format, wavefile.data, wavefile.data.capacity(), wavefile.samplerate); //unload file again wavefile.dispose(); } // check for errors - if((lastError = AL.alGetError()) != AL.AL_NO_ERROR) { + if((lastError = AL10.alGetError()) != AL10.AL_NO_ERROR) { exit(lastError); } //set up source input - AL.alSourcei(sources.get(0), AL.AL_BUFFER, buffers.get(0)); - if((lastError = AL.alGetError()) != AL.AL_NO_ERROR) { + AL10.alSourcei(sources.get(0), AL10.AL_BUFFER, buffers.get(0)); + if((lastError = AL10.alGetError()) != AL10.AL_NO_ERROR) { exit(lastError); } //lets loop the sound - AL.alSourcei(sources.get(0), AL.AL_LOOPING, AL.AL_TRUE); - if((lastError = AL.alGetError()) != AL.AL_NO_ERROR) { + AL10.alSourcei(sources.get(0), AL10.AL_LOOPING, AL10.AL_TRUE); + if((lastError = AL10.alGetError()) != AL10.AL_NO_ERROR) { exit(lastError); } //play source 0 - AL.alSourcePlay(sources.get(0)); - if((lastError = AL.alGetError()) != AL.AL_NO_ERROR) { + AL10.alSourcePlay(sources.get(0)); + if((lastError = AL10.alGetError()) != AL10.AL_NO_ERROR) { exit(lastError); } @@ -156,21 +156,21 @@ public class PlayTestMemory extends BasicTest { } //stop source 0 - AL.alSourceStop(sources.get(0)); - if((lastError = AL.alGetError()) != AL.AL_NO_ERROR) { + AL10.alSourceStop(sources.get(0)); + if((lastError = AL10.alGetError()) != AL10.AL_NO_ERROR) { exit(lastError); } //delete buffers and sources sources.position(0).limit(1); - AL.alDeleteSources(sources); - if((lastError = AL.alGetError()) != AL.AL_NO_ERROR) { + AL10.alDeleteSources(sources); + if((lastError = AL10.alGetError()) != AL10.AL_NO_ERROR) { exit(lastError); } buffers.position(0).limit(1); - AL.alDeleteBuffers(buffers); - if((lastError = AL.alGetError()) != AL.AL_NO_ERROR) { + AL10.alDeleteBuffers(buffers); + if((lastError = AL10.alGetError()) != AL10.AL_NO_ERROR) { exit(lastError); } diff --git a/src/java/org/lwjgl/test/openal/PositionTest.java b/src/java/org/lwjgl/test/openal/PositionTest.java index 6740cfa2..0f03ec27 100644 --- a/src/java/org/lwjgl/test/openal/PositionTest.java +++ b/src/java/org/lwjgl/test/openal/PositionTest.java @@ -8,6 +8,7 @@ import org.lwjgl.Sys; import org.lwjgl.input.Keyboard; import org.lwjgl.input.Mouse; import org.lwjgl.openal.AL; +import org.lwjgl.openal.AL10; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.Window; import org.lwjgl.opengl.glu.GLU; @@ -158,17 +159,17 @@ public class PositionTest extends BasicTest { rightPosition.flip(); rightVelocity.flip(); - AL.alListener(AL.AL_POSITION, listenerPosition); - AL.alListener(AL.AL_VELOCITY, listenerVelocity); - AL.alListener(AL.AL_ORIENTATION, listenerOrientation); + AL10.alListener(AL10.AL_POSITION, listenerPosition); + AL10.alListener(AL10.AL_VELOCITY, listenerVelocity); + AL10.alListener(AL10.AL_ORIENTATION, listenerOrientation); // creating buffers Sys.log("Creating buffers"); - AL.alGenBuffers(soundBuffers); + AL10.alGenBuffers(soundBuffers); soundBuffers.rewind(); // creating sources - AL.alGenSources(soundSources); + AL10.alGenSources(soundSources); soundSources.rewind(); // load sound files (left, center, right).wav @@ -176,33 +177,33 @@ public class PositionTest extends BasicTest { Sys.log("Loading left.wav"); WaveData left = WaveData.create("left.wav"); - AL.alBufferData(soundBuffers.get(LEFT), left.format, left.data, left.data.capacity(), left.samplerate); - AL.alSourcef(soundSources.get(LEFT), AL.AL_PITCH, 1.0f); - AL.alSourcef(soundSources.get(LEFT), AL.AL_GAIN, 1.0f); - AL.alSource(soundSources.get(LEFT), AL.AL_POSITION, leftPosition); - AL.alSource(soundSources.get(LEFT), AL.AL_VELOCITY, leftVelocity); - AL.alSourcei(soundSources.get(LEFT), AL.AL_BUFFER, soundBuffers.get(LEFT)); - AL.alSourcei(soundSources.get(LEFT), AL.AL_LOOPING, AL.AL_TRUE); + AL10.alBufferData(soundBuffers.get(LEFT), left.format, left.data, left.data.capacity(), left.samplerate); + AL10.alSourcef(soundSources.get(LEFT), AL10.AL_PITCH, 1.0f); + AL10.alSourcef(soundSources.get(LEFT), AL10.AL_GAIN, 1.0f); + AL10.alSource(soundSources.get(LEFT), AL10.AL_POSITION, leftPosition); + AL10.alSource(soundSources.get(LEFT), AL10.AL_VELOCITY, leftVelocity); + AL10.alSourcei(soundSources.get(LEFT), AL10.AL_BUFFER, soundBuffers.get(LEFT)); + AL10.alSourcei(soundSources.get(LEFT), AL10.AL_LOOPING, AL10.AL_TRUE); Sys.log("Loading center.wav"); WaveData center = WaveData.create("center.wav"); - AL.alBufferData(soundBuffers.get(CENTER), center.format, center.data, center.data.capacity(), center.samplerate); - AL.alSourcef(soundSources.get(CENTER), AL.AL_PITCH, 1.0f); - AL.alSourcef(soundSources.get(CENTER), AL.AL_GAIN, 1.0f); - AL.alSource(soundSources.get(CENTER), AL.AL_POSITION, centerPosition); - AL.alSource(soundSources.get(CENTER), AL.AL_VELOCITY, centerVelocity); - AL.alSourcei(soundSources.get(CENTER), AL.AL_BUFFER, soundBuffers.get(CENTER)); - AL.alSourcei(soundSources.get(CENTER), AL.AL_LOOPING, AL.AL_TRUE); + AL10.alBufferData(soundBuffers.get(CENTER), center.format, center.data, center.data.capacity(), center.samplerate); + AL10.alSourcef(soundSources.get(CENTER), AL10.AL_PITCH, 1.0f); + AL10.alSourcef(soundSources.get(CENTER), AL10.AL_GAIN, 1.0f); + AL10.alSource(soundSources.get(CENTER), AL10.AL_POSITION, centerPosition); + AL10.alSource(soundSources.get(CENTER), AL10.AL_VELOCITY, centerVelocity); + AL10.alSourcei(soundSources.get(CENTER), AL10.AL_BUFFER, soundBuffers.get(CENTER)); + AL10.alSourcei(soundSources.get(CENTER), AL10.AL_LOOPING, AL10.AL_TRUE); Sys.log("Loading right.wav"); WaveData right = WaveData.create("right.wav"); - AL.alBufferData(soundBuffers.get(RIGHT), right.format, right.data, right.data.capacity(), right.samplerate); - AL.alSourcef(soundSources.get(RIGHT), AL.AL_PITCH, 1.0f); - AL.alSourcef(soundSources.get(RIGHT), AL.AL_GAIN, 1.0f); - AL.alSource(soundSources.get(RIGHT), AL.AL_POSITION, rightPosition); - AL.alSource(soundSources.get(RIGHT), AL.AL_VELOCITY, rightVelocity); - AL.alSourcei(soundSources.get(RIGHT), AL.AL_BUFFER, soundBuffers.get(RIGHT)); - AL.alSourcei(soundSources.get(RIGHT), AL.AL_LOOPING, AL.AL_TRUE); + AL10.alBufferData(soundBuffers.get(RIGHT), right.format, right.data, right.data.capacity(), right.samplerate); + AL10.alSourcef(soundSources.get(RIGHT), AL10.AL_PITCH, 1.0f); + AL10.alSourcef(soundSources.get(RIGHT), AL10.AL_GAIN, 1.0f); + AL10.alSource(soundSources.get(RIGHT), AL10.AL_POSITION, rightPosition); + AL10.alSource(soundSources.get(RIGHT), AL10.AL_VELOCITY, rightVelocity); + AL10.alSourcei(soundSources.get(RIGHT), AL10.AL_BUFFER, soundBuffers.get(RIGHT)); + AL10.alSourcei(soundSources.get(RIGHT), AL10.AL_LOOPING, AL10.AL_TRUE); Sys.log("Soundfiles loaded successfully"); // ----------------------------------------------------- @@ -281,11 +282,11 @@ public class PositionTest extends BasicTest { * Starts playing the sounds at different times */ private void startSounds() { - AL.alSourcePlay(soundSources.get(LEFT)); + AL10.alSourcePlay(soundSources.get(LEFT)); pause(300); - AL.alSourcePlay(soundSources.get(CENTER)); + AL10.alSourcePlay(soundSources.get(CENTER)); pause(500); - AL.alSourcePlay(soundSources.get(RIGHT)); + AL10.alSourcePlay(soundSources.get(RIGHT)); } /** @@ -297,7 +298,7 @@ public class PositionTest extends BasicTest { // if requesting pause, and not paused - pause and stop sound if(paused && !pauseMode) { pauseMode = true; - AL.alSourcePause(soundSources); + AL10.alSourcePause(soundSources); } // else go out of pause mode and start sounds @@ -325,17 +326,17 @@ public class PositionTest extends BasicTest { // Test for play // ============================================ if (Keyboard.isKeyDown(Keyboard.KEY_1)) { - AL.alSourcePlay(soundSources.get(LEFT)); + AL10.alSourcePlay(soundSources.get(LEFT)); Sys.log("Playing left.wav"); } if (Keyboard.isKeyDown(Keyboard.KEY_2)) { - AL.alSourcePlay(soundSources.get(CENTER)); + AL10.alSourcePlay(soundSources.get(CENTER)); Sys.log("Playing center.wav"); } if (Keyboard.isKeyDown(Keyboard.KEY_3)) { - AL.alSourcePlay(soundSources.get(RIGHT)); + AL10.alSourcePlay(soundSources.get(RIGHT)); Sys.log("Playing right.wav"); } // -------------------------------------------- @@ -343,17 +344,17 @@ public class PositionTest extends BasicTest { // Test for stop // ============================================ if (Keyboard.isKeyDown(Keyboard.KEY_4)) { - AL.alSourceStop(soundSources.get(LEFT)); + AL10.alSourceStop(soundSources.get(LEFT)); Sys.log("Stopped left.wav"); } if (Keyboard.isKeyDown(Keyboard.KEY_5)) { - AL.alSourceStop(soundSources.get(CENTER)); + AL10.alSourceStop(soundSources.get(CENTER)); Sys.log("Stopped center.wav"); } if (Keyboard.isKeyDown(Keyboard.KEY_6)) { - AL.alSourceStop(soundSources.get(RIGHT)); + AL10.alSourceStop(soundSources.get(RIGHT)); Sys.log("Stopped right.wav"); } // -------------------------------------------- @@ -362,12 +363,12 @@ public class PositionTest extends BasicTest { // ============================================ if (Keyboard.isKeyDown(Keyboard.KEY_LEFT)) { listenerPosition.put(0, listenerPosition.get(0) - 0.1f); - AL.alListener(AL.AL_POSITION, listenerPosition); + AL10.alListener(AL10.AL_POSITION, listenerPosition); } if (Keyboard.isKeyDown(Keyboard.KEY_RIGHT)) { listenerPosition.put(0, listenerPosition.get(0) + 0.1f); - AL.alListener(AL.AL_POSITION, listenerPosition); + AL10.alListener(AL10.AL_POSITION, listenerPosition); } if (Keyboard.isKeyDown(Keyboard.KEY_UP)) { @@ -376,7 +377,7 @@ public class PositionTest extends BasicTest { } else { listenerPosition.put(2, listenerPosition.get(2) - 0.1f); } - AL.alListener(AL.AL_POSITION, listenerPosition); + AL10.alListener(AL10.AL_POSITION, listenerPosition); } if (Keyboard.isKeyDown(Keyboard.KEY_DOWN)) { @@ -385,7 +386,7 @@ public class PositionTest extends BasicTest { } else { listenerPosition.put(2, listenerPosition.get(2) + 0.1f); } - AL.alListener(AL.AL_POSITION, listenerPosition); + AL10.alListener(AL10.AL_POSITION, listenerPosition); } // -------------------------------------------- @@ -400,7 +401,7 @@ public class PositionTest extends BasicTest { listenerPosition.put(2, listenerPosition.get(2) + 0.1f); } - AL.alListener(AL.AL_POSITION, listenerPosition); + AL10.alListener(AL10.AL_POSITION, listenerPosition); } @@ -463,9 +464,9 @@ public class PositionTest extends BasicTest { Mouse.destroy(); Sys.log("Shutting down OpenAL"); - AL.alSourceStop(soundSources); - AL.alDeleteSources(soundSources); - AL.alDeleteBuffers(soundBuffers); + AL10.alSourceStop(soundSources); + AL10.alDeleteSources(soundSources); + AL10.alDeleteBuffers(soundBuffers); AL.destroy(); Sys.log("Shutting down Window"); diff --git a/src/java/org/lwjgl/test/openal/SourceLimitTest.java b/src/java/org/lwjgl/test/openal/SourceLimitTest.java index a5aba5aa..12c11c2e 100644 --- a/src/java/org/lwjgl/test/openal/SourceLimitTest.java +++ b/src/java/org/lwjgl/test/openal/SourceLimitTest.java @@ -33,7 +33,7 @@ package org.lwjgl.test.openal; import java.nio.IntBuffer; -import org.lwjgl.openal.AL; +import org.lwjgl.openal.AL10; import org.lwjgl.openal.OpenALException; /** @@ -97,15 +97,15 @@ public class SourceLimitTest extends BasicTest { //Create sourcesToCreate sources in one fell swoop sources.position(0).limit(sourcesToCreate); - AL.alGenSources(sources); - if ((lastError = AL.alGetError()) != AL.AL_NO_ERROR) { - System.out.println("failed to create " + sourcesToCreate + " sources (" + AL.alGetString(lastError) + ")"); + AL10.alGenSources(sources); + if ((lastError = AL10.alGetError()) != AL10.AL_NO_ERROR) { + System.out.println("failed to create " + sourcesToCreate + " sources (" + AL10.alGetString(lastError) + ")"); return; } //delete sources sources.position(0).limit(sourcesToCreate); - AL.alDeleteSources(sources); + AL10.alDeleteSources(sources); System.out.println("created " + sourcesToCreate + " sources successfully!"); } @@ -124,8 +124,8 @@ public class SourceLimitTest extends BasicTest { for (int i = 0; i <= sourcesToCreate; i++) { sources[i] = createIntBuffer(1); sources[i].position(0).limit(1); - AL.alGenSources(sources[i]); - if ((lastError = AL.alGetError()) != AL.AL_NO_ERROR) { + AL10.alGenSources(sources[i]); + if ((lastError = AL10.alGetError()) != AL10.AL_NO_ERROR) { System.out.println("failed to create source: " + (i + 1)); break; } @@ -136,9 +136,9 @@ public class SourceLimitTest extends BasicTest { for (int i = 0; i < sourcesCreated; i++) { //delete buffers and sources sources[i].position(0).limit(1); - AL.alDeleteSources(sources[i]); - if ((lastError = AL.alGetError()) != AL.AL_NO_ERROR) { - System.out.println("failed to delete source: " + i + "(" + AL.alGetString(lastError) + ")"); + AL10.alDeleteSources(sources[i]); + if ((lastError = AL10.alGetError()) != AL10.AL_NO_ERROR) { + System.out.println("failed to delete source: " + i + "(" + AL10.alGetString(lastError) + ")"); break; } } diff --git a/src/java/org/lwjgl/test/openal/StressTest.java b/src/java/org/lwjgl/test/openal/StressTest.java index 240cc4b3..bd46cf87 100644 --- a/src/java/org/lwjgl/test/openal/StressTest.java +++ b/src/java/org/lwjgl/test/openal/StressTest.java @@ -33,7 +33,7 @@ package org.lwjgl.test.openal; import java.nio.IntBuffer; -import org.lwjgl.openal.AL; +import org.lwjgl.openal.AL10; /** * $Id$ @@ -81,8 +81,8 @@ public class StressTest extends BasicTest { private void createSources() { sources = createIntBuffer(4); sources.position(0).limit(4); - AL.alGenSources(sources); - if (AL.alGetError() != AL.AL_NO_ERROR) { + AL10.alGenSources(sources); + if (AL10.alGetError() != AL10.AL_NO_ERROR) { System.out.println("Unable to create 4 sources"); alExit(); } @@ -91,32 +91,32 @@ public class StressTest extends BasicTest { private void createBuffers() { buffers = createIntBuffer(10); buffers.position(0).limit(10); - AL.alGenBuffers(buffers); - if (AL.alGetError() != AL.AL_NO_ERROR) { + AL10.alGenBuffers(buffers); + if (AL10.alGetError() != AL10.AL_NO_ERROR) { System.out.println("Unable to create 10 buffers"); sources.position(0).limit(4); - AL.alDeleteSources(sources); + AL10.alDeleteSources(sources); alExit(); } } private void loadSamples() throws Exception { - AL.alGetError(); + AL10.alGetError(); WaveData data = WaveData.create("ding.wav"); for (int i = 1; i <= 10; i++) { - AL.alBufferData( + AL10.alBufferData( buffers.get(i - 1), data.format, data.data, data.data.capacity(), data.samplerate); - if (AL.alGetError() != AL.AL_NO_ERROR) { + if (AL10.alGetError() != AL10.AL_NO_ERROR) { System.out.println("Failed to load " + i + ".wav into buffer"); sources.position(0).limit(4); - AL.alDeleteSources(sources); + AL10.alDeleteSources(sources); buffers.position(0).limit(10); - AL.alDeleteBuffers(buffers); + AL10.alDeleteBuffers(buffers); alExit(); } @@ -132,11 +132,11 @@ public class StressTest extends BasicTest { long startTime = System.currentTimeMillis(); //mark background source as looping - AL.alSourcei(sources.get(0), AL.AL_LOOPING, AL.AL_TRUE); + AL10.alSourcei(sources.get(0), AL10.AL_LOOPING, AL10.AL_TRUE); //play background - AL.alSourcei(sources.get(0), AL.AL_BUFFER, buffers.get(0)); - AL.alSourcePlay(sources.get(0)); + AL10.alSourcei(sources.get(0), AL10.AL_BUFFER, buffers.get(0)); + AL10.alSourcePlay(sources.get(0)); while (System.currentTimeMillis() - startTime < (2000)) { @@ -144,22 +144,22 @@ public class StressTest extends BasicTest { System.out.println("random:" + randomBuffer); //stop source at slot - AL.alSourceStop(sources.get(nextSlot)); - if (AL.alGetError() != AL.AL_NO_ERROR) { + AL10.alSourceStop(sources.get(nextSlot)); + if (AL10.alGetError() != AL10.AL_NO_ERROR) { System.out.println("Error stopping source."); } System.out.println("Stopped source: " + nextSlot); //link source<->buffer - AL.alSourcei(sources.get(nextSlot), AL.AL_BUFFER, buffers.get(randomBuffer)); - if (AL.alGetError() != AL.AL_NO_ERROR) { + AL10.alSourcei(sources.get(nextSlot), AL10.AL_BUFFER, buffers.get(randomBuffer)); + if (AL10.alGetError() != AL10.AL_NO_ERROR) { System.out.println("Error linking buffer and source."); } System.out.println("linked source " + nextSlot + " with buffer " + randomBuffer); //start playing System.out.println("playing source " + nextSlot); - AL.alSourcePlay(sources.get(nextSlot++)); + AL10.alSourcePlay(sources.get(nextSlot++)); if (nextSlot == 4) { nextSlot = startSlot; } @@ -182,7 +182,7 @@ public class StressTest extends BasicTest { //stop all sources for (int i = 0; i < 4; i++) { - AL.alSourceStop(sources.get(i)); + AL10.alSourceStop(sources.get(i)); System.out.println("Stopping source " + (i+1)); } @@ -200,9 +200,9 @@ public class StressTest extends BasicTest { } sources.position(0).limit(4); - AL.alDeleteSources(sources); + AL10.alDeleteSources(sources); buffers.position(0).limit(10); - AL.alDeleteBuffers(buffers); + AL10.alDeleteBuffers(buffers); } private int getRandomBuffer() { diff --git a/src/java/org/lwjgl/test/openal/WaveData.java b/src/java/org/lwjgl/test/openal/WaveData.java index fa366d6c..889edbac 100644 --- a/src/java/org/lwjgl/test/openal/WaveData.java +++ b/src/java/org/lwjgl/test/openal/WaveData.java @@ -42,7 +42,7 @@ import javax.sound.sampled.AudioFormat; import javax.sound.sampled.AudioInputStream; import javax.sound.sampled.AudioSystem; -import org.lwjgl.openal.AL; +import org.lwjgl.openal.AL10; /** * $Id$ @@ -131,17 +131,17 @@ public class WaveData { int channels = 0; if (audioformat.getChannels() == 1) { if (audioformat.getSampleSizeInBits() == 8) { - channels = AL.AL_FORMAT_MONO8; + channels = AL10.AL_FORMAT_MONO8; } else if (audioformat.getSampleSizeInBits() == 16) { - channels = AL.AL_FORMAT_MONO16; + channels = AL10.AL_FORMAT_MONO16; } else { assert false : "Illegal sample size"; } } else if (audioformat.getChannels() == 2) { if (audioformat.getSampleSizeInBits() == 8) { - channels = AL.AL_FORMAT_STEREO8; + channels = AL10.AL_FORMAT_STEREO8; } else if (audioformat.getSampleSizeInBits() == 16) { - channels = AL.AL_FORMAT_STEREO16; + channels = AL10.AL_FORMAT_STEREO16; } else { assert false : "Illegal sample size"; } diff --git a/src/native/common/Makefile.am b/src/native/common/Makefile.am index 7eb6e5f8..167f4ab0 100644 --- a/src/native/common/Makefile.am +++ b/src/native/common/Makefile.am @@ -22,14 +22,14 @@ COMMON = \ org_lwjgl_input_Mouse.h \ org_lwjgl_openal_ALC.cpp \ org_lwjgl_openal_ALC.h \ - org_lwjgl_openal_BaseAL.cpp \ - org_lwjgl_openal_BaseAL.h \ - org_lwjgl_openal_CoreAL.cpp \ - org_lwjgl_openal_CoreAL.h \ - org_lwjgl_openal_eax_BaseEAX.cpp \ - org_lwjgl_openal_eax_BaseEAX.h \ - org_lwjgl_openal_eax_CoreEAX.cpp \ - org_lwjgl_openal_eax_CoreEAX.h \ + org_lwjgl_openal_AL.cpp \ + org_lwjgl_openal_AL.h \ + org_lwjgl_openal_AL10.cpp \ + org_lwjgl_openal_AL10.h \ + org_lwjgl_openal_eax_EAX.cpp \ + org_lwjgl_openal_eax_EAX.h \ + org_lwjgl_openal_eax_EAX20.cpp \ + org_lwjgl_openal_eax_EAX.h \ org_lwjgl_openal_eax_EAXBufferProperties.cpp \ org_lwjgl_openal_eax_EAXBufferProperties.h \ org_lwjgl_openal_eax_EAXListenerProperties.cpp \ diff --git a/src/native/common/org_lwjgl_openal_BaseAL.cpp b/src/native/common/org_lwjgl_openal_AL.cpp similarity index 84% rename from src/native/common/org_lwjgl_openal_BaseAL.cpp rename to src/native/common/org_lwjgl_openal_AL.cpp index 471fc41e..622cd9dc 100644 --- a/src/native/common/org_lwjgl_openal_BaseAL.cpp +++ b/src/native/common/org_lwjgl_openal_AL.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002 Lightweight Java Game Library Project + * Copyright (c) 2002-2004 Lightweight Java Game Library Project * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -30,16 +30,16 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "org_lwjgl_openal_BaseAL.h" +#include "org_lwjgl_openal_AL.h" /* OpenAL includes */ #include "checkALerror.h" #include "extal.h" -JNIEXPORT void JNICALL Java_org_lwjgl_openal_BaseAL_nCreate (JNIEnv *env, jclass clazz, jobjectArray oalPaths) { +JNIEXPORT void JNICALL Java_org_lwjgl_openal_AL_nCreate (JNIEnv *env, jclass clazz, jobjectArray oalPaths) { InitializeOpenAL(env, oalPaths); } -JNIEXPORT void JNICALL Java_org_lwjgl_openal_BaseAL_nDestroy(JNIEnv *env, jclass clazz) { +JNIEXPORT void JNICALL Java_org_lwjgl_openal_AL_nDestroy(JNIEnv *env, jclass clazz) { DeInitializeOpenAL(); } diff --git a/src/native/common/org_lwjgl_openal_AL.h b/src/native/common/org_lwjgl_openal_AL.h new file mode 100644 index 00000000..7f3c52c7 --- /dev/null +++ b/src/native/common/org_lwjgl_openal_AL.h @@ -0,0 +1,39 @@ +/* DO NOT EDIT THIS FILE - it is machine generated */ +#include +/* Header for class org_lwjgl_openal_AL */ + +#ifndef _Included_org_lwjgl_openal_AL +#define _Included_org_lwjgl_openal_AL +#ifdef __cplusplus +extern "C" { +#endif +/* Inaccessible static: alc */ +/* Inaccessible static: device */ +/* Inaccessible static: context */ +/* Inaccessible static: deviceArguments */ +/* Inaccessible static: contextFrequency */ +/* Inaccessible static: contextRefresh */ +/* Inaccessible static: contextSynchronized */ +/* Inaccessible static: created */ +/* Inaccessible static: class_000240 */ +/* Inaccessible static: class_000241 */ +/* + * Class: org_lwjgl_openal_AL + * Method: nCreate + * Signature: ([Ljava/lang/String;)V + */ +JNIEXPORT void JNICALL Java_org_lwjgl_openal_AL_nCreate + (JNIEnv *, jclass, jobjectArray); + +/* + * Class: org_lwjgl_openal_AL + * Method: nDestroy + * Signature: ()V + */ +JNIEXPORT void JNICALL Java_org_lwjgl_openal_AL_nDestroy + (JNIEnv *, jclass); + +#ifdef __cplusplus +} +#endif +#endif diff --git a/src/native/common/org_lwjgl_openal_CoreAL.cpp b/src/native/common/org_lwjgl_openal_AL10.cpp similarity index 70% rename from src/native/common/org_lwjgl_openal_CoreAL.cpp rename to src/native/common/org_lwjgl_openal_AL10.cpp index 2a37be10..7db4ea8b 100644 --- a/src/native/common/org_lwjgl_openal_CoreAL.cpp +++ b/src/native/common/org_lwjgl_openal_AL10.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002 Lightweight Java Game Library Project + * Copyright (c) 2002-2004 Lightweight Java Game Library Project * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -39,7 +39,7 @@ * @author Brian Matzon * @version $Revision$ */ -#include "org_lwjgl_openal_CoreAL.h" +#include "org_lwjgl_openal_AL10.h" /* OpenAL includes */ #include "checkALerror.h" @@ -51,7 +51,7 @@ * C Specification: * ALvoid alEnable(ALenum capability); */ -JNIEXPORT void JNICALL Java_org_lwjgl_openal_CoreAL_alEnable (JNIEnv *env, jclass clazz, jint capability) { +JNIEXPORT void JNICALL Java_org_lwjgl_openal_AL10_alEnable (JNIEnv *env, jclass clazz, jint capability) { alEnable((ALenum) capability); CHECK_AL_ERROR } @@ -62,7 +62,7 @@ JNIEXPORT void JNICALL Java_org_lwjgl_openal_CoreAL_alEnable (JNIEnv *env, jclas * C Specification: * ALvoid alDisable(ALenum capability); */ -JNIEXPORT void JNICALL Java_org_lwjgl_openal_CoreAL_alDisable (JNIEnv *env, jclass clazz, jint capability) { +JNIEXPORT void JNICALL Java_org_lwjgl_openal_AL10_alDisable (JNIEnv *env, jclass clazz, jint capability) { alDisable((ALenum) capability); CHECK_AL_ERROR } @@ -73,7 +73,7 @@ JNIEXPORT void JNICALL Java_org_lwjgl_openal_CoreAL_alDisable (JNIEnv *env, jcla * C Specification: * Alboolean alIsEnabled(ALenum capability); */ -JNIEXPORT jboolean JNICALL Java_org_lwjgl_openal_CoreAL_alIsEnabled (JNIEnv *env, jclass clazz, jint capability) { +JNIEXPORT jboolean JNICALL Java_org_lwjgl_openal_AL10_alIsEnabled (JNIEnv *env, jclass clazz, jint capability) { jboolean result = (jboolean) alIsEnabled((ALenum) capability); CHECK_AL_ERROR @@ -86,7 +86,7 @@ JNIEXPORT jboolean JNICALL Java_org_lwjgl_openal_CoreAL_alIsEnabled (JNIEnv *env * C Specification * ALvoid alHint(ALenum target, ALenum mode); */ -JNIEXPORT void JNICALL Java_org_lwjgl_openal_CoreAL_alHint (JNIEnv *env, jclass clazz, jint target, jint mode) { +JNIEXPORT 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 +99,7 @@ JNIEXPORT void JNICALL Java_org_lwjgl_openal_CoreAL_alHint (JNIEnv *env, jclass * C Specification: * Alboolean alGetBoolean(ALenum pname); */ -JNIEXPORT jboolean JNICALL Java_org_lwjgl_openal_CoreAL_alGetBoolean (JNIEnv *env, jclass clazz, jint pname) { +JNIEXPORT jboolean JNICALL Java_org_lwjgl_openal_AL10_alGetBoolean (JNIEnv *env, jclass clazz, jint pname) { jboolean result = (jboolean) alGetBoolean((ALenum) pname); CHECK_AL_ERROR @@ -112,7 +112,7 @@ JNIEXPORT jboolean JNICALL Java_org_lwjgl_openal_CoreAL_alGetBoolean (JNIEnv *en * C Specification: * Alint alGetInteger(ALenum pname); */ -JNIEXPORT jint JNICALL Java_org_lwjgl_openal_CoreAL_alGetInteger (JNIEnv *env, jclass clazz, jint pname) { +JNIEXPORT jint JNICALL Java_org_lwjgl_openal_AL10_alGetInteger (JNIEnv *env, jclass clazz, jint pname) { jint result = (jint) alGetInteger((ALenum) pname); CHECK_AL_ERROR @@ -125,7 +125,7 @@ JNIEXPORT jint JNICALL Java_org_lwjgl_openal_CoreAL_alGetInteger (JNIEnv *env, j * C Specification: * ALfloat alGetFloat(ALenum pname); */ -JNIEXPORT jfloat JNICALL Java_org_lwjgl_openal_CoreAL_alGetFloat (JNIEnv *env, jclass clazz, jint pname) { +JNIEXPORT 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 +138,7 @@ JNIEXPORT jfloat JNICALL Java_org_lwjgl_openal_CoreAL_alGetFloat (JNIEnv *env, j * C Specification: * ALvoid alGetFloatv(ALenum pname,ALfloat *data); */ -JNIEXPORT void JNICALL Java_org_lwjgl_openal_CoreAL_nalGetFloatv (JNIEnv *env, jclass clazz, jint pname, jobject data, int offset) { +JNIEXPORT 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 +149,7 @@ JNIEXPORT void JNICALL Java_org_lwjgl_openal_CoreAL_nalGetFloatv (JNIEnv *env, j * C Specification: * ALubyte * alGetString(ALenum pname); */ -JNIEXPORT jstring JNICALL Java_org_lwjgl_openal_CoreAL_alGetString (JNIEnv *env, jclass clazz, jint param) { +JNIEXPORT 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 +161,7 @@ JNIEXPORT jstring JNICALL Java_org_lwjgl_openal_CoreAL_alGetString (JNIEnv *env, * C Specification: * ALenum alGetError(ALvoid); */ -JNIEXPORT jint JNICALL Java_org_lwjgl_openal_CoreAL_alGetError (JNIEnv *env, jclass clazz) { +JNIEXPORT 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 +175,7 @@ JNIEXPORT jint JNICALL Java_org_lwjgl_openal_CoreAL_alGetError (JNIEnv *env, jcl * C Specification: * ALboolean alIsExtensionPresent(ALubyte *extName); */ -JNIEXPORT jboolean JNICALL Java_org_lwjgl_openal_CoreAL_alIsExtensionPresent (JNIEnv *env, jclass clazz, jstring fname) { +JNIEXPORT 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 +190,7 @@ JNIEXPORT jboolean JNICALL Java_org_lwjgl_openal_CoreAL_alIsExtensionPresent (JN * C Specification: * ALenum alGetEnumValue(ALubyte *enumName); */ -JNIEXPORT jint JNICALL Java_org_lwjgl_openal_CoreAL_alGetEnumValue (JNIEnv *env, jclass clazz, jstring ename) { +JNIEXPORT 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 +205,7 @@ JNIEXPORT jint JNICALL Java_org_lwjgl_openal_CoreAL_alGetEnumValue (JNIEnv *env, * C Specification: * ALvoid alListeneri(ALenum pname,ALint value); */ -JNIEXPORT void JNICALL Java_org_lwjgl_openal_CoreAL_alListeneri (JNIEnv *env, jclass clazz, jint pname, jint value) { +JNIEXPORT 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,17 +216,17 @@ JNIEXPORT void JNICALL Java_org_lwjgl_openal_CoreAL_alListeneri (JNIEnv *env, jc * C Specification: * ALvoid alListenerf(ALenum pname,ALfloat value); */ -JNIEXPORT void JNICALL Java_org_lwjgl_openal_CoreAL_alListenerf (JNIEnv *env, jclass clazz, jint pname, jfloat value) { +JNIEXPORT void JNICALL Java_org_lwjgl_openal_AL10_alListenerf (JNIEnv *env, jclass clazz, jint pname, jfloat value) { alListenerf((ALenum) pname, (ALfloat) value); CHECK_AL_ERROR } /* - * Class: org_lwjgl_openal_CoreAL + * Class: org_lwjgl_openal_AL10 * Method: nalListenerf * Signature: (ILjava/nio/FloatBuffer;I)V */ -JNIEXPORT void JNICALL Java_org_lwjgl_openal_CoreAL_nalListenerfv (JNIEnv *env, jclass clazz, jint pname, jobject values, jint offset) { +JNIEXPORT 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 +236,7 @@ JNIEXPORT void JNICALL Java_org_lwjgl_openal_CoreAL_nalListenerfv (JNIEnv *env, * C Specification: * ALvoid alListener3f(ALenum pname,ALfloat v1,ALfloat v2,ALfloat v3); */ -JNIEXPORT void JNICALL Java_org_lwjgl_openal_CoreAL_alListener3f (JNIEnv *env, jclass clazz, jint pname, jfloat v1, jfloat v2, jfloat v3) { +JNIEXPORT 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 +248,7 @@ JNIEXPORT void JNICALL Java_org_lwjgl_openal_CoreAL_alListener3f (JNIEnv *env, j * C Specification: * ALvoid alGetListeneri(ALenum pname,ALint *value); */ -JNIEXPORT jint JNICALL Java_org_lwjgl_openal_CoreAL_alGetListeneri (JNIEnv *env, jclass clazz, jint pname) { +JNIEXPORT 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 +261,7 @@ JNIEXPORT jint JNICALL Java_org_lwjgl_openal_CoreAL_alGetListeneri (JNIEnv *env, * C Specification: * ALvoid alGetListenerf(ALenum pname,ALfloat *value); */ -JNIEXPORT jfloat JNICALL Java_org_lwjgl_openal_CoreAL_alGetListenerf (JNIEnv *env, jclass clazz, jint pname) { +JNIEXPORT 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 +274,7 @@ JNIEXPORT jfloat JNICALL Java_org_lwjgl_openal_CoreAL_alGetListenerf (JNIEnv *en * C Specification: * ALvoid alGetListenerfv(ALenum pname,ALfloat *values); */ -JNIEXPORT void JNICALL Java_org_lwjgl_openal_CoreAL_nalGetListenerfv (JNIEnv *env, jclass clazz, jint pname, jobject values, jint offset) { +JNIEXPORT 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 +285,7 @@ JNIEXPORT void JNICALL Java_org_lwjgl_openal_CoreAL_nalGetListenerfv (JNIEnv *en * C Specification: * ALvoid alGenSources(ALsizei n,ALuint *sources); */ -JNIEXPORT void JNICALL Java_org_lwjgl_openal_CoreAL_nalGenSources (JNIEnv *env, jclass clazz, jint n, jobject sources, jint offset) { +JNIEXPORT 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 +296,7 @@ JNIEXPORT void JNICALL Java_org_lwjgl_openal_CoreAL_nalGenSources (JNIEnv *env, * C Specification: * ALvoid alDeleteSources(ALsizei n,ALuint *sources); */ -JNIEXPORT void JNICALL Java_org_lwjgl_openal_CoreAL_nalDeleteSources (JNIEnv *env, jclass clazz, jint n, jobject sources, jint offset) { +JNIEXPORT 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 +307,7 @@ JNIEXPORT void JNICALL Java_org_lwjgl_openal_CoreAL_nalDeleteSources (JNIEnv *en * C Specification: * Alboolean alIsSource(ALuint source); */ -JNIEXPORT jboolean JNICALL Java_org_lwjgl_openal_CoreAL_alIsSource (JNIEnv *env, jclass clazz, jint source) { +JNIEXPORT 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 +320,7 @@ JNIEXPORT jboolean JNICALL Java_org_lwjgl_openal_CoreAL_alIsSource (JNIEnv *env, * C Specification: * ALvoid alSourcei(ALuint source,ALenum pname,ALint value); */ -JNIEXPORT void JNICALL Java_org_lwjgl_openal_CoreAL_alSourcei (JNIEnv *env, jclass clazz, jint source, jint pname, jint value) { +JNIEXPORT 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,17 +331,17 @@ JNIEXPORT void JNICALL Java_org_lwjgl_openal_CoreAL_alSourcei (JNIEnv *env, jcla * C Specification: * ALvoid alSourcef(ALuint source,ALenum pname,ALfloat value); */ -JNIEXPORT void JNICALL Java_org_lwjgl_openal_CoreAL_alSourcef (JNIEnv *env, jclass clazz, jint source, jint pname, jfloat value) { +JNIEXPORT 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 } /* - * Class: org_lwjgl_openal_CoreAL + * Class: org_lwjgl_openal_AL10 * Method: nalSourcefv * Signature: (IILjava/nio/FloatBuffer;I)V */ -JNIEXPORT void JNICALL Java_org_lwjgl_openal_CoreAL_nalSourcefv (JNIEnv *env, jclass clazz, jint source, jint pname, jobject values, jint offset) { +JNIEXPORT 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 +352,7 @@ JNIEXPORT void JNICALL Java_org_lwjgl_openal_CoreAL_nalSourcefv (JNIEnv *env, jc * C Specification: * ALvoid alSource3f(ALuint source,ALenum pname,ALfloat v1,ALfloat v2,ALfloat v3); */ -JNIEXPORT void JNICALL Java_org_lwjgl_openal_CoreAL_alSource3f (JNIEnv *env, jclass clazz, jint source, jint pname, jfloat v1, jfloat v2, jfloat v3) { +JNIEXPORT 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 +363,7 @@ JNIEXPORT void JNICALL Java_org_lwjgl_openal_CoreAL_alSource3f (JNIEnv *env, jcl * C Specification: * ALvoid alGetSourcei(ALuint source,ALenum pname,ALint *value); */ -JNIEXPORT jint JNICALL Java_org_lwjgl_openal_CoreAL_alGetSourcei (JNIEnv *env, jclass clazz, jint source, jint pname) { +JNIEXPORT 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 +376,7 @@ JNIEXPORT jint JNICALL Java_org_lwjgl_openal_CoreAL_alGetSourcei (JNIEnv *env, j * C Specification: * ALvoid alGetSourcef(ALuint source,ALenum pname,ALfloat *value); */ -JNIEXPORT jfloat JNICALL Java_org_lwjgl_openal_CoreAL_alGetSourcef (JNIEnv *env, jclass clazz, jint source, jint pname) { +JNIEXPORT 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 +389,7 @@ JNIEXPORT jfloat JNICALL Java_org_lwjgl_openal_CoreAL_alGetSourcef (JNIEnv *env, * C Specification: * ALvoid alGetSourcefv(ALuint source,ALenum pname,ALfloat *values); */ -JNIEXPORT void JNICALL Java_org_lwjgl_openal_CoreAL_nalGetSourcefv (JNIEnv *env, jclass clazz, jint source, jint pname, jobject values, jint offset) { +JNIEXPORT 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 +400,7 @@ JNIEXPORT void JNICALL Java_org_lwjgl_openal_CoreAL_nalGetSourcefv (JNIEnv *env, * C Specification: * ALvoid alSourcePlayv(ALsizei n,ALuint *sources); */ -JNIEXPORT void JNICALL Java_org_lwjgl_openal_CoreAL_nalSourcePlayv (JNIEnv *env, jclass clazz, jint n, jobject sources, jint offset) { +JNIEXPORT 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 +411,7 @@ JNIEXPORT void JNICALL Java_org_lwjgl_openal_CoreAL_nalSourcePlayv (JNIEnv *env, * C Specification: * ALvoid alSourcePausev(ALsizei n,ALuint *sources); */ -JNIEXPORT void JNICALL Java_org_lwjgl_openal_CoreAL_nalSourcePausev (JNIEnv *env, jclass clazz, jint n, jobject sources, jint offset) { +JNIEXPORT 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 +422,7 @@ JNIEXPORT void JNICALL Java_org_lwjgl_openal_CoreAL_nalSourcePausev (JNIEnv *env * C Specification: * ALvoid alSourceStopv(ALsizei n,ALuint *sources); */ -JNIEXPORT void JNICALL Java_org_lwjgl_openal_CoreAL_nalSourceStopv (JNIEnv *env, jclass clazz, jint n, jobject sources, jint offset) { +JNIEXPORT 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 +433,7 @@ JNIEXPORT void JNICALL Java_org_lwjgl_openal_CoreAL_nalSourceStopv (JNIEnv *env, * C Specification: * ALvoid alSourceRewindv(ALsizei n,ALuint *sources); */ -JNIEXPORT void JNICALL Java_org_lwjgl_openal_CoreAL_nalSourceRewindv (JNIEnv *env, jclass clazz, jint n, jobject sources, jint offset) { +JNIEXPORT 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 +444,7 @@ JNIEXPORT void JNICALL Java_org_lwjgl_openal_CoreAL_nalSourceRewindv (JNIEnv *en * C Specification: * ALvoid alSourcePlay(ALuint source); */ -JNIEXPORT void JNICALL Java_org_lwjgl_openal_CoreAL_alSourcePlay (JNIEnv *env, jclass clazz, jint source) { +JNIEXPORT void JNICALL Java_org_lwjgl_openal_AL10_alSourcePlay (JNIEnv *env, jclass clazz, jint source) { alSourcePlay((ALuint) source); CHECK_AL_ERROR } @@ -455,7 +455,7 @@ JNIEXPORT void JNICALL Java_org_lwjgl_openal_CoreAL_alSourcePlay (JNIEnv *env, j * C Specification: * ALvoid alSourcePause(ALuint source); */ -JNIEXPORT void JNICALL Java_org_lwjgl_openal_CoreAL_alSourcePause (JNIEnv *env, jclass clazz, jint source) { +JNIEXPORT void JNICALL Java_org_lwjgl_openal_AL10_alSourcePause (JNIEnv *env, jclass clazz, jint source) { alSourcePause((ALuint) source); CHECK_AL_ERROR } @@ -466,7 +466,7 @@ JNIEXPORT void JNICALL Java_org_lwjgl_openal_CoreAL_alSourcePause (JNIEnv *env, * C Specification: * ALvoid alSourceStop(ALuint source); */ -JNIEXPORT void JNICALL Java_org_lwjgl_openal_CoreAL_alSourceStop (JNIEnv *env, jclass clazz, jint source) { +JNIEXPORT void JNICALL Java_org_lwjgl_openal_AL10_alSourceStop (JNIEnv *env, jclass clazz, jint source) { alSourceStop((ALuint) source); CHECK_AL_ERROR } @@ -477,7 +477,7 @@ JNIEXPORT void JNICALL Java_org_lwjgl_openal_CoreAL_alSourceStop (JNIEnv *env, j * C Specification: * ALvoid alSourceRewind(ALuint source); */ -JNIEXPORT void JNICALL Java_org_lwjgl_openal_CoreAL_alSourceRewind (JNIEnv *env, jclass clazz, jint source) { +JNIEXPORT void JNICALL Java_org_lwjgl_openal_AL10_alSourceRewind (JNIEnv *env, jclass clazz, jint source) { alSourceRewind((ALuint) source); CHECK_AL_ERROR } @@ -488,7 +488,7 @@ JNIEXPORT void JNICALL Java_org_lwjgl_openal_CoreAL_alSourceRewind (JNIEnv *env, * C Specification: * ALvoid alGenBuffers(ALsizei n,ALuint *buffers); */ -JNIEXPORT void JNICALL Java_org_lwjgl_openal_CoreAL_nalGenBuffers (JNIEnv *env, jclass clazz, jint n, jobject buffers, jint offset) { +JNIEXPORT 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 +499,7 @@ JNIEXPORT void JNICALL Java_org_lwjgl_openal_CoreAL_nalGenBuffers (JNIEnv *env, * C Specification: * ALvoid alDeleteBuffers(ALsizei n,ALuint *buffers); */ -JNIEXPORT void JNICALL Java_org_lwjgl_openal_CoreAL_nalDeleteBuffers (JNIEnv *env, jclass clazz, jint n, jobject buffers, jint offset) { +JNIEXPORT 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 +510,7 @@ JNIEXPORT void JNICALL Java_org_lwjgl_openal_CoreAL_nalDeleteBuffers (JNIEnv *en * C Specification: * Alboolean alIsBuffer(ALuint buffer); */ -JNIEXPORT jboolean JNICALL Java_org_lwjgl_openal_CoreAL_alIsBuffer (JNIEnv *env, jclass clazz, jint buffer) { +JNIEXPORT 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 +523,7 @@ JNIEXPORT jboolean JNICALL Java_org_lwjgl_openal_CoreAL_alIsBuffer (JNIEnv *env, * C Specification: * ALvoid alBufferData(ALuint buffer,ALenum format,ALvoid *data,ALsizei size,ALsizei freq); */ -JNIEXPORT void JNICALL Java_org_lwjgl_openal_CoreAL_nalBufferData (JNIEnv *env, jclass clazz, jint buffer, jint format, jobject data, jint offset, jint size, jint 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) { alBufferData(buffer, format, (void*) (offset + (ALubyte *)env->GetDirectBufferAddress(data)), size, freq); CHECK_AL_ERROR } @@ -534,7 +534,7 @@ JNIEXPORT void JNICALL Java_org_lwjgl_openal_CoreAL_nalBufferData (JNIEnv *env, * C Specification: * ALvoid alGetBufferi(ALuint buffer,ALenum pname,ALint *value); */ -JNIEXPORT jint JNICALL Java_org_lwjgl_openal_CoreAL_alGetBufferi (JNIEnv *env, jclass clazz, jint buffer, jint pname) { +JNIEXPORT 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 +547,7 @@ JNIEXPORT jint JNICALL Java_org_lwjgl_openal_CoreAL_alGetBufferi (JNIEnv *env, j * C Specification: * ALvoid alGetBufferf(ALuint buffer,ALenum pname,ALfloat *value); */ -JNIEXPORT jfloat JNICALL Java_org_lwjgl_openal_CoreAL_alGetBufferf (JNIEnv *env, jclass clazz, jint buffer, jint pname) { +JNIEXPORT 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 +560,7 @@ JNIEXPORT jfloat JNICALL Java_org_lwjgl_openal_CoreAL_alGetBufferf (JNIEnv *env, * C Specification: * ALvoid alSourceQueueBuffers( ALuint source, ALsizei n, ALuint* buffers ); */ -JNIEXPORT void JNICALL Java_org_lwjgl_openal_CoreAL_nalSourceQueueBuffers (JNIEnv *env, jclass clazz, jint source, jint n, jobject buffers, jint offset) { +JNIEXPORT 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 +571,7 @@ JNIEXPORT void JNICALL Java_org_lwjgl_openal_CoreAL_nalSourceQueueBuffers (JNIEn * C Specification: * ALvoid alSourceUnqueueBuffers( ALuint source, ALsizei n, ALuint* buffers ); */ -JNIEXPORT void JNICALL Java_org_lwjgl_openal_CoreAL_nalSourceUnqueueBuffers (JNIEnv *env, jclass clazz, jint source, jint n, jobject buffers, jint offset) { +JNIEXPORT 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 +583,7 @@ JNIEXPORT void JNICALL Java_org_lwjgl_openal_CoreAL_nalSourceUnqueueBuffers (JNI * ALvoid alDistanceModel( ALenum value ); */ -JNIEXPORT void JNICALL Java_org_lwjgl_openal_CoreAL_alDistanceModel (JNIEnv *env, jclass clazz, jint value) { +JNIEXPORT void JNICALL Java_org_lwjgl_openal_AL10_alDistanceModel (JNIEnv *env, jclass clazz, jint value) { alDistanceModel((ALenum) value); CHECK_AL_ERROR } @@ -594,7 +594,7 @@ JNIEXPORT void JNICALL Java_org_lwjgl_openal_CoreAL_alDistanceModel (JNIEnv *env * C Specification: * ALvoid alDopplerFactor( ALfloat value ); */ -JNIEXPORT void JNICALL Java_org_lwjgl_openal_CoreAL_alDopplerFactor (JNIEnv *env, jclass clazz, jfloat value) { +JNIEXPORT void JNICALL Java_org_lwjgl_openal_AL10_alDopplerFactor (JNIEnv *env, jclass clazz, jfloat value) { alDopplerFactor((ALfloat) value); CHECK_AL_ERROR } @@ -605,7 +605,7 @@ JNIEXPORT void JNICALL Java_org_lwjgl_openal_CoreAL_alDopplerFactor (JNIEnv *env * C Specification: * ALvoid alDopplerVelocity( ALfloat value ); */ -JNIEXPORT void JNICALL Java_org_lwjgl_openal_CoreAL_alDopplerVelocity (JNIEnv *env, jclass clazz, jfloat value) { +JNIEXPORT void JNICALL Java_org_lwjgl_openal_AL10_alDopplerVelocity (JNIEnv *env, jclass clazz, jfloat value) { alDopplerVelocity((ALfloat) value); CHECK_AL_ERROR } diff --git a/src/native/common/org_lwjgl_openal_AL10.h b/src/native/common/org_lwjgl_openal_AL10.h new file mode 100644 index 00000000..5851c976 --- /dev/null +++ b/src/native/common/org_lwjgl_openal_AL10.h @@ -0,0 +1,533 @@ +/* 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_000240 */ +/* + * 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_BaseAL.h b/src/native/common/org_lwjgl_openal_BaseAL.h deleted file mode 100644 index 5083cf45..00000000 --- a/src/native/common/org_lwjgl_openal_BaseAL.h +++ /dev/null @@ -1,32 +0,0 @@ -/* DO NOT EDIT THIS FILE - it is machine generated */ -#include -/* Header for class org_lwjgl_openal_BaseAL */ - -#ifndef _Included_org_lwjgl_openal_BaseAL -#define _Included_org_lwjgl_openal_BaseAL -#ifdef __cplusplus -extern "C" { -#endif -/* Inaccessible static: created */ -/* Inaccessible static: class_00024org_00024lwjgl_00024openal_00024BaseAL */ -/* Inaccessible static: class_00024java_00024lang_00024String */ -/* - * Class: org_lwjgl_openal_BaseAL - * Method: nCreate - * Signature: ([Ljava/lang/String;)V - */ -JNIEXPORT void JNICALL Java_org_lwjgl_openal_BaseAL_nCreate - (JNIEnv *, jclass, jobjectArray); - -/* - * Class: org_lwjgl_openal_BaseAL - * Method: nDestroy - * Signature: ()V - */ -JNIEXPORT void JNICALL Java_org_lwjgl_openal_BaseAL_nDestroy - (JNIEnv *, jclass); - -#ifdef __cplusplus -} -#endif -#endif diff --git a/src/native/common/org_lwjgl_openal_CoreAL.h b/src/native/common/org_lwjgl_openal_CoreAL.h deleted file mode 100644 index 36f42045..00000000 --- a/src/native/common/org_lwjgl_openal_CoreAL.h +++ /dev/null @@ -1,418 +0,0 @@ -/* 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 -/* Inaccessible static: created */ -/* Inaccessible static: class_00024org_00024lwjgl_00024openal_00024BaseAL */ -/* Inaccessible static: class_00024java_00024lang_00024String */ -/* Inaccessible static: _00024assertionsDisabled */ -/* Inaccessible static: class_00024org_00024lwjgl_00024openal_00024CoreAL */ -/* - * Class: org_lwjgl_openal_CoreAL - * Method: alEnable - * Signature: (I)V - */ -JNIEXPORT void JNICALL Java_org_lwjgl_openal_CoreAL_alEnable - (JNIEnv *, jclass, jint); - -/* - * Class: org_lwjgl_openal_CoreAL - * Method: alDisable - * Signature: (I)V - */ -JNIEXPORT void JNICALL Java_org_lwjgl_openal_CoreAL_alDisable - (JNIEnv *, jclass, jint); - -/* - * Class: org_lwjgl_openal_CoreAL - * Method: alIsEnabled - * Signature: (I)Z - */ -JNIEXPORT jboolean JNICALL Java_org_lwjgl_openal_CoreAL_alIsEnabled - (JNIEnv *, jclass, jint); - -/* - * Class: org_lwjgl_openal_CoreAL - * Method: alHint - * Signature: (II)V - */ -JNIEXPORT void JNICALL Java_org_lwjgl_openal_CoreAL_alHint - (JNIEnv *, jclass, jint, jint); - -/* - * Class: org_lwjgl_openal_CoreAL - * Method: alGetBoolean - * Signature: (I)Z - */ -JNIEXPORT jboolean JNICALL Java_org_lwjgl_openal_CoreAL_alGetBoolean - (JNIEnv *, jclass, jint); - -/* - * Class: org_lwjgl_openal_CoreAL - * Method: alGetInteger - * Signature: (I)I - */ -JNIEXPORT jint JNICALL Java_org_lwjgl_openal_CoreAL_alGetInteger - (JNIEnv *, jclass, jint); - -/* - * Class: org_lwjgl_openal_CoreAL - * Method: alGetFloat - * Signature: (I)F - */ -JNIEXPORT jfloat JNICALL Java_org_lwjgl_openal_CoreAL_alGetFloat - (JNIEnv *, jclass, jint); - -/* - * Class: org_lwjgl_openal_CoreAL - * Method: nalGetBooleanv - * Signature: (ILjava/nio/ByteBuffer;I)V - */ -JNIEXPORT void JNICALL Java_org_lwjgl_openal_CoreAL_nalGetBooleanv - (JNIEnv *, jclass, jint, jobject, jint); - -/* - * Class: org_lwjgl_openal_CoreAL - * Method: nalGetIntegerv - * Signature: (ILjava/nio/IntBuffer;I)V - */ -JNIEXPORT void JNICALL Java_org_lwjgl_openal_CoreAL_nalGetIntegerv - (JNIEnv *, jclass, jint, jobject, jint); - -/* - * Class: org_lwjgl_openal_CoreAL - * Method: nalGetFloatv - * Signature: (ILjava/nio/FloatBuffer;I)V - */ -JNIEXPORT void JNICALL Java_org_lwjgl_openal_CoreAL_nalGetFloatv - (JNIEnv *, jclass, jint, jobject, jint); - -/* - * Class: org_lwjgl_openal_CoreAL - * Method: alGetString - * Signature: (I)Ljava/lang/String; - */ -JNIEXPORT jstring JNICALL Java_org_lwjgl_openal_CoreAL_alGetString - (JNIEnv *, jclass, jint); - -/* - * Class: org_lwjgl_openal_CoreAL - * Method: alGetError - * Signature: ()I - */ -JNIEXPORT jint JNICALL Java_org_lwjgl_openal_CoreAL_alGetError - (JNIEnv *, jclass); - -/* - * Class: org_lwjgl_openal_CoreAL - * Method: alIsExtensionPresent - * Signature: (Ljava/lang/String;)Z - */ -JNIEXPORT jboolean JNICALL Java_org_lwjgl_openal_CoreAL_alIsExtensionPresent - (JNIEnv *, jclass, jstring); - -/* - * Class: org_lwjgl_openal_CoreAL - * Method: alGetEnumValue - * Signature: (Ljava/lang/String;)I - */ -JNIEXPORT jint JNICALL Java_org_lwjgl_openal_CoreAL_alGetEnumValue - (JNIEnv *, jclass, jstring); - -/* - * Class: org_lwjgl_openal_CoreAL - * Method: alListeneri - * Signature: (II)V - */ -JNIEXPORT void JNICALL Java_org_lwjgl_openal_CoreAL_alListeneri - (JNIEnv *, jclass, jint, jint); - -/* - * Class: org_lwjgl_openal_CoreAL - * Method: alListenerf - * Signature: (IF)V - */ -JNIEXPORT void JNICALL Java_org_lwjgl_openal_CoreAL_alListenerf - (JNIEnv *, jclass, jint, jfloat); - -/* - * Class: org_lwjgl_openal_CoreAL - * Method: nalListenerfv - * Signature: (ILjava/nio/FloatBuffer;I)V - */ -JNIEXPORT void JNICALL Java_org_lwjgl_openal_CoreAL_nalListenerfv - (JNIEnv *, jclass, jint, jobject, jint); - -/* - * Class: org_lwjgl_openal_CoreAL - * Method: alListener3f - * Signature: (IFFF)V - */ -JNIEXPORT void JNICALL Java_org_lwjgl_openal_CoreAL_alListener3f - (JNIEnv *, jclass, jint, jfloat, jfloat, jfloat); - -/* - * Class: org_lwjgl_openal_CoreAL - * Method: alGetListeneri - * Signature: (I)I - */ -JNIEXPORT jint JNICALL Java_org_lwjgl_openal_CoreAL_alGetListeneri - (JNIEnv *, jclass, jint); - -/* - * Class: org_lwjgl_openal_CoreAL - * Method: alGetListenerf - * Signature: (I)F - */ -JNIEXPORT jfloat JNICALL Java_org_lwjgl_openal_CoreAL_alGetListenerf - (JNIEnv *, jclass, jint); - -/* - * Class: org_lwjgl_openal_CoreAL - * Method: nalGetListenerfv - * Signature: (ILjava/nio/FloatBuffer;I)V - */ -JNIEXPORT void JNICALL Java_org_lwjgl_openal_CoreAL_nalGetListenerfv - (JNIEnv *, jclass, jint, jobject, jint); - -/* - * Class: org_lwjgl_openal_CoreAL - * Method: nalGenSources - * Signature: (ILjava/nio/IntBuffer;I)V - */ -JNIEXPORT void JNICALL Java_org_lwjgl_openal_CoreAL_nalGenSources - (JNIEnv *, jclass, jint, jobject, jint); - -/* - * Class: org_lwjgl_openal_CoreAL - * Method: nalDeleteSources - * Signature: (ILjava/nio/IntBuffer;I)V - */ -JNIEXPORT void JNICALL Java_org_lwjgl_openal_CoreAL_nalDeleteSources - (JNIEnv *, jclass, jint, jobject, jint); - -/* - * Class: org_lwjgl_openal_CoreAL - * Method: alIsSource - * Signature: (I)Z - */ -JNIEXPORT jboolean JNICALL Java_org_lwjgl_openal_CoreAL_alIsSource - (JNIEnv *, jclass, jint); - -/* - * Class: org_lwjgl_openal_CoreAL - * Method: alSourcei - * Signature: (III)V - */ -JNIEXPORT void JNICALL Java_org_lwjgl_openal_CoreAL_alSourcei - (JNIEnv *, jclass, jint, jint, jint); - -/* - * Class: org_lwjgl_openal_CoreAL - * Method: alSourcef - * Signature: (IIF)V - */ -JNIEXPORT void JNICALL Java_org_lwjgl_openal_CoreAL_alSourcef - (JNIEnv *, jclass, jint, jint, jfloat); - -/* - * Class: org_lwjgl_openal_CoreAL - * Method: nalSourcefv - * Signature: (IILjava/nio/FloatBuffer;I)V - */ -JNIEXPORT void JNICALL Java_org_lwjgl_openal_CoreAL_nalSourcefv - (JNIEnv *, jclass, jint, jint, jobject, jint); - -/* - * Class: org_lwjgl_openal_CoreAL - * Method: alSource3f - * Signature: (IIFFF)V - */ -JNIEXPORT void JNICALL Java_org_lwjgl_openal_CoreAL_alSource3f - (JNIEnv *, jclass, jint, jint, jfloat, jfloat, jfloat); - -/* - * Class: org_lwjgl_openal_CoreAL - * Method: alGetSourcei - * Signature: (II)I - */ -JNIEXPORT jint JNICALL Java_org_lwjgl_openal_CoreAL_alGetSourcei - (JNIEnv *, jclass, jint, jint); - -/* - * Class: org_lwjgl_openal_CoreAL - * Method: alGetSourcef - * Signature: (II)F - */ -JNIEXPORT jfloat JNICALL Java_org_lwjgl_openal_CoreAL_alGetSourcef - (JNIEnv *, jclass, jint, jint); - -/* - * Class: org_lwjgl_openal_CoreAL - * Method: nalGetSourcefv - * Signature: (IILjava/nio/FloatBuffer;I)V - */ -JNIEXPORT void JNICALL Java_org_lwjgl_openal_CoreAL_nalGetSourcefv - (JNIEnv *, jclass, jint, jint, jobject, jint); - -/* - * Class: org_lwjgl_openal_CoreAL - * Method: nalSourcePlayv - * Signature: (ILjava/nio/IntBuffer;I)V - */ -JNIEXPORT void JNICALL Java_org_lwjgl_openal_CoreAL_nalSourcePlayv - (JNIEnv *, jclass, jint, jobject, jint); - -/* - * Class: org_lwjgl_openal_CoreAL - * Method: nalSourcePausev - * Signature: (ILjava/nio/IntBuffer;I)V - */ -JNIEXPORT void JNICALL Java_org_lwjgl_openal_CoreAL_nalSourcePausev - (JNIEnv *, jclass, jint, jobject, jint); - -/* - * Class: org_lwjgl_openal_CoreAL - * Method: nalSourceStopv - * Signature: (ILjava/nio/IntBuffer;I)V - */ -JNIEXPORT void JNICALL Java_org_lwjgl_openal_CoreAL_nalSourceStopv - (JNIEnv *, jclass, jint, jobject, jint); - -/* - * Class: org_lwjgl_openal_CoreAL - * Method: nalSourceRewindv - * Signature: (ILjava/nio/IntBuffer;I)V - */ -JNIEXPORT void JNICALL Java_org_lwjgl_openal_CoreAL_nalSourceRewindv - (JNIEnv *, jclass, jint, jobject, jint); - -/* - * Class: org_lwjgl_openal_CoreAL - * Method: alSourcePlay - * Signature: (I)V - */ -JNIEXPORT void JNICALL Java_org_lwjgl_openal_CoreAL_alSourcePlay - (JNIEnv *, jclass, jint); - -/* - * Class: org_lwjgl_openal_CoreAL - * Method: alSourcePause - * Signature: (I)V - */ -JNIEXPORT void JNICALL Java_org_lwjgl_openal_CoreAL_alSourcePause - (JNIEnv *, jclass, jint); - -/* - * Class: org_lwjgl_openal_CoreAL - * Method: alSourceStop - * Signature: (I)V - */ -JNIEXPORT void JNICALL Java_org_lwjgl_openal_CoreAL_alSourceStop - (JNIEnv *, jclass, jint); - -/* - * Class: org_lwjgl_openal_CoreAL - * Method: alSourceRewind - * Signature: (I)V - */ -JNIEXPORT void JNICALL Java_org_lwjgl_openal_CoreAL_alSourceRewind - (JNIEnv *, jclass, jint); - -/* - * Class: org_lwjgl_openal_CoreAL - * Method: nalGenBuffers - * Signature: (ILjava/nio/IntBuffer;I)V - */ -JNIEXPORT void JNICALL Java_org_lwjgl_openal_CoreAL_nalGenBuffers - (JNIEnv *, jclass, jint, jobject, jint); - -/* - * Class: org_lwjgl_openal_CoreAL - * Method: nalDeleteBuffers - * Signature: (ILjava/nio/IntBuffer;I)V - */ -JNIEXPORT void JNICALL Java_org_lwjgl_openal_CoreAL_nalDeleteBuffers - (JNIEnv *, jclass, jint, jobject, jint); - -/* - * Class: org_lwjgl_openal_CoreAL - * Method: alIsBuffer - * Signature: (I)Z - */ -JNIEXPORT jboolean JNICALL Java_org_lwjgl_openal_CoreAL_alIsBuffer - (JNIEnv *, jclass, jint); - -/* - * Class: org_lwjgl_openal_CoreAL - * Method: nalBufferData - * Signature: (IILjava/nio/ByteBuffer;III)V - */ -JNIEXPORT void JNICALL Java_org_lwjgl_openal_CoreAL_nalBufferData - (JNIEnv *, jclass, jint, jint, jobject, jint, jint, jint); - -/* - * Class: org_lwjgl_openal_CoreAL - * Method: alGetBufferi - * Signature: (II)I - */ -JNIEXPORT jint JNICALL Java_org_lwjgl_openal_CoreAL_alGetBufferi - (JNIEnv *, jclass, jint, jint); - -/* - * Class: org_lwjgl_openal_CoreAL - * Method: alGetBufferf - * Signature: (II)F - */ -JNIEXPORT jfloat JNICALL Java_org_lwjgl_openal_CoreAL_alGetBufferf - (JNIEnv *, jclass, jint, jint); - -/* - * Class: org_lwjgl_openal_CoreAL - * Method: nalSourceQueueBuffers - * Signature: (IILjava/nio/IntBuffer;I)V - */ -JNIEXPORT void JNICALL Java_org_lwjgl_openal_CoreAL_nalSourceQueueBuffers - (JNIEnv *, jclass, jint, jint, jobject, jint); - -/* - * Class: org_lwjgl_openal_CoreAL - * Method: nalSourceUnqueueBuffers - * Signature: (IILjava/nio/IntBuffer;I)V - */ -JNIEXPORT void JNICALL Java_org_lwjgl_openal_CoreAL_nalSourceUnqueueBuffers - (JNIEnv *, jclass, jint, jint, jobject, jint); - -/* - * Class: org_lwjgl_openal_CoreAL - * Method: alDistanceModel - * Signature: (I)V - */ -JNIEXPORT void JNICALL Java_org_lwjgl_openal_CoreAL_alDistanceModel - (JNIEnv *, jclass, jint); - -/* - * Class: org_lwjgl_openal_CoreAL - * Method: alDopplerFactor - * Signature: (F)V - */ -JNIEXPORT void JNICALL Java_org_lwjgl_openal_CoreAL_alDopplerFactor - (JNIEnv *, jclass, jfloat); - -/* - * Class: org_lwjgl_openal_CoreAL - * Method: alDopplerVelocity - * Signature: (F)V - */ -JNIEXPORT void JNICALL Java_org_lwjgl_openal_CoreAL_alDopplerVelocity - (JNIEnv *, jclass, jfloat); - -#ifdef __cplusplus -} -#endif -#endif diff --git a/src/native/common/org_lwjgl_openal_eax_BaseEAX.h b/src/native/common/org_lwjgl_openal_eax_BaseEAX.h deleted file mode 100644 index 3bc4cde8..00000000 --- a/src/native/common/org_lwjgl_openal_eax_BaseEAX.h +++ /dev/null @@ -1,30 +0,0 @@ -/* DO NOT EDIT THIS FILE - it is machine generated */ -#include -/* Header for class org_lwjgl_openal_eax_BaseEAX */ - -#ifndef _Included_org_lwjgl_openal_eax_BaseEAX -#define _Included_org_lwjgl_openal_eax_BaseEAX -#ifdef __cplusplus -extern "C" { -#endif -/* Inaccessible static: created */ -/* - * Class: org_lwjgl_openal_eax_BaseEAX - * Method: nCreate - * Signature: ()Z - */ -JNIEXPORT jboolean JNICALL Java_org_lwjgl_openal_eax_BaseEAX_nCreate - (JNIEnv *, jclass); - -/* - * Class: org_lwjgl_openal_eax_BaseEAX - * Method: nDestroy - * Signature: ()V - */ -JNIEXPORT void JNICALL Java_org_lwjgl_openal_eax_BaseEAX_nDestroy - (JNIEnv *, jclass); - -#ifdef __cplusplus -} -#endif -#endif diff --git a/src/native/common/org_lwjgl_openal_eax_CoreEAX.h b/src/native/common/org_lwjgl_openal_eax_CoreEAX.h deleted file mode 100644 index 7c49338a..00000000 --- a/src/native/common/org_lwjgl_openal_eax_CoreEAX.h +++ /dev/null @@ -1,42 +0,0 @@ -/* DO NOT EDIT THIS FILE - it is machine generated */ -#include -/* Header for class org_lwjgl_openal_eax_CoreEAX */ - -#ifndef _Included_org_lwjgl_openal_eax_CoreEAX -#define _Included_org_lwjgl_openal_eax_CoreEAX -#ifdef __cplusplus -extern "C" { -#endif -/* Inaccessible static: created */ -#undef org_lwjgl_openal_eax_CoreEAX_BUFFER_GUID -#define org_lwjgl_openal_eax_CoreEAX_BUFFER_GUID 1L -#undef org_lwjgl_openal_eax_CoreEAX_LISTENER_GUID -#define org_lwjgl_openal_eax_CoreEAX_LISTENER_GUID 2L -/* - * Class: org_lwjgl_openal_eax_CoreEAX - * Method: determineAvailableExtensions - * Signature: ()V - */ -JNIEXPORT void JNICALL Java_org_lwjgl_openal_eax_CoreEAX_determineAvailableExtensions - (JNIEnv *, jclass); - -/* - * Class: org_lwjgl_openal_eax_CoreEAX - * Method: neaxGet - * Signature: (IIILjava/nio/Buffer;II)I - */ -JNIEXPORT jint JNICALL Java_org_lwjgl_openal_eax_CoreEAX_neaxGet - (JNIEnv *, jclass, jint, jint, jint, jobject, jint, jint); - -/* - * Class: org_lwjgl_openal_eax_CoreEAX - * Method: neaxSet - * Signature: (IIILjava/nio/Buffer;II)I - */ -JNIEXPORT jint JNICALL Java_org_lwjgl_openal_eax_CoreEAX_neaxSet - (JNIEnv *, jclass, jint, jint, jint, jobject, jint, jint); - -#ifdef __cplusplus -} -#endif -#endif diff --git a/src/native/common/org_lwjgl_openal_eax_BaseEAX.cpp b/src/native/common/org_lwjgl_openal_eax_EAX.cpp similarity index 81% rename from src/native/common/org_lwjgl_openal_eax_BaseEAX.cpp rename to src/native/common/org_lwjgl_openal_eax_EAX.cpp index af2f724d..5c97c73c 100644 --- a/src/native/common/org_lwjgl_openal_eax_BaseEAX.cpp +++ b/src/native/common/org_lwjgl_openal_eax_EAX.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002 Lightweight Java Game Library Project + * Copyright (c) 2002-2004 Lightweight Java Game Library Project * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -30,14 +30,14 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "org_lwjgl_openal_eax_BaseEAX.h" +#include "org_lwjgl_openal_eax_EAX.h" /* - * Class: org_lwjgl_openal_eax_BaseEAX + * Class: org_lwjgl_openal_eax_EAX * Method: nCreate * Signature: ()Z */ -JNIEXPORT jboolean JNICALL Java_org_lwjgl_openal_eax_BaseEAX_nCreate (JNIEnv *env, jclass clazz) { +JNIEXPORT jboolean JNICALL Java_org_lwjgl_openal_eax_EAX_nCreate (JNIEnv *env, jclass clazz) { #ifdef _WIN32 return true; #else @@ -46,9 +46,9 @@ JNIEXPORT jboolean JNICALL Java_org_lwjgl_openal_eax_BaseEAX_nCreate (JNIEnv *en } /* - * Class: org_lwjgl_openal_eax_BaseEAX + * Class: org_lwjgl_openal_eax_EAX * Method: nDestroy * Signature: ()V */ -JNIEXPORT void JNICALL Java_org_lwjgl_openal_eax_BaseEAX_nDestroy (JNIEnv *env, jclass clazz) { +JNIEXPORT void JNICALL Java_org_lwjgl_openal_eax_EAX_nDestroy (JNIEnv *env, jclass clazz) { } diff --git a/src/native/common/org_lwjgl_openal_eax_EAX.h b/src/native/common/org_lwjgl_openal_eax_EAX.h new file mode 100644 index 00000000..783797f2 --- /dev/null +++ b/src/native/common/org_lwjgl_openal_eax_EAX.h @@ -0,0 +1,30 @@ +/* DO NOT EDIT THIS FILE - it is machine generated */ +#include +/* Header for class org_lwjgl_openal_eax_EAX */ + +#ifndef _Included_org_lwjgl_openal_eax_EAX +#define _Included_org_lwjgl_openal_eax_EAX +#ifdef __cplusplus +extern "C" { +#endif +/* Inaccessible static: created */ +/* + * Class: org_lwjgl_openal_eax_EAX + * Method: nCreate + * Signature: ()Z + */ +JNIEXPORT jboolean JNICALL Java_org_lwjgl_openal_eax_EAX_nCreate + (JNIEnv *, jclass); + +/* + * Class: org_lwjgl_openal_eax_EAX + * Method: nDestroy + * Signature: ()V + */ +JNIEXPORT void JNICALL Java_org_lwjgl_openal_eax_EAX_nDestroy + (JNIEnv *, jclass); + +#ifdef __cplusplus +} +#endif +#endif diff --git a/src/native/common/org_lwjgl_openal_eax_CoreEAX.cpp b/src/native/common/org_lwjgl_openal_eax_EAX20.cpp similarity index 82% rename from src/native/common/org_lwjgl_openal_eax_CoreEAX.cpp rename to src/native/common/org_lwjgl_openal_eax_EAX20.cpp index 20c83608..65cb9ff2 100644 --- a/src/native/common/org_lwjgl_openal_eax_CoreEAX.cpp +++ b/src/native/common/org_lwjgl_openal_eax_EAX20.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002 Lightweight Java Game Library Project + * Copyright (c) 2002-2004 Lightweight Java Game Library Project * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -38,7 +38,7 @@ * @author Brian Matzon * @version $Revision$ */ -#include "org_lwjgl_openal_eax_CoreEAX.h" +#include "org_lwjgl_openal_eax_EAX20.h" /* OpenAL includes */ #include "checkALerror.h" @@ -48,9 +48,8 @@ /* * Determines available EAX extensions */ -JNIEXPORT void JNICALL Java_org_lwjgl_openal_eax_CoreEAX_determineAvailableExtensions (JNIEnv *env, jclass clazz) { +JNIEXPORT void JNICALL Java_org_lwjgl_openal_eax_EAX20_determineAvailableExtensions (JNIEnv *env, jclass clazz) { #ifdef _WIN32 - bool EAXSupported = false; //check that we have a current context @@ -81,14 +80,14 @@ JNIEXPORT void JNICALL Java_org_lwjgl_openal_eax_CoreEAX_determineAvailableExten * ALenum EAXGet(const struct _GUID *propertySetID,ALuint property,ALuint source,ALvoid * *value,ALuint size); */ -JNIEXPORT jint JNICALL Java_org_lwjgl_openal_eax_CoreEAX_neaxGet (JNIEnv *env, jclass clazz, jint propertySetID, jint property, jint source, jobject value, jint offset, jint size) { +JNIEXPORT jint JNICALL Java_org_lwjgl_openal_eax_EAX20_neaxGet (JNIEnv *env, jclass clazz, jint propertySetID, jint property, jint source, jobject value, jint offset, jint size) { #ifdef _WIN32 jint result = 0; // determine buffer or listener - if (propertySetID == org_lwjgl_openal_eax_CoreEAX_BUFFER_GUID) { + if (propertySetID == org_lwjgl_openal_eax_EAX20_BUFFER_GUID) { result = (jint) eaxGet(&DSPROPSETID_EAX20_BufferProperties, (ALuint) property, (ALuint) source, (ALvoid*) (offset + (const char*) env->GetDirectBufferAddress(value)), (ALuint) size); - } else if (propertySetID == org_lwjgl_openal_eax_CoreEAX_LISTENER_GUID) { + } else if (propertySetID == org_lwjgl_openal_eax_EAX20_LISTENER_GUID) { result = (jint) eaxGet(&DSPROPSETID_EAX20_ListenerProperties, (ALuint) property, (ALuint) source, (ALvoid*) (offset + (const char*) env->GetDirectBufferAddress(value)), (ALuint) size); } CHECK_AL_ERROR @@ -106,14 +105,14 @@ JNIEXPORT jint JNICALL Java_org_lwjgl_openal_eax_CoreEAX_neaxGet (JNIEnv *env, j * ALenum EAXSet(const struct _GUID *propertySetID,ALuint property,ALuint source,ALvoid * *value,ALuint size); */ -JNIEXPORT jint JNICALL Java_org_lwjgl_openal_eax_CoreEAX_neaxSet (JNIEnv *env, jclass clazz, jint propertySetID, jint property, jint source, jobject value, jint offset, jint size) { +JNIEXPORT jint JNICALL Java_org_lwjgl_openal_eax_EAX20_neaxSet (JNIEnv *env, jclass clazz, jint propertySetID, jint property, jint source, jobject value, jint offset, jint size) { #ifdef _WIN32 jint result = 0; // determine buffer or listener - if (propertySetID == org_lwjgl_openal_eax_CoreEAX_BUFFER_GUID) { + if (propertySetID == org_lwjgl_openal_eax_EAX20_BUFFER_GUID) { result = (jint) eaxSet(&DSPROPSETID_EAX20_BufferProperties, (ALuint) (property), source, (ALvoid*) (offset + (const char*) env->GetDirectBufferAddress(value)), (ALuint) size); - } else if (propertySetID == org_lwjgl_openal_eax_CoreEAX_LISTENER_GUID) { + } else if (propertySetID == org_lwjgl_openal_eax_EAX20_LISTENER_GUID) { result = (jint) eaxSet(&DSPROPSETID_EAX20_ListenerProperties, (ALuint) (property), source, (ALvoid*) (offset + (const char*) env->GetDirectBufferAddress(value)), (ALuint) size); } CHECK_AL_ERROR diff --git a/src/native/common/org_lwjgl_openal_eax_EAX20.h b/src/native/common/org_lwjgl_openal_eax_EAX20.h new file mode 100644 index 00000000..52d26806 --- /dev/null +++ b/src/native/common/org_lwjgl_openal_eax_EAX20.h @@ -0,0 +1,143 @@ +/* DO NOT EDIT THIS FILE - it is machine generated */ +#include +/* Header for class org_lwjgl_openal_eax_EAX20 */ + +#ifndef _Included_org_lwjgl_openal_eax_EAX20 +#define _Included_org_lwjgl_openal_eax_EAX20 +#ifdef __cplusplus +extern "C" { +#endif +#undef org_lwjgl_openal_eax_EAX20_BUFFER_GUID +#define org_lwjgl_openal_eax_EAX20_BUFFER_GUID 1L +#undef org_lwjgl_openal_eax_EAX20_LISTENER_GUID +#define org_lwjgl_openal_eax_EAX20_LISTENER_GUID 2L +#undef org_lwjgl_openal_eax_EAX20_EAX_ENVIRONMENT_GENERIC +#define org_lwjgl_openal_eax_EAX20_EAX_ENVIRONMENT_GENERIC 0L +#undef org_lwjgl_openal_eax_EAX20_EAX_ENVIRONMENT_PADDEDCELL +#define org_lwjgl_openal_eax_EAX20_EAX_ENVIRONMENT_PADDEDCELL 1L +#undef org_lwjgl_openal_eax_EAX20_EAX_ENVIRONMENT_ROOM +#define org_lwjgl_openal_eax_EAX20_EAX_ENVIRONMENT_ROOM 2L +#undef org_lwjgl_openal_eax_EAX20_EAX_ENVIRONMENT_BATHROOM +#define org_lwjgl_openal_eax_EAX20_EAX_ENVIRONMENT_BATHROOM 3L +#undef org_lwjgl_openal_eax_EAX20_EAX_ENVIRONMENT_LIVINGROOM +#define org_lwjgl_openal_eax_EAX20_EAX_ENVIRONMENT_LIVINGROOM 4L +#undef org_lwjgl_openal_eax_EAX20_EAX_ENVIRONMENT_STONEROOM +#define org_lwjgl_openal_eax_EAX20_EAX_ENVIRONMENT_STONEROOM 5L +#undef org_lwjgl_openal_eax_EAX20_EAX_ENVIRONMENT_AUDITORIUM +#define org_lwjgl_openal_eax_EAX20_EAX_ENVIRONMENT_AUDITORIUM 6L +#undef org_lwjgl_openal_eax_EAX20_EAX_ENVIRONMENT_CONCERTHALL +#define org_lwjgl_openal_eax_EAX20_EAX_ENVIRONMENT_CONCERTHALL 7L +#undef org_lwjgl_openal_eax_EAX20_EAX_ENVIRONMENT_CAVE +#define org_lwjgl_openal_eax_EAX20_EAX_ENVIRONMENT_CAVE 8L +#undef org_lwjgl_openal_eax_EAX20_EAX_ENVIRONMENT_ARENA +#define org_lwjgl_openal_eax_EAX20_EAX_ENVIRONMENT_ARENA 9L +#undef org_lwjgl_openal_eax_EAX20_EAX_ENVIRONMENT_HANGAR +#define org_lwjgl_openal_eax_EAX20_EAX_ENVIRONMENT_HANGAR 10L +#undef org_lwjgl_openal_eax_EAX20_EAX_ENVIRONMENT_CARPETEDHALLWAY +#define org_lwjgl_openal_eax_EAX20_EAX_ENVIRONMENT_CARPETEDHALLWAY 11L +#undef org_lwjgl_openal_eax_EAX20_EAX_ENVIRONMENT_HALLWAY +#define org_lwjgl_openal_eax_EAX20_EAX_ENVIRONMENT_HALLWAY 12L +#undef org_lwjgl_openal_eax_EAX20_EAX_ENVIRONMENT_STONECORRIDOR +#define org_lwjgl_openal_eax_EAX20_EAX_ENVIRONMENT_STONECORRIDOR 13L +#undef org_lwjgl_openal_eax_EAX20_EAX_ENVIRONMENT_ALLEY +#define org_lwjgl_openal_eax_EAX20_EAX_ENVIRONMENT_ALLEY 14L +#undef org_lwjgl_openal_eax_EAX20_EAX_ENVIRONMENT_FOREST +#define org_lwjgl_openal_eax_EAX20_EAX_ENVIRONMENT_FOREST 15L +#undef org_lwjgl_openal_eax_EAX20_EAX_ENVIRONMENT_CITY +#define org_lwjgl_openal_eax_EAX20_EAX_ENVIRONMENT_CITY 16L +#undef org_lwjgl_openal_eax_EAX20_EAX_ENVIRONMENT_MOUNTAINS +#define org_lwjgl_openal_eax_EAX20_EAX_ENVIRONMENT_MOUNTAINS 17L +#undef org_lwjgl_openal_eax_EAX20_EAX_ENVIRONMENT_QUARRY +#define org_lwjgl_openal_eax_EAX20_EAX_ENVIRONMENT_QUARRY 18L +#undef org_lwjgl_openal_eax_EAX20_EAX_ENVIRONMENT_PLAIN +#define org_lwjgl_openal_eax_EAX20_EAX_ENVIRONMENT_PLAIN 19L +#undef org_lwjgl_openal_eax_EAX20_EAX_ENVIRONMENT_PARKINGLOT +#define org_lwjgl_openal_eax_EAX20_EAX_ENVIRONMENT_PARKINGLOT 20L +#undef org_lwjgl_openal_eax_EAX20_EAX_ENVIRONMENT_SEWERPIPE +#define org_lwjgl_openal_eax_EAX20_EAX_ENVIRONMENT_SEWERPIPE 21L +#undef org_lwjgl_openal_eax_EAX20_EAX_ENVIRONMENT_UNDERWATER +#define org_lwjgl_openal_eax_EAX20_EAX_ENVIRONMENT_UNDERWATER 22L +#undef org_lwjgl_openal_eax_EAX20_EAX_ENVIRONMENT_DRUGGED +#define org_lwjgl_openal_eax_EAX20_EAX_ENVIRONMENT_DRUGGED 23L +#undef org_lwjgl_openal_eax_EAX20_EAX_ENVIRONMENT_DIZZY +#define org_lwjgl_openal_eax_EAX20_EAX_ENVIRONMENT_DIZZY 24L +#undef org_lwjgl_openal_eax_EAX20_EAX_ENVIRONMENT_PSYCHOTIC +#define org_lwjgl_openal_eax_EAX20_EAX_ENVIRONMENT_PSYCHOTIC 25L +#undef org_lwjgl_openal_eax_EAX20_EAX_ENVIRONMENT_COUNT +#define org_lwjgl_openal_eax_EAX20_EAX_ENVIRONMENT_COUNT 26L +#undef org_lwjgl_openal_eax_EAX20_EAX_MATERIAL_SINGLEWINDOW +#define org_lwjgl_openal_eax_EAX20_EAX_MATERIAL_SINGLEWINDOW -2800L +#undef org_lwjgl_openal_eax_EAX20_EAX_MATERIAL_SINGLEWINDOWLF +#define org_lwjgl_openal_eax_EAX20_EAX_MATERIAL_SINGLEWINDOWLF 0.71f +#undef org_lwjgl_openal_eax_EAX20_EAX_MATERIAL_SINGLEWINDOWROOMRATIO +#define org_lwjgl_openal_eax_EAX20_EAX_MATERIAL_SINGLEWINDOWROOMRATIO 0.43f +#undef org_lwjgl_openal_eax_EAX20_EAX_MATERIAL_DOUBLEWINDOW +#define org_lwjgl_openal_eax_EAX20_EAX_MATERIAL_DOUBLEWINDOW -5000L +#undef org_lwjgl_openal_eax_EAX20_EAX_MATERIAL_DOUBLEWINDOWHF +#define org_lwjgl_openal_eax_EAX20_EAX_MATERIAL_DOUBLEWINDOWHF 0.4f +#undef org_lwjgl_openal_eax_EAX20_EAX_MATERIAL_DOUBLEWINDOWROOMRATIO +#define org_lwjgl_openal_eax_EAX20_EAX_MATERIAL_DOUBLEWINDOWROOMRATIO 0.24f +#undef org_lwjgl_openal_eax_EAX20_EAX_MATERIAL_THINDOOR +#define org_lwjgl_openal_eax_EAX20_EAX_MATERIAL_THINDOOR -1800L +#undef org_lwjgl_openal_eax_EAX20_EAX_MATERIAL_THINDOORLF +#define org_lwjgl_openal_eax_EAX20_EAX_MATERIAL_THINDOORLF 0.66f +#undef org_lwjgl_openal_eax_EAX20_EAX_MATERIAL_THINDOORROOMRATIO +#define org_lwjgl_openal_eax_EAX20_EAX_MATERIAL_THINDOORROOMRATIO 0.66f +#undef org_lwjgl_openal_eax_EAX20_EAX_MATERIAL_THICKDOOR +#define org_lwjgl_openal_eax_EAX20_EAX_MATERIAL_THICKDOOR -4400L +#undef org_lwjgl_openal_eax_EAX20_EAX_MATERIAL_THICKDOORLF +#define org_lwjgl_openal_eax_EAX20_EAX_MATERIAL_THICKDOORLF 0.64f +#undef org_lwjgl_openal_eax_EAX20_EAX_MATERIAL_THICKDOORROOMRTATION +#define org_lwjgl_openal_eax_EAX20_EAX_MATERIAL_THICKDOORROOMRTATION 0.27f +#undef org_lwjgl_openal_eax_EAX20_EAX_MATERIAL_WOODWALL +#define org_lwjgl_openal_eax_EAX20_EAX_MATERIAL_WOODWALL -4000L +#undef org_lwjgl_openal_eax_EAX20_EAX_MATERIAL_WOODWALLLF +#define org_lwjgl_openal_eax_EAX20_EAX_MATERIAL_WOODWALLLF 0.5f +#undef org_lwjgl_openal_eax_EAX20_EAX_MATERIAL_WOODWALLROOMRATIO +#define org_lwjgl_openal_eax_EAX20_EAX_MATERIAL_WOODWALLROOMRATIO 0.3f +#undef org_lwjgl_openal_eax_EAX20_EAX_MATERIAL_BRICKWALL +#define org_lwjgl_openal_eax_EAX20_EAX_MATERIAL_BRICKWALL -5000L +#undef org_lwjgl_openal_eax_EAX20_EAX_MATERIAL_BRICKWALLLF +#define org_lwjgl_openal_eax_EAX20_EAX_MATERIAL_BRICKWALLLF 0.6f +#undef org_lwjgl_openal_eax_EAX20_EAX_MATERIAL_BRICKWALLROOMRATIO +#define org_lwjgl_openal_eax_EAX20_EAX_MATERIAL_BRICKWALLROOMRATIO 0.24f +#undef org_lwjgl_openal_eax_EAX20_EAX_MATERIAL_STONEWALL +#define org_lwjgl_openal_eax_EAX20_EAX_MATERIAL_STONEWALL -6000L +#undef org_lwjgl_openal_eax_EAX20_EAX_MATERIAL_STONEWALLLF +#define org_lwjgl_openal_eax_EAX20_EAX_MATERIAL_STONEWALLLF 0.68f +#undef org_lwjgl_openal_eax_EAX20_EAX_MATERIAL_STONEWALLROOMRATIO +#define org_lwjgl_openal_eax_EAX20_EAX_MATERIAL_STONEWALLROOMRATIO 0.2f +#undef org_lwjgl_openal_eax_EAX20_EAX_MATERIAL_CURTAIN +#define org_lwjgl_openal_eax_EAX20_EAX_MATERIAL_CURTAIN -1200L +#undef org_lwjgl_openal_eax_EAX20_EAX_MATERIAL_CURTAINLF +#define org_lwjgl_openal_eax_EAX20_EAX_MATERIAL_CURTAINLF 0.15f +#undef org_lwjgl_openal_eax_EAX20_EAX_MATERIAL_CURTAINROOMRATIO +#define org_lwjgl_openal_eax_EAX20_EAX_MATERIAL_CURTAINROOMRATIO 1.0f +/* + * Class: org_lwjgl_openal_eax_EAX20 + * Method: determineAvailableExtensions + * Signature: ()V + */ +JNIEXPORT void JNICALL Java_org_lwjgl_openal_eax_EAX20_determineAvailableExtensions + (JNIEnv *, jclass); + +/* + * Class: org_lwjgl_openal_eax_EAX20 + * Method: neaxGet + * Signature: (IIILjava/nio/Buffer;II)I + */ +JNIEXPORT jint JNICALL Java_org_lwjgl_openal_eax_EAX20_neaxGet + (JNIEnv *, jclass, jint, jint, jint, jobject, jint, jint); + +/* + * Class: org_lwjgl_openal_eax_EAX20 + * Method: neaxSet + * Signature: (IIILjava/nio/Buffer;II)I + */ +JNIEXPORT jint JNICALL Java_org_lwjgl_openal_eax_EAX20_neaxSet + (JNIEnv *, jclass, jint, jint, jint, jobject, jint, jint); + +#ifdef __cplusplus +} +#endif +#endif