java-game-lib-cvs Mailing List for Lightweight Java Game Library

Update of /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/test/openal
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22415

Modified Files:
	BasicTest.java 
Log Message:
support for ALC_ENUMERATION_EXT using LWJGL specific method: AL.getImplementations

Index: BasicTest.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/test/openal/BasicTest.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- BasicTest.java	20 Feb 2005 11:24:19 -0000	1.20
+++ BasicTest.java	2 Feb 2006 22:34:28 -0000	1.21
@@ -53,6 +53,18 @@
    */
   public BasicTest() {
     try {
+      String[] imps = AL.getImplementations();
+      if(imps.length > 0) {
+    	  System.out.println("Available devices: ");
+    	  for(int i=0; i<imps.length; i++) {
+	        System.out.println("  " + i + ": " + imps[i]);
+	      }
+      }
+    } catch (Exception e) {
+    	System.out.println("Unable to query available devices: " + e.getMessage());
+    }
+	  
+    try {
       AL.create();
     } catch (Exception e) {
       System.out.println("Unable to create OpenAL.\nPlease make sure that OpenAL is available on this system. Exception: " + e);

Update of /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/openal
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22082

Modified Files:
	AL.java ALC.java 
Log Message:
support for ALC_ENUMERATION_EXT using LWJGL specific method: AL.getImplementations

Index: AL.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/openal/AL.java,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -d -r1.49 -r1.50
--- AL.java	16 Jan 2006 19:35:09 -0000	1.49
+++ AL.java	2 Feb 2006 22:33:41 -0000	1.50
@@ -31,6 +31,8 @@
  */
 package org.lwjgl.openal;
 
+import java.util.Vector;
+
 import org.lwjgl.LWJGLException;
 import org.lwjgl.LWJGLUtil;
 import org.lwjgl.Sys;
@@ -52,7 +54,7 @@
 
 	/** Have we been created? */
 	private static boolean created;
-
+	
 	static {
 		Sys.initialize();
 	}
@@ -96,8 +98,17 @@
 	 * @param contextFrequency Frequency for mixing output buffer, in units of Hz (Common values include 11025, 22050, and 44100).
 	 * @param contextRefresh Refresh intervalls, in units of Hz.
 	 * @param contextSynchronized Flag, indicating a synchronous context.* 
+	 */	
+	public static void create(String deviceArguments, int contextFrequency, int contextRefresh, boolean contextSynchronized) 
+		throws LWJGLException {
+		create(deviceArguments, contextFrequency, contextRefresh, contextSynchronized, true);
+	}
+	
+	/**
+	 * @param openDevice Whether to automatically open the device
+	 * @see #create(String, int, int, boolean)
 	 */
-	public static void create(String deviceArguments, int contextFrequency, int contextRefresh, boolean contextSynchronized)
+	static void create(String deviceArguments, int contextFrequency, int contextRefresh, boolean contextSynchronized, boolean openDevice)
 		throws LWJGLException {
 			
 		if (created)
@@ -128,18 +139,20 @@
 			AL10.initNativeStubs();
 			ALC.initNativeStubs();
 
-			device = ALC.alcOpenDevice(deviceArguments);
-			if (device == null)
-				throw new LWJGLException("Could not open ALC device");
-
-			if (contextFrequency == -1) {
-				context = ALC.alcCreateContext(device.device, null);
-			} else {
-				context = ALC.alcCreateContext(device.device,
-						ALCcontext.createAttributeList(contextFrequency, contextRefresh, 
-							contextSynchronized ? ALC.ALC_TRUE : ALC.ALC_FALSE));
+			if(openDevice) {
+				device = ALC.alcOpenDevice(deviceArguments);
+				if (device == null)
+					throw new LWJGLException("Could not open ALC device");
+	
+				if (contextFrequency == -1) {
+					context = ALC.alcCreateContext(device.device, null);
+				} else {
+					context = ALC.alcCreateContext(device.device,
+							ALCcontext.createAttributeList(contextFrequency, contextRefresh, 
+								contextSynchronized ? ALC.ALC_TRUE : ALC.ALC_FALSE));
+				}
+				ALC.alcMakeContextCurrent(context.context);
 			}
-			ALC.alcMakeContextCurrent(context.context);
 		} catch (LWJGLException e) {
 			destroy();
 			throw e;
@@ -189,4 +202,41 @@
 	public static Object getContext() {
 		return context;
 	}
+	
+	/**
+	 * 
+	 * @return
+	 */
+	public static String[] getImplementations() throws LWJGLException, OpenALException {
+		if(AL.isCreated()) {
+			throw new OpenALException("Cannot enumerate devices if AL has already been created");
+		}
+
+		Vector availableDevices 	= new Vector();
+
+		try {
+			// init
+			create(null, 44100, 60, false, false);
+			
+			// check for extension
+			if(!ALC.alcIsExtensionPresent("ALC_ENUMERATION_EXT")) {
+				throw new OpenALException("ALC_ENUMERATION_EXT extension not available");
+			}
+			
+			// get list of published devices
+			String[] publishedDevices = ALC.ngetImplementations();
+
+			// run through them and verify
+			for (int i = 0; i < publishedDevices.length; i++) {
+				availableDevices.add(publishedDevices[i]);
+			}
+		} finally {
+			destroy();
+		}
+		
+		String[] available = new String[availableDevices.size()];
+		availableDevices.copyInto(available);
+		
+		return available;
+	}
 }

Index: ALC.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/openal/ALC.java,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- ALC.java	4 May 2005 20:59:41 -0000	1.28
+++ ALC.java	2 Feb 2006 22:33:41 -0000	1.29
@@ -148,6 +148,13 @@
 	}
 
 	static native void initNativeStubs() throws LWJGLException;
+	
+	static long getDevice() {
+		if(AL.device != null) {
+			return AL.device.device;
+		}
+		return 0L;
+	}
 
 	/**
 	 * The application can obtain certain strings from ALC.
@@ -164,7 +171,8 @@
 	 * @return String property from device
 	 */
 	public static String alcGetString(int pname) {
-		String result = nalcGetString(AL.device.device, pname);
+		String result;
+		result = nalcGetString(getDevice(), pname);
 		Util.checkALCError();
 		return result;
 	}
@@ -192,7 +200,7 @@
 	 */
 	public static void alcGetInteger(int pname, IntBuffer integerdata) {
 		BufferChecks.checkDirect(integerdata);
-		nalcGetIntegerv(AL.device.device, pname, integerdata.remaining(), integerdata, integerdata.position());
+		nalcGetIntegerv(getDevice(), pname, integerdata.remaining(), integerdata, integerdata.position());
 		Util.checkALCError();
 	}
 	private native static void nalcGetIntegerv(long device, int pname, int size, Buffer integerdata, int offset);
@@ -333,7 +341,7 @@
 	 * @return Errorcode from ALC statemachine
 	 */
 	public static int alcGetError() {
-		return nalcGetError(AL.device.device);
+		return nalcGetError(getDevice());
 	}
 	private native static int nalcGetError(long device);
 
@@ -347,7 +355,7 @@
 	 * @return true if extension is available, false if not
 	 */
 	public static boolean alcIsExtensionPresent(String extName) {
-		boolean result = nalcIsExtensionPresent(AL.device.device, extName);
+		boolean result = nalcIsExtensionPresent(getDevice(), extName);
 		Util.checkALCError();
 		return result;
 	}
@@ -364,9 +372,11 @@
 	 * @return value of enumeration
 	 */
 	public static int alcGetEnumValue(String enumName) {
-		int result = nalcGetEnumValue(AL.device.device, enumName);
+		int result = nalcGetEnumValue(getDevice(), enumName);
 		Util.checkALCError();
 		return result;
 	}
 	private native static int nalcGetEnumValue(long device, String enumName);
+
+	static native String[] ngetImplementations();
 }

Update of /cvsroot/java-game-lib/LWJGL/src/native/common
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21925

Modified Files:
	org_lwjgl_openal_ALC.c 
Log Message:
support for ALC_ENUMERATION_EXT using LWJGL specific method: AL.getImplementations

Index: org_lwjgl_openal_ALC.c
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/org_lwjgl_openal_ALC.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- org_lwjgl_openal_ALC.c	20 Nov 2005 13:47:45 -0000	1.9
+++ org_lwjgl_openal_ALC.c	2 Feb 2006 22:33:17 -0000	1.10
@@ -343,6 +343,53 @@
 	return result;
 }
 
+JNIEXPORT jobjectArray JNICALL Java_org_lwjgl_openal_ALC_ngetImplementations(JNIEnv *env, jclass clazz) {
+    jclass strcls;
+    jarray strarr;
+	jstring str;
+
+	char *deviceList;
+	char *devices[12];
+	int numDevices, i;
+	
+	// get device list
+	deviceList = (char *)alcGetString(NULL, 4100L);
+
+	// build list
+	for (numDevices = 0; numDevices < 12; numDevices++) {devices[numDevices] = NULL;}
+	for (numDevices = 0; numDevices < 12; numDevices++) {
+		devices[numDevices] = deviceList;
+		deviceList += strlen(deviceList);
+		if (deviceList[0] == 0) {
+			if (deviceList[1] == 0) {
+				break;
+			} else {
+				deviceList += 1;
+			}
+		}
+	}
+	
+	// iterate found devices and add to java string array
+	if (devices[numDevices] != NULL) {
+		numDevices++;
+		strcls = (*env)->FindClass(env, "java/lang/String");
+		strarr = (*env)->NewObjectArray(env, numDevices+1, strcls, 0);
+
+		// add default
+		str = NewStringNative(env, "NULL Device (Default)");
+		(*env)->SetObjectArrayElement(env, strarr, 0, str);
+		(*env)->DeleteLocalRef(env, str);
+
+		for (i = 0; i < numDevices; i++) {
+			str = NewStringNative(env, devices[i]);
+			(*env)->SetObjectArrayElement(env, strarr, i+1, str);
+			(*env)->DeleteLocalRef(env, str);
+		}
+
+	}
+	return strarr;
+}
+
 /**
  * Loads the context OpenAL functions
  *