From 50373c44cb8c230c08a9c8a3b85ab42999719566 Mon Sep 17 00:00:00 2001 From: Sven Gothel Date: Sun, 15 Nov 2015 05:01:15 +0100 Subject: 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! +++ --- src/java/jogamp/openal/ALDynamicLibraryBundleInfo.java | 17 +++++++++++------ 1 file 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 @@ -85,6 +85,16 @@ public final class ALDynamicLibraryBundleInfo implements DynamicLibraryBundleInf return glueLibNames; } + @Override + public final boolean searchToolLibInSystemPath() { + return true; + } + + @Override + public final boolean searchToolLibSystemPathFirst() { + return ALFactory.PREFER_SYSTEM_OPENAL; + } + @Override public final List> getToolLibNames() { final List> libNamesList = new ArrayList>(); @@ -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; -- cgit v1.2.3