cleanup OpenALTest (works now).

 - EAX is not loaded when not available
 - removed redundant exception handling

1 files changed, 90 insertions, 107 deletions

diff --git a/test/src/com/jogamp/openal/OpenALTest.java b/test/src/com/jogamp/openal/OpenALTest.java
index 23512a4..ec8d50f 100644
--- a/test/src/com/jogamp/openal/OpenALTest.java
+++ b/test/src/com/jogamp/openal/OpenALTest.java
@@ -1,122 +1,105 @@
 package com.jogamp.openal;
 
 /**
-* Copyright (c) 2003 Sun Microsystems, Inc. All  Rights Reserved.
-*
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
-*
-* -Redistribution of source code must retain the above copyright notice,
-* this list of conditions and the following disclaimer.
-*
-* -Redistribution 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.
-*
-* Neither the name of Sun Microsystems, Inc. or the names of contributors may
-* be used to endorse or promote products derived from this software without
-* specific prior written permission.
-*
-* This software is provided "AS IS," without a warranty of any kind.
-* ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES, INCLUDING
-* ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR
-* NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN MICROSYSTEMS, INC. ("SUN") AND ITS
-* LICENSORS SHALL NOT BE LIABLE FOR ANY DAMAGES SUFFERED BY LICENSEE AS A
-* RESULT OF USING, MODIFYING OR DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES.
-* IN NO EVENT WILL SUN OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT
-* OR DATA, OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR
-* PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
-* ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF SUN HAS
-* BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-*
-* You acknowledge that this software is not designed or intended for use in the
-* design, construction, operation or maintenance of any nuclear facility.
-*/
-
+ * Copyright (c) 2003 Sun Microsystems, Inc. All  Rights Reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * -Redistribution of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ *
+ * -Redistribution 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.
+ *
+ * Neither the name of Sun Microsystems, Inc. or the names of contributors may
+ * be used to endorse or promote products derived from this software without
+ * specific prior written permission.
+ *
+ * This software is provided "AS IS," without a warranty of any kind.
+ * ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES, INCLUDING
+ * ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR
+ * NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN MICROSYSTEMS, INC. ("SUN") AND ITS
+ * LICENSORS SHALL NOT BE LIABLE FOR ANY DAMAGES SUFFERED BY LICENSEE AS A
+ * RESULT OF USING, MODIFYING OR DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES.
+ * IN NO EVENT WILL SUN OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT
+ * OR DATA, OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR
+ * PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF SUN HAS
+ * BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ *
+ * You acknowledge that this software is not designed or intended for use in the
+ * design, construction, operation or maintenance of any nuclear facility.
+ */
 import com.jogamp.common.nio.Buffers;
+import java.io.IOException;
 import java.nio.*;
 
 import com.jogamp.openal.eax.*;
 import com.jogamp.openal.util.*;
+import javax.sound.sampled.UnsupportedAudioFileException;
 
 /**
  * @author Athomas Goldberg
- *
+ * @author Michael Bien
  */
 public class OpenALTest {
-    public static void main(String[] args) {
-    	try {
-			ALC alc = ALFactory.getALC();
-			ALCdevice device = alc.alcOpenDevice(null);
-			ALCcontext context = alc.alcCreateContext(device, null);
-			alc.alcMakeContextCurrent(context);
-			AL al = ALFactory.getAL();
-			boolean eaxPresent = al.alIsExtensionPresent("EAX2.0");
-			System.out.println("EAX present:" + eaxPresent);
-			EAX eax = EAXFactory.getEAX();
-
-			try {
-				int[] buffers = new int[1];
-				al.alGenBuffers(1, buffers, 0);
-
-				WAVData wd = WAVLoader.loadFromFile("lewiscarroll.wav");
-				al.alBufferData(buffers[0], wd.format, wd.data, wd.size, wd.freq);
-
-				int[] sources = new int[1];
-				al.alGenSources(1, sources, 0);
-				al.alSourcei(sources[0], AL.AL_BUFFER, buffers[0]);
-				int[] loopArray = new int[1];
-				al.alGetSourcei(sources[0], AL.AL_LOOPING, loopArray, 0);
-				System.out.println("Looping 1: " + (loopArray[0] == AL.AL_TRUE));
-				int[] loopBuffer = new int[1];
-				al.alGetSourcei(sources[0], AL.AL_LOOPING, loopBuffer, 0);
-				System.out.println("Looping 2: " + (loopBuffer[0] == AL.AL_TRUE));
-
-				if (eaxPresent) {
-					IntBuffer env = Buffers.newDirectIntBuffer(1);
-					env.put(EAX.EAX_ENVIRONMENT_BATHROOM);
-					eax.setListenerProperty(
-						EAX.DSPROPERTY_EAXLISTENER_ENVIRONMENT,
-						env);
-				}
-
-				al.alSourcePlay(sources[0]);
-
-				try {
-					Thread.sleep(5000);
-				} catch (InterruptedException e) {
-				}
-
-				al.alSource3f(sources[0], AL.AL_POSITION, 2f, 2f, 2f);
-
-				try {
-					Thread.sleep(5000);
-				} catch (InterruptedException e) {
-				}
-
-				al.alListener3f(AL.AL_POSITION, 3f, 3f, 3f);
-
-				try {
-					Thread.sleep(5000);
-				} catch (InterruptedException e) {
-				}
-
-				al.alSource3f(sources[0], AL.AL_POSITION, 0, 0, 0);
-
-				try {
-					Thread.sleep(10000);
-				} catch (InterruptedException e) {
-				}
-
-				al.alSourceStop(sources[0]);
-				al.alDeleteSources(1, sources, 0);
-				alc.alcDestroyContext(context);
-				alc.alcCloseDevice(device);
-			} catch (Exception e) {
-				e.printStackTrace();
-			}
-		} catch (ALException e) {
-		    e.printStackTrace();
-		}
+
+    public static void main(String[] args) throws InterruptedException, UnsupportedAudioFileException, IOException {
+        ALC alc = ALFactory.getALC();
+        ALCdevice device = alc.alcOpenDevice(null);
+        ALCcontext context = alc.alcCreateContext(device, null);
+        alc.alcMakeContextCurrent(context);
+        AL al = ALFactory.getAL();
+
+        boolean eaxPresent = al.alIsExtensionPresent("EAX2.0");
+        System.out.println("EAX present:" + eaxPresent);
+
+        int[] buffers = new int[1];
+        al.alGenBuffers(1, buffers, 0);
+
+        WAVData wd = WAVLoader.loadFromStream(OpenALTest.class.getResourceAsStream("lewiscarroll.wav"));
+        al.alBufferData(buffers[0], wd.format, wd.data, wd.size, wd.freq);
+
+        int[] sources = new int[1];
+        al.alGenSources(1, sources, 0);
+        al.alSourcei(sources[0], AL.AL_BUFFER, buffers[0]);
+
+        int[] loopArray = new int[1];
+        al.alGetSourcei(sources[0], AL.AL_LOOPING, loopArray, 0);
+        System.out.println("Looping 1: " + (loopArray[0] == AL.AL_TRUE));
+
+        int[] loopBuffer = new int[1];
+        al.alGetSourcei(sources[0], AL.AL_LOOPING, loopBuffer, 0);
+        System.out.println("Looping 2: " + (loopBuffer[0] == AL.AL_TRUE));
+
+        if (eaxPresent) {
+            EAX eax = EAXFactory.getEAX();
+            IntBuffer env = Buffers.newDirectIntBuffer(1);
+            env.put(EAX.EAX_ENVIRONMENT_BATHROOM);
+            eax.setListenerProperty(EAX.DSPROPERTY_EAXLISTENER_ENVIRONMENT, env);
+        }
+
+        al.alSourcePlay(sources[0]);
+
+        Thread.sleep(5000);
+
+        al.alSource3f(sources[0], AL.AL_POSITION, 2f, 2f, 2f);
+
+        Thread.sleep(5000);
+
+        al.alListener3f(AL.AL_POSITION, 3f, 3f, 3f);
+
+        Thread.sleep(5000);
+
+        al.alSource3f(sources[0], AL.AL_POSITION, 0, 0, 0);
+
+        Thread.sleep(10000);
+
+        al.alSourceStop(sources[0]);
+        al.alDeleteSources(1, sources, 0);
+        alc.alcDestroyContext(context);
+        alc.alcCloseDevice(device);
     }
 }