diff options
Diffstat (limited to 'make')
-rwxr-xr-x | make/build.xml | 8 | ||||
-rw-r--r-- | make/joal-common-CustomJavaCode.java | 40 | ||||
-rwxr-xr-x | make/lib/oalinst-license.txt | 8 | ||||
-rwxr-xr-x | make/stub_includes/openal/efx.h | 10 |
4 files changed, 33 insertions, 33 deletions
diff --git a/make/build.xml b/make/build.xml index bc71e7c..6c4ec96 100755 --- a/make/build.xml +++ b/make/build.xml @@ -221,7 +221,7 @@ <!-- Use the GlueGen task to generate the Java files --> - <!-- Generate the AL interface class and implementation --> + <!-- Generate the AL interface class and implementation --> <gluegen src="${stub.includes.openal}/al.c" outputRootDir="${build}" config="${joal.cfg}" @@ -230,7 +230,7 @@ <classpath refid="gluegen.classpath" /> </gluegen> - <!-- Generate the ALConstants interface class --> + <!-- Generate the ALConstants interface class --> <gluegen src="${stub.includes.openal}/al.c" outputRootDir="${build}" config="${joal.constants.cfg}" @@ -239,7 +239,7 @@ <classpath refid="gluegen.classpath" /> </gluegen> - <!-- Generate the ALC interface class and implementation --> + <!-- Generate the ALC interface class and implementation --> <gluegen src="${stub.includes.openal}/alc.h" outputRootDir="${build}" config="${joal.alc.cfg}" @@ -248,7 +248,7 @@ <classpath refid="gluegen.classpath" /> </gluegen> - <!-- Generate the ALCConstants interface class --> + <!-- Generate the ALCConstants interface class --> <gluegen src="${stub.includes.openal}/alc.h" outputRootDir="${build}" config="${joal.alc.constants.cfg}" diff --git a/make/joal-common-CustomJavaCode.java b/make/joal-common-CustomJavaCode.java index 6f77146..be6b8a7 100644 --- a/make/joal-common-CustomJavaCode.java +++ b/make/joal-common-CustomJavaCode.java @@ -2,27 +2,27 @@ static final DynamicLibraryBundle alDynamicLookupHelper; private static final ALProcAddressTable alProcAddressTable; static { - alProcAddressTable = new ALProcAddressTable(); - if(null==alProcAddressTable) { - throw new RuntimeException("Couldn't instantiate ALProcAddressTable"); - } + alProcAddressTable = new ALProcAddressTable(); + if(null==alProcAddressTable) { + throw new RuntimeException("Couldn't instantiate ALProcAddressTable"); + } - alDynamicLookupHelper = (DynamicLibraryBundle) - AccessController.doPrivileged(new PrivilegedAction() { - public Object run() { - return new DynamicLibraryBundle(new ALDynamicLibraryBundleInfo()); - } - }); - if(null==alDynamicLookupHelper) { - throw new RuntimeException("Null ALDynamicLookupHelper"); - } - if(!alDynamicLookupHelper.isToolLibLoaded()) { - throw new RuntimeException("Couln't load native AL library"); - } - if(!alDynamicLookupHelper.isLibComplete()) { - throw new RuntimeException("Couln't load native AL/JNI glue library"); - } - alProcAddressTable.reset(alDynamicLookupHelper); + alDynamicLookupHelper = (DynamicLibraryBundle) + AccessController.doPrivileged(new PrivilegedAction() { + public Object run() { + return new DynamicLibraryBundle(new ALDynamicLibraryBundleInfo()); + } + }); + if(null==alDynamicLookupHelper) { + throw new RuntimeException("Null ALDynamicLookupHelper"); + } + if(!alDynamicLookupHelper.isToolLibLoaded()) { + throw new RuntimeException("Couln't load native AL library"); + } + if(!alDynamicLookupHelper.isLibComplete()) { + throw new RuntimeException("Couln't load native AL/JNI glue library"); + } + alProcAddressTable.reset(alDynamicLookupHelper); } public static ALProcAddressTable getALProcAddressTable() { return alProcAddressTable; } diff --git a/make/lib/oalinst-license.txt b/make/lib/oalinst-license.txt index 8c95a86..b191e3e 100755 --- a/make/lib/oalinst-license.txt +++ b/make/lib/oalinst-license.txt @@ -2,23 +2,23 @@ Creative Labs, Inc. is providing you with this OpenAL32.dll installer and other You may use and freely integrate with your software applications and distribute such throughout the world at no cost or further obligation to Creative.
NO WARRANTY
- ANY USE BY YOU OF THE SOFTWARE IS AT YOUR OWN RISK.
+ ANY USE BY YOU OF THE SOFTWARE IS AT YOUR OWN RISK.
THE SOFTWARE IS PROVIDED FOR USE "AS IS" WITHOUT WARRANTY OF ANY KIND.
TO THE MAXIMUM EXTENT PERMITTED BY LAW, CREATIVE DISCLAIMS ALL WARRANTIES OF ANY KIND,
EITHER EXPRESS OR IMPLIED, INCLUDING, WITHOUT LIMITATION, IMPLIED WARRANTIES OR CONDITIONS
OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
CREATIVE IS NOT OBLIGATED TO PROVIDE ANY UPDATES OR UPGRADES TO THE SOFTWARE.
- No other entity or person is authorized to expand or alter this warranty or any other provisions herein.
+ No other entity or person is authorized to expand or alter this warranty or any other provisions herein.
Creative does not warrant that the functions contained in the Software will meet your requirements
or that the operation of the Software will be uninterrupted or error-free or free from malicious code.
For purposes of this paragraph, "malicious code" means any program code designed to contaminate other computer programs or computer data,
consume computer resources, modify, destroy, record, or transmit data, or in some other fashion usurp the normal operation of the computer,
computer system, or computer network, including viruses, Trojan horses, droppers, worms, logic bombs, and the like.
- You assume full responsibility for the selection of the Software to achieve your intended results,
+ You assume full responsibility for the selection of the Software to achieve your intended results,
and for the downloading, use and results obtained from the Software.
You also assume the entire risk as it applies to the quality and performance of the Software.
- IN NO EVENT WILL CREATIVE'S LIABILITY TO YOU OR ANY OTHER PERSON EVER EXCEED THE AMOUNT PAID BY YOU TO USE THE SOFTWARE,
+ IN NO EVENT WILL CREATIVE'S LIABILITY TO YOU OR ANY OTHER PERSON EVER EXCEED THE AMOUNT PAID BY YOU TO USE THE SOFTWARE,
REGARDLESS OF THE FORM OF THE CLAIM.
diff --git a/make/stub_includes/openal/efx.h b/make/stub_includes/openal/efx.h index ab6cc07..b7f5108 100755 --- a/make/stub_includes/openal/efx.h +++ b/make/stub_includes/openal/efx.h @@ -90,7 +90,7 @@ extern "C" { /* Chorus Parameters */ #define AL_CHORUS_WAVEFORM 0x0001 -#define AL_CHORUS_PHASE 0x0002 +#define AL_CHORUS_PHASE 0x0002 #define AL_CHORUS_RATE 0x0003 #define AL_CHORUS_DEPTH 0x0004 #define AL_CHORUS_FEEDBACK 0x0005 @@ -219,7 +219,7 @@ extern "C" { /* Filter type definitions to be used with AL_FILTER_TYPE. */ #define AL_FILTER_NULL 0x0000 /* Can also be used as a Filter Object ID */ -#define AL_FILTER_LOWPASS 0x0001 +#define AL_FILTER_LOWPASS 0x0001 #define AL_FILTER_HIGHPASS 0x0002 #define AL_FILTER_BANDPASS 0x0003 @@ -587,8 +587,8 @@ void alGetAuxiliaryEffectSlotfv( ALuint asid, ALenum pname, ALfloat* values ); #define AL_VOCAL_MORPHER_MAX_PHONEMEA 29 #define AL_VOCAL_MORPHER_DEFAULT_PHONEMEA 0 -#define AL_VOCAL_MORPHER_MIN_PHONEMEA_COARSE_TUNING (-24) -#define AL_VOCAL_MORPHER_MAX_PHONEMEA_COARSE_TUNING 24 +#define AL_VOCAL_MORPHER_MIN_PHONEMEA_COARSE_TUNING (-24) +#define AL_VOCAL_MORPHER_MAX_PHONEMEA_COARSE_TUNING 24 #define AL_VOCAL_MORPHER_DEFAULT_PHONEMEA_COARSE_TUNING 0 #define AL_VOCAL_MORPHER_MIN_PHONEMEB 0 @@ -686,7 +686,7 @@ void alGetAuxiliaryEffectSlotfv( ALuint asid, ALenum pname, ALfloat* values ); #define AL_AUTOWAH_MIN_RESONANCE 2.0f #define AL_AUTOWAH_MAX_RESONANCE 1000.0f #define AL_AUTOWAH_DEFAULT_RESONANCE 1000.0f - + #define AL_AUTOWAH_MIN_PEAK_GAIN 0.00003f #define AL_AUTOWAH_MAX_PEAK_GAIN 31621.0f #define AL_AUTOWAH_DEFAULT_PEAK_GAIN 11.22f |