aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarsten Weisse <[email protected]>2006-12-08 17:46:20 +0000
committerCarsten Weisse <[email protected]>2006-12-08 17:46:20 +0000
commite862a6fab0809a695cc4cf8fa12ce49c723dafad (patch)
treea80fe9120c4aeb943d877fb19b43d6e78764cf5a
parentce92bd38a36b2b8b632de02258318825ff8da752 (diff)
add the ALut class from joal only for the current webstart version moved to jake2.sound.joal package
-rw-r--r--src/jake2/sound/joal/ALut.java (renamed from src/net/java/games/joal/util/ALut.java)44
-rw-r--r--src/jake2/sound/joal/JOALSoundImpl.java1
2 files changed, 1 insertions, 44 deletions
diff --git a/src/net/java/games/joal/util/ALut.java b/src/jake2/sound/joal/ALut.java
index 4c10473..7d419f7 100644
--- a/src/net/java/games/joal/util/ALut.java
+++ b/src/jake2/sound/joal/ALut.java
@@ -1,10 +1,6 @@
-package net.java.games.joal.util;
+package jake2.sound.joal;
-import java.io.BufferedInputStream;
-import java.io.InputStream;
-import java.nio.ByteBuffer;
-
import net.java.games.joal.*;
/**
@@ -70,42 +66,4 @@ public final class ALut {
initializingThread = null;
}
- public static void alutLoadWAVFile(String fileName,
- int[] format,
- ByteBuffer[] data,
- int[] size,
- int[] freq,
- int[] loop) throws ALException {
- try {
- WAVData wd = WAVLoader.loadFromFile(fileName);
- format[0] = wd.format;
- data[0] = wd.data;
- size[0] = wd.size;
- freq[0] = wd.freq;
- loop[0] = wd.loop ? AL.AL_TRUE : AL.AL_FALSE;
- } catch (Exception e) {
- throw new ALException(e);
- }
- }
-
- public static void alutLoadWAVFile(InputStream stream,
- int[] format,
- ByteBuffer[] data,
- int[] size,
- int[] freq,
- int[] loop) throws ALException {
- try {
- if (!(stream instanceof BufferedInputStream)) {
- stream = new BufferedInputStream(stream);
- }
- WAVData wd = WAVLoader.loadFromStream(stream);
- format[0] = wd.format;
- data[0] = wd.data;
- size[0] = wd.size;
- freq[0] = wd.freq;
- loop[0] = wd.loop ? AL.AL_TRUE : AL.AL_FALSE;
- } catch (Exception e) {
- throw new ALException(e);
- }
- }
}
diff --git a/src/jake2/sound/joal/JOALSoundImpl.java b/src/jake2/sound/joal/JOALSoundImpl.java
index 764480b..2bbf3d7 100644
--- a/src/jake2/sound/joal/JOALSoundImpl.java
+++ b/src/jake2/sound/joal/JOALSoundImpl.java
@@ -18,7 +18,6 @@ import java.nio.*;
import net.java.games.joal.*;
import net.java.games.joal.eax.EAX;
import net.java.games.joal.eax.EAXFactory;
-import net.java.games.joal.util.ALut;
/**
* JOALSoundImpl