Merge remote-tracking branch 'Mathieu_Fery/1475-devices-specifiers'

3 files changed, 131 insertions, 43 deletions

diff --git a/src/java/com/jogamp/openal/JoalVersion.java b/src/java/com/jogamp/openal/JoalVersion.java
index f2ffc48..6469189 100644
--- a/src/java/com/jogamp/openal/JoalVersion.java
+++ b/src/java/com/jogamp/openal/JoalVersion.java
@@ -33,6 +33,7 @@ import com.jogamp.common.GlueGenVersion;
 import com.jogamp.common.os.Platform;
 import com.jogamp.common.util.VersionUtil;
 import com.jogamp.common.util.JogampVersion;
+import com.jogamp.openal.util.ALHelpers;
 
 import java.util.jar.Manifest;
 
@@ -110,30 +111,64 @@ public class JoalVersion extends JogampVersion {
             sb.append("ALC null");
             return sb;
         }
-        final ALCdevice device = alc.alcOpenDevice(null);
-        final ALCcontext context = alc.alcCreateContext(device, null);
-        alc.alcMakeContextCurrent(context);
+        final ALCcontext initialContext = alc.alcGetCurrentContext();
+
+        final ALCcontext context;
+        final ALCdevice device;
+        if( null == initialContext) {
+            device = alc.alcOpenDevice(null);
+            context = alc.alcCreateContext(device, null);
+            alc.alcMakeContextCurrent(context);
+        } else {
+            context = initialContext;
+            device = alc.alcGetContextsDevice(initialContext);
+        }
         final AL al = ALFactory.getAL(); // valid after makeContextCurrent(..)
         final ALVersion alv = new ALVersion(al);
 
         alv.toString(true, sb);
         sb.append("AL_EXTENSIONS  ").append(al.alGetString(ALConstants.AL_EXTENSIONS));
         sb.append(Platform.getNewline());
+        final boolean enumerationExtIsPresent = alc.aclEnumerationExtIsPresent();
+        final boolean enumerateAllExtIsPresent = alc.aclEnumerateAllExtIsPresent();
         {
             final int[] iversion = { 0, 0 };
             alc.alcGetIntegerv(device, ALCConstants.ALC_MAJOR_VERSION, 1, iversion, 0);
             alc.alcGetIntegerv(device, ALCConstants.ALC_MINOR_VERSION, 1, iversion, 1);
             sb.append("ALC_VERSION     ").append(iversion[0]).append(".").append(iversion[1]);
             sb.append(Platform.getNewline());
-            sb.append("ALC_DEF_OUTPUT  ").append(alc.alcGetString(device, ALCConstants.ALC_DEFAULT_DEVICE_SPECIFIER));
-            sb.append(Platform.getNewline());
-            sb.append("ALC_DEF_CAPTURE ").append(alc.alcGetString(device, ALCConstants.ALC_CAPTURE_DEFAULT_DEVICE_SPECIFIER));
-            sb.append(Platform.getNewline());
+            if (!enumerationExtIsPresent && !enumerateAllExtIsPresent) {
+                sb.append("ALC_DEF_OUTPUT Unknown (Missing "+
+                        ALHelpers.ALC_ENUMERATION_EXT+" and "+ALHelpers.ALC_ENUMERATE_ALL_EXT+")");
+                sb.append(Platform.getNewline());
+            } else {
+                if (enumerationExtIsPresent) {
+                    sb.append("ALC_DEF_OUTPUT (With " + ALHelpers.ALC_ENUMERATION_EXT + ") ")
+                            .append(alc.alcGetString(device, ALCConstants.ALC_DEFAULT_DEVICE_SPECIFIER));
+                    sb.append(Platform.getNewline());
+                }
+                if (enumerateAllExtIsPresent) {
+                    sb.append("ALC_DEF_OUTPUT (With " + ALHelpers.ALC_ENUMERATE_ALL_EXT + ") ")
+                            .append(alc.alcGetString(device, ALCConstants.ALC_DEFAULT_ALL_DEVICES_SPECIFIER));
+                    sb.append(Platform.getNewline());
+                }
+            }
+            if (enumerationExtIsPresent) {
+                sb.append("ALC_DEF_CAPTURE ").append(alc.alcGetString(device, ALCConstants.ALC_CAPTURE_DEFAULT_DEVICE_SPECIFIER));
+                sb.append(Platform.getNewline());
+            } else {
+                sb.append("ALC_DEF_CAPTURE Unknown (Missing "+ALHelpers.ALC_ENUMERATION_EXT+")");
+                sb.append(Platform.getNewline());
+            }
+        }
+
+        if( null == initialContext ) {
+            alc.alcMakeContextCurrent(null);
+            alc.alcDestroyContext(context);
+            alc.alcCloseDevice(device);
         }
-        alc.alcMakeContextCurrent(null);
-        alc.alcDestroyContext(context);
-        alc.alcCloseDevice(device);
-        devicesToString(sb, alc);
+
+        devicesToString(sb, alc, enumerationExtIsPresent, enumerateAllExtIsPresent);
         return sb;
     }
 
@@ -157,6 +192,8 @@ public class JoalVersion extends JogampVersion {
             final String inOutStr = "output";
             final int mixerFrequency, mixerRefresh, monoSourceCount, stereoSourceCount;
             final int[] val = { 0 };
+            final ALCcontext initialContext = alc.alcGetCurrentContext();
+            final ALCdevice initialDevice = initialContext != null ? alc.alcGetContextsDevice(initialContext) : null;
             final ALCdevice d = alc.alcOpenDevice(devName);
             if( null == d ) {
                 System.err.println("Error: Failed to open "+defStr+inOutStr+" device "+devName);
@@ -216,30 +253,62 @@ public class JoalVersion extends JogampVersion {
                     " (min latency "+(1000f/mixerRefresh)+" ms)], sources[mono "+monoSourceCount+", stereo "+stereoSourceCount+"]"+
                     System.lineSeparator());
 
-            alc.alcMakeContextCurrent(null);
-            alc.alcDestroyContext(c);
-            alc.alcCloseDevice(d);
+            if( null != initialContext ) {
+                alc.alcMakeContextCurrent(initialContext);
+                if( initialContext.getDirectBufferAddress() != c.getDirectBufferAddress() ) {
+                    alc.alcDestroyContext(c);
+                }
+            } else {
+                alc.alcMakeContextCurrent(null);
+                alc.alcDestroyContext(c);
+            }
+            if( initialDevice == null || initialDevice.getDirectBufferAddress() != d.getDirectBufferAddress() ) {
+                alc.alcCloseDevice(d);
+            }
         }
     }
 
-    public static void devicesToString(final StringBuilder sb, final ALC alc) {
-        final String defOutDeviceName = alc.alcGetString(null, ALCConstants.ALC_DEFAULT_DEVICE_SPECIFIER);
-        final String defInDeviceName = alc.alcGetString(null, ALCConstants.ALC_CAPTURE_DEFAULT_DEVICE_SPECIFIER);
-        sb.append("Output devices:"+System.lineSeparator());
-        {
-            final String[] outDevices = alc.alcGetDeviceSpecifiers();
-            if( null != outDevices ) {
-                for (final String devName : outDevices) {
-                    deviceToString(sb, alc, devName, false, defOutDeviceName, defInDeviceName);
+    public static void devicesToString(final StringBuilder sb, final ALC alc, final boolean enumerationExtIsPresent, final boolean enumerateAllExtIsPresent) {
+        if (!enumerationExtIsPresent && !enumerateAllExtIsPresent) {
+            sb.append("No output devices infos available (Missing "+
+                    ALHelpers.ALC_ENUMERATION_EXT+" and "+ALHelpers.ALC_ENUMERATE_ALL_EXT+")");
+        } else {
+            if (enumerateAllExtIsPresent) {
+                final String defOutAllDeviceName = alc.alcGetString(null, ALCConstants.ALC_DEFAULT_ALL_DEVICES_SPECIFIER);
+                sb.append("Output devices (With " + ALHelpers.ALC_ENUMERATE_ALL_EXT + "):" + System.lineSeparator());
+                {
+                    final String[] outDevices = alc.alcGetAllDeviceSpecifiers();
+                    if (null != outDevices) {
+                        for (final String devName : outDevices) {
+                            deviceToString(sb, alc, devName, false, defOutAllDeviceName, null);
+                        }
+                    }
+                }
+            }
+            if (enumerationExtIsPresent) {
+                final String defOutDeviceName = alc.alcGetString(null, ALCConstants.ALC_DEFAULT_DEVICE_SPECIFIER);
+                sb.append("Output devices (With " + ALHelpers.ALC_ENUMERATION_EXT + "):" + System.lineSeparator());
+                {
+                    final String[] outDevices = alc.alcGetDeviceSpecifiers();
+                    if (null != outDevices) {
+                        for (final String devName : outDevices) {
+                            deviceToString(sb, alc, devName, false, defOutDeviceName, null);
+                        }
+                    }
                 }
             }
         }
-        sb.append("Capture devices:"+System.lineSeparator());
-        {
-            final String[] inDevices = alc.alcGetCaptureDeviceSpecifiers();
-            if( null != inDevices ) {
-                for (final String devName : inDevices) {
-                    deviceToString(sb, alc, devName, true, defOutDeviceName, defInDeviceName);
+        if (!enumerationExtIsPresent) {
+            sb.append("No capture devices infos available (Missing " + ALHelpers.ALC_ENUMERATION_EXT + ")");
+        } else {
+            final String defInDeviceName = alc.alcGetString(null, ALCConstants.ALC_CAPTURE_DEFAULT_DEVICE_SPECIFIER);
+            sb.append("Capture devices:" + System.lineSeparator());
+            {
+                final String[] inDevices = alc.alcGetCaptureDeviceSpecifiers();
+                if (null != inDevices) {
+                    for (final String devName : inDevices) {
+                        deviceToString(sb, alc, devName, true, null, defInDeviceName);
+                    }
                 }
             }
         }
diff --git a/src/java/com/jogamp/openal/util/ALHelpers.java b/src/java/com/jogamp/openal/util/ALHelpers.java
index 93dfa6e..fda3167 100644
--- a/src/java/com/jogamp/openal/util/ALHelpers.java
+++ b/src/java/com/jogamp/openal/util/ALHelpers.java
@@ -52,6 +52,9 @@ public class ALHelpers {
 
     public static final String ALC_EXT_thread_local_context = "ALC_EXT_thread_local_context";
 
+    public static final String ALC_ENUMERATION_EXT = "ALC_ENUMERATION_EXT";
+    public static final String ALC_ENUMERATE_ALL_EXT = "ALC_ENUMERATE_ALL_EXT";
+
     /**
      * Returns a compatible {@link AudioFormat} based on given OpenAL channel-layout, sample-type and format,
      * as well as the generic sample-rate and sample-size.
diff --git a/src/java/jogamp/openal/ALCImpl.java b/src/java/jogamp/openal/ALCImpl.java
index 99494ca..f08541c 100644
--- a/src/java/jogamp/openal/ALCImpl.java
+++ b/src/java/jogamp/openal/ALCImpl.java
@@ -4,8 +4,11 @@
 package jogamp.openal;
 
 import com.jogamp.common.nio.Buffers;
+import com.jogamp.openal.ALCConstants;
 import com.jogamp.openal.ALException;
 import com.jogamp.openal.ALCdevice;
+import com.jogamp.openal.util.ALHelpers;
+
 import java.io.UnsupportedEncodingException;
 import java.nio.ByteBuffer;
 import java.util.ArrayList;
@@ -15,10 +18,23 @@ import java.util.ArrayList;
  * @author Michael Bien
  */
 public class ALCImpl extends ALCAbstractImpl {
+    public boolean aclEnumerationExtIsPresent() {
+        return alcIsExtensionPresent(null, ALHelpers.ALC_ENUMERATION_EXT);
+    }
+
+    public boolean aclEnumerateAllExtIsPresent() {
+        return alcIsExtensionPresent(null, ALHelpers.ALC_ENUMERATE_ALL_EXT);
+    }
+
+    public boolean alcIsDoubleNullTerminatedString(final ALCdevice device, final int param) {
+        return dispatch_alcIsDoubleNullTerminatedString(((device == null) ? null : device.getBuffer()), param);
+    }
+
+    public native boolean dispatch_alcIsDoubleNullTerminatedString(ByteBuffer deviceBuffer, int param);
 
     public String alcGetString(final ALCdevice device, final int param) {
-        if (device == null && param == ALC_DEVICE_SPECIFIER) {
-            throw new ALException("Call alcGetDeviceSpecifiers to fetch all available device names");
+        if (alcIsDoubleNullTerminatedString(device, param)) {
+            throw new ALException("Call alcGetString to get double null terminated string");
         }
 
         final ByteBuffer buf = alcGetStringImpl(device, param);
@@ -51,24 +67,24 @@ public class ALCImpl extends ALCAbstractImpl {
     }
     private native java.nio.ByteBuffer dispatch_alcGetStringImpl1(ByteBuffer deviceBuffer, int param, long addr);
 
-    /**
-     * Fetches the names of the available ALC device specifiers.
-     * Equivalent to the C call alcGetString(NULL, ALC_DEVICE_SPECIFIER).
-     */
     public String[] alcGetDeviceSpecifiers() {
-        return getDoubleNullTerminatedString(ALC_DEVICE_SPECIFIER);
+        return alcGetStringAsDoubleNullTerminatedString(null, ALC_DEVICE_SPECIFIER);
     }
 
-    /**
-     * Fetches the names of the available ALC capture device specifiers.
-     * Equivalent to the C call alcGetString(NULL, ALC_CAPTURE_DEVICE_SPECIFIER).
-     */
     public String[] alcGetCaptureDeviceSpecifiers() {
-        return getDoubleNullTerminatedString(ALC_CAPTURE_DEVICE_SPECIFIER);
+        return alcGetStringAsDoubleNullTerminatedString(null, ALC_CAPTURE_DEVICE_SPECIFIER);
+    }
+
+    public String[] alcGetAllDeviceSpecifiers() {
+        return alcGetStringAsDoubleNullTerminatedString(null, ALC_ALL_DEVICES_SPECIFIER);
     }
 
-    private String[] getDoubleNullTerminatedString(final int which) {
-        final ByteBuffer buf = alcGetStringImpl(null, which);
+    public String[] alcGetStringAsDoubleNullTerminatedString(final ALCdevice device, final int param) {
+        if (!alcIsDoubleNullTerminatedString(device, param)) {
+            throw new ALException("Call alcGetString to get string");
+        }
+
+        final ByteBuffer buf = alcGetStringImpl(device, param);
         if (buf == null) {
             return null;
         }