diff options
author | Sven Gothel <[email protected]> | 2015-11-15 05:01:15 +0100 |
---|---|---|
committer | Sven Gothel <[email protected]> | 2015-11-15 05:01:15 +0100 |
commit | 50373c44cb8c230c08a9c8a3b85ab42999719566 (patch) | |
tree | 3695507d33aff69d38203f8e4dcbee9264685b69 /src/java | |
parent | 3920e00cbd3aba911d85a1649a03fdd5aa46a335 (diff) |
Bug 1270 - Fix OSX El Capitan 10.11 stuttering ; Prefer provided OpenAL library over system (default)
Default is to utilize provided openal-soft library if possible
and if not overridden by property 'joal.openal.lib'.
Hence returning ALFactory.PREFER_SYSTEM_OPENAL (default: false)
in ALDynamicLibraryBundleInfo.searchToolLibSystemPathFirst().
+++
This also resolves issues w/ OSX El Capitan 10.11,
which provides OpenAL via 'openal' library name (same as openal-soft)
and causes stuttering w/ GLMediaPlayer's ALAudioSink!
+++
Diffstat (limited to 'src/java')
-rw-r--r-- | src/java/jogamp/openal/ALDynamicLibraryBundleInfo.java | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/src/java/jogamp/openal/ALDynamicLibraryBundleInfo.java b/src/java/jogamp/openal/ALDynamicLibraryBundleInfo.java index cd064d4..d439dd0 100644 --- a/src/java/jogamp/openal/ALDynamicLibraryBundleInfo.java +++ b/src/java/jogamp/openal/ALDynamicLibraryBundleInfo.java @@ -86,6 +86,16 @@ public final class ALDynamicLibraryBundleInfo implements DynamicLibraryBundleInf } @Override + public final boolean searchToolLibInSystemPath() { + return true; + } + + @Override + public final boolean searchToolLibSystemPathFirst() { + return ALFactory.PREFER_SYSTEM_OPENAL; + } + + @Override public final List<List<String>> getToolLibNames() { final List<List<String>> libNamesList = new ArrayList<List<String>>(); @@ -105,7 +115,7 @@ public final class ALDynamicLibraryBundleInfo implements DynamicLibraryBundleInf { // This name is in use by the (installed if any) OpenAL-soft alSoftLibNames.add("soft_oal"); - // These names are in use by the bundled OpenAL-soft + // These names are in use by the bundled OpenAL-soft, also generic ones alSoftLibNames.add("openal"); alSoftLibNames.add("OpenAL"); } @@ -125,11 +135,6 @@ public final class ALDynamicLibraryBundleInfo implements DynamicLibraryBundleInf // Then try the System OpenAL alLibNames.addAll(alSystemLibNames); } - - // last but not least .. the generic one - alLibNames.add("openal"); - alLibNames.add("OpenAL"); - libNamesList.add(alLibNames); return libNamesList; |