diff options
Diffstat (limited to 'src/java/jogamp/openal/ALDynamicLibraryBundleInfo.java')
| -rw-r--r-- | src/java/jogamp/openal/ALDynamicLibraryBundleInfo.java | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/src/java/jogamp/openal/ALDynamicLibraryBundleInfo.java b/src/java/jogamp/openal/ALDynamicLibraryBundleInfo.java index efb88d1..0859be1 100644 --- a/src/java/jogamp/openal/ALDynamicLibraryBundleInfo.java +++ b/src/java/jogamp/openal/ALDynamicLibraryBundleInfo.java @@ -3,14 +3,14 @@ * * Redistribution and use in source and binary forms, with or without modification, are * permitted provided that the following conditions are met: - * + * * 1. Redistributions of source code must retain the above copyright notice, this list of * conditions and the following disclaimer. - * + * * 2. 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. - * + * * THIS SOFTWARE IS PROVIDED BY JogAmp Community ``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 JogAmp Community OR @@ -20,12 +20,12 @@ * 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. - * + * * The views and conclusions contained in the software and documentation are those of the * authors and should not be interpreted as representing official policies, either expressed * or implied, of JogAmp Community. */ - + package jogamp.openal; import com.jogamp.common.jvm.JNILibLoaderBase; @@ -46,7 +46,7 @@ public final class ALDynamicLibraryBundleInfo implements DynamicLibraryBundleInf AccessController.doPrivileged(new PrivilegedAction<Object>() { public Object run() { Platform.initSingleton(); - + if(TempJarCache.isInitialized()) { // only: joal.jar -> joal-natives-<os.and.arch>.jar JNILibLoaderBase.addNativeJarLibs(new Class<?>[] { ALDynamicLibraryBundleInfo.class }, null, null ); @@ -54,7 +54,7 @@ public final class ALDynamicLibraryBundleInfo implements DynamicLibraryBundleInf return null; } }); - + glueLibNames = new ArrayList<String>(); glueLibNames.add("joal"); } @@ -62,7 +62,7 @@ public final class ALDynamicLibraryBundleInfo implements DynamicLibraryBundleInf protected ALDynamicLibraryBundleInfo() { } - /** + /** * <p> * Returns <code>true</code>, * since we might load the library and allow symbol access to subsequent libs. @@ -75,11 +75,11 @@ public final class ALDynamicLibraryBundleInfo implements DynamicLibraryBundleInf * {@inheritDoc} * <p> * Returns <code>false</code>. - * </p> + * </p> */ @Override public final boolean shallLookupGlobal() { return false; } - + @Override public final List<String> getGlueLibNames() { return glueLibNames; @@ -95,7 +95,7 @@ public final class ALDynamicLibraryBundleInfo implements DynamicLibraryBundleInf alSystemLibNames.add("libopenal.so.1"); // unix alSystemLibNames.add("OpenAL32"); // windows alSystemLibNames.add("OpenAL"); // OSX - + // try this one as well, if spec fails alSystemLibNames.add("libOpenAL.so.1"); alSystemLibNames.add("libopenal.so"); @@ -107,11 +107,11 @@ public final class ALDynamicLibraryBundleInfo implements DynamicLibraryBundleInf alSoftLibNames.add("soft_oal"); // These names are in use by the bundled OpenAL-soft alSoftLibNames.add("openal"); - alSoftLibNames.add("OpenAL"); + alSoftLibNames.add("OpenAL"); } final List<String> alLibNames = new ArrayList<String>(); - + if( ALFactory.PREFER_SYSTEM_OPENAL ) { // First test the System OpenAL alLibNames.addAll(alSystemLibNames); @@ -121,7 +121,7 @@ public final class ALDynamicLibraryBundleInfo implements DynamicLibraryBundleInf } else { // First test use of the bundled OpenAL-soft alLibNames.addAll(alSoftLibNames); - + // Then try the System OpenAL alLibNames.addAll(alSystemLibNames); } @@ -155,7 +155,7 @@ public final class ALDynamicLibraryBundleInfo implements DynamicLibraryBundleInf @Override public final RunnableExecutor getLibLoaderExecutor() { return DynamicLibraryBundle.getDefaultRunnableExecutor(); - } + } } |