JoalVersion: Cleanup dead branches

2 files changed, 14 insertions, 14 deletions

diff --git a/src/java/com/jogamp/openal/JoalVersion.java b/src/java/com/jogamp/openal/JoalVersion.java
index 2edaf7c..f2ffc48 100644
--- a/src/java/com/jogamp/openal/JoalVersion.java
+++ b/src/java/com/jogamp/openal/JoalVersion.java
@@ -148,15 +148,16 @@ public class JoalVersion extends JogampVersion {
     }
 
     public static void deviceToString(final StringBuilder sb, final ALC alc, final String devName, final boolean isInput, final String defOutDeviceName, final String defInDeviceName) {
-        final boolean isDefault = isInput ? devName.equals(defInDeviceName) : devName.equals(defOutDeviceName);
-        final String defStr = isDefault ? "default " : "";
         if( isInput ) {
+            final boolean isDefault = devName.equals(defInDeviceName);
             sb.append("    "+devName+", input, default "+isDefault+System.lineSeparator());
         } else {
+            final boolean isDefault = devName.equals(defOutDeviceName);
+            final String defStr = isDefault ? "default " : "";
             final String inOutStr = "output";
             final int mixerFrequency, mixerRefresh, monoSourceCount, stereoSourceCount;
             final int[] val = { 0 };
-            final ALCdevice d = isInput ? null : alc.alcOpenDevice(devName);
+            final ALCdevice d = alc.alcOpenDevice(devName);
             if( null == d ) {
                 System.err.println("Error: Failed to open "+defStr+inOutStr+" device "+devName);
                 return;
@@ -217,11 +218,7 @@ public class JoalVersion extends JogampVersion {
 
             alc.alcMakeContextCurrent(null);
             alc.alcDestroyContext(c);
-            if( isInput ) {
-                alc.alcCaptureCloseDevice(d);
-            } else {
-                alc.alcCloseDevice(d);
-            }
+            alc.alcCloseDevice(d);
         }
     }
 
diff --git a/www/index.html b/www/index.html
index a085369..5f0cc47 100644
--- a/www/index.html
+++ b/www/index.html
@@ -11,7 +11,7 @@
         <div id="container">
             <div id="header">
                 <div id="slogan"><img src="../../images/jogamp_symbols/website_final_sideslogan_joal_404x20pel.png" alt="Java&#0153; Binding for the OpenAL&#0174; API"/></div>
-                <div id="logo"><a href="http://jogamp.org/"><img src="../../images/jogamp_symbols/website_final_blue_joal_346x70pel.png" alt="JOAL Symbol"/></a><a href="http://www.openal.org"><img src="openal_c.gif"></a></div>
+                <div id="logo"><a href="http://jogamp.org/"><img src="../../images/jogamp_symbols/website_final_blue_joal_346x70pel.png" alt="JOAL Symbol"/></a></div>
             </div>
             <div id="menu">
                 <ul>
@@ -32,13 +32,14 @@
                         <li><a href="https://www.openal.org/documentation/openal-1.1-specification.pdf">OpenAL 1.1 Specification</a></li>
                         <li><a href="https://www.openal.org/documentation/OpenAL_Programmers_Guide.pdf">OpenAL Programmer's Guide</a></li>
                         <li><a href="https://openal-soft.org/">OpenAL-Soft Homepage</a></li>
-                        <li><a href="https://github.com/kcat/openal-soft">OpenAL-Soft git-repository</a></li>
+                        <li><a href="https://github.com/kcat/openal-soft">OpenAL-Soft git-repo</a></li>
                         <li><a href="../../joal-demos/www/">JOAL Tutorials and Demos</a></li>
                         <li><a href="http://forum.jogamp.org/joal-f951297.html">JOAL Forums</a></li>
                         <li><a href="../../deployment/jogamp-next/javadoc/joal/javadoc/">JOAL / Sound3D JavaDoc</a></li>
                     </ul>
                 </div>
                 <div id="text">
+                    <a href="http://www.openal.org"><img src="openal_c.gif"></a>
                     <h3>Overview</h3>
                     <p>
                         The JOAL Project hosts a reference implementation of the
@@ -55,14 +56,16 @@
                     </p>
                     <h3>OpenAL-Soft</h3>
                     <p>
-                        JOAL is tested against <b><a href="https://openal-soft.org/">OpenAL-Soft</a></b>, the cross-platform, software implementation of the OpenAL 3D audio API.
+                        JOAL is tested against <b><a href="https://openal-soft.org/">OpenAL-Soft</a></b> (<a href="https://github.com/kcat/openal-soft/">git-repo</a>), 
+                        the cross-platform, software implementation of the OpenAL 3D audio API.
                     </p>
                     <p>
-                        OpenAL-Soft <a href="https://github.com/kcat/openal-soft/blob/master/docs/env-vars.txt">environment variables are described here</a>.
+                        See OpenAL-Soft <a href="https://github.com/kcat/openal-soft/blob/master/docs/env-vars.txt">environment variables</a>
+                        and <a href="https://github.com/kcat/openal-soft/blob/master/alsoftrc.sample">configuration example</a>.
                     </p>
                     <p>
-                        All JOAL platform builds also contain a self-build native library of <i><a href="https://openal-soft.org/">OpenAL-Soft</a></i>
-                        <a href="https://jogamp.org/cgit/openal-soft.git/"><b>v1.23.1</b> <i>(from our fork)</i></a>.<br/>
+                        All JOAL platform builds contain a self-build native library of <i><a href="https://openal-soft.org/">OpenAL-Soft</a></i>
+                        version <a href="https://jogamp.org/cgit/openal-soft.git/"><b>v1.23.1</b> <i>(from our fork)</i></a>.<br/>
                         Our builds expose the following audio backends:
                         <ul>
                           <li>GNU/Linux