From 49521fc9affd2d9bc15b72c5977cda97009fc684 Mon Sep 17 00:00:00 2001
From: Carsten Weisse <cwei@bytonic.de>
Date: Thu, 23 Nov 2006 12:32:49 +0000
Subject: bugfix: solves the alGenSources problem.

the previous versions of
 lwjgl and joal didn't throw an exception if a sound driver doesn't support 32
 sound sources. Now it does and I changed the sound source generation
 handling.

---
 src/jake2/sound/joal/Channel.java  | 10 ++++++++--
 src/jake2/sound/lwjgl/Channel.java | 16 ++++++++++------
 2 files changed, 18 insertions(+), 8 deletions(-)

(limited to 'src')

diff --git a/src/jake2/sound/joal/Channel.java b/src/jake2/sound/joal/Channel.java
index d69afb9..09d2c16 100644
--- a/src/jake2/sound/joal/Channel.java
+++ b/src/jake2/sound/joal/Channel.java
@@ -3,7 +3,7 @@
  * 
  * Copyright (C) 2003
  *
- * $Id: Channel.java,v 1.7 2006-10-24 22:51:20 cawe Exp $
+ * $Id: Channel.java,v 1.8 2006-11-23 12:32:49 cawe Exp $
  */
 /*
 Copyright (C) 1997-2001 Id Software, Inc.
@@ -38,6 +38,7 @@ import java.nio.ByteBuffer;
 import java.util.*;
 
 import net.java.games.joal.AL;
+import net.java.games.joal.ALException;
 
 /**
  * Channel
@@ -108,10 +109,15 @@ public class Channel {
 		int sourceId;
 		for (int i = 0; i < MAX_CHANNELS; i++) {
 			
+		    try {
 			al.alGenSources(1, tmp, 0);
 			sourceId = tmp[0];
-			
+			// can't generate more sources 
 			if (sourceId <= 0) break;
+		    } catch (ALException e) {
+			// can't generate more sources 
+			break;
+		    }
 			
 			sources[i] = sourceId;
 
diff --git a/src/jake2/sound/lwjgl/Channel.java b/src/jake2/sound/lwjgl/Channel.java
index 0ffe1a3..0ef06dd 100644
--- a/src/jake2/sound/lwjgl/Channel.java
+++ b/src/jake2/sound/lwjgl/Channel.java
@@ -3,7 +3,7 @@
  * 
  * Copyright (C) 2003
  *
- * $Id: Channel.java,v 1.9 2006-10-26 22:02:55 cawe Exp $
+ * $Id: Channel.java,v 1.10 2006-11-23 12:32:49 cawe Exp $
  */
 /*
 Copyright (C) 1997-2001 Id Software, Inc.
@@ -109,11 +109,15 @@ public class Channel {
 	int sourceId;
 	for (int i = 0; i < MAX_CHANNELS; i++) {
 
-	    AL10.alGenSources(tmp);
-	    sourceId = tmp.get(0);
-
-	    // can't generate more sources 
-	    if (sourceId <= 0) break;
+	    try {
+		AL10.alGenSources(tmp);
+		sourceId = tmp.get(0);
+		// can't generate more sources 
+		if (sourceId <= 0) break;
+	    } catch (OpenALException e) {
+		// can't generate more sources 
+		break;
+	    }
 
 	    sources.put(i, sourceId);
 
-- 
cgit v1.2.3