Menu
▾
▴
[Java-game-lib-cvs] CVS: LWJGL/src/java/org/lwjgl/test/openal ALTest.java,1.2,1.3 BasicTest.java,1.2,1.3 PlayTest.java,1.2,1.3 PlayTestMemory.java,1.2,1.3 ALUTTest.java,1.2,NONE
|
From: Brian M. <ma...@us...> - 2002-12-18 16:53:30
|
Update of /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/test/openal In directory sc8-pr-cvs1:/tmp/cvs-serv2148/openal Modified Files: ALTest.java BasicTest.java PlayTest.java PlayTestMemory.java Removed Files: ALUTTest.java Log Message: mod: ALUT removed, caused waaay to many headaches Index: ALTest.java CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/test/openal/ALTest.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/test/openal/ALTest.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- ALTest.java 21 Nov 2002 22:38:07 -0000 1.2 +++ ALTest.java 18 Dec 2002 16:53:27 -0000 1.3 @@ -35,7 +35,6 @@ import org.lwjgl.openal.ALC; import org.lwjgl.openal.ALCcontext; import org.lwjgl.openal.ALCdevice; -import org.lwjgl.openal.ALUTLoadWAVData; import org.lwjgl.openal.eax.EAX; import org.lwjgl.openal.eax.EAXBufferProperties; import org.lwjgl.openal.eax.EAXListenerProperties; @@ -340,16 +339,16 @@ // Load in samples to be used by Test functions // Load footsteps.wav - ALUTLoadWAVData data = alut.loadWAVFile("Footsteps.wav"); - if ((error = al.getError()) != AL.NO_ERROR) { - displayALError("alutLoadWAVFile footsteps.wav : ", error); + WaveData wavefile = WaveData.create("Footsteps.wav"); + if (wavefile == null) { + displayALError("LoadWAVFile footsteps.wav : ", error); // Delete Buffers al.deleteBuffers(NUM_BUFFERS, Sys.getDirectBufferAddress(buffers)); System.exit(-1); } // Copy footsteps.wav data into AL Buffer 0 - al.bufferData(buffers.get(0), data.format, data.data, data.size, data.freq); + al.bufferData(buffers.get(0), wavefile.format, Sys.getDirectBufferAddress(wavefile.data), wavefile.data.capacity(), wavefile.samplerate); if ((error = al.getError()) != AL.NO_ERROR) { displayALError("alBufferData buffer 0 : ", error); // Delete buffers @@ -358,25 +357,20 @@ } // Unload footsteps.wav - alut.unloadWAV(data.format, data.data, data.size, data.freq); - if ((error = al.getError()) != AL.NO_ERROR) { - displayALError("alutUnloadWAV : ", error); - // Delete buffers - al.deleteBuffers(NUM_BUFFERS, Sys.getDirectBufferAddress(buffers)); - System.exit(-1); - } + wavefile.dispose(); + wavefile = null; // Load ding.wav - data = alut.loadWAVFile("ding.wav"); - if ((error = al.getError()) != AL.NO_ERROR) { - displayALError("alutLoadWAVFile ding.wav : ", error); + wavefile = WaveData.create("ding.wav"); + if (wavefile == null) { + displayALError("LoadWAVFile ding.wav : ", error); // Delete Buffers al.deleteBuffers(NUM_BUFFERS, Sys.getDirectBufferAddress(buffers)); System.exit(-1); } // Copy ding.wav data into AL Buffer 1 - al.bufferData(buffers.get(1), data.format, data.data, data.size, data.freq); + al.bufferData(buffers.get(1), wavefile.format, Sys.getDirectBufferAddress(wavefile.data), wavefile.data.capacity(), wavefile.samplerate); if ((error = al.getError()) != AL.NO_ERROR) { displayALError("alBufferData buffer 1 : ", error); // Delete buffers @@ -385,25 +379,20 @@ } // Unload footsteps.wav - alut.unloadWAV(data.format, data.data, data.size, data.freq); - if ((error = al.getError()) != AL.NO_ERROR) { - displayALError("alutUnloadWAV : ", error); - // Delete buffers - al.deleteBuffers(NUM_BUFFERS, Sys.getDirectBufferAddress(buffers)); - System.exit(-1); - } - + wavefile.dispose(); + wavefile = null; + // Load wave1.wav - data = alut.loadWAVFile("Wave1.WAV"); - if ((error = al.getError()) != AL.NO_ERROR) { - displayALError("alutLoadWAVFile wave1.wav : ", error); + wavefile = WaveData.create("Wave1.WAV"); + if (wavefile == null) { + displayALError("LoadWAVFile wave1.wav : ", error); // Delete Buffers al.deleteBuffers(NUM_BUFFERS, Sys.getDirectBufferAddress(buffers)); System.exit(-1); } // Copy wave1.wav data into AL Buffer 2 - al.bufferData(buffers.get(2), data.format, data.data, data.size, data.freq); + al.bufferData(buffers.get(2), wavefile.format, Sys.getDirectBufferAddress(wavefile.data), wavefile.data.capacity(), wavefile.samplerate); if ((error = al.getError()) != AL.NO_ERROR) { displayALError("alBufferData buffer 2 : ", error); // Delete buffers @@ -412,25 +401,20 @@ } // Unload wave1.wav - alut.unloadWAV(data.format, data.data, data.size, data.freq); - if ((error = al.getError()) != AL.NO_ERROR) { - displayALError("alutUnloadWAV : ", error); - // Delete buffers - al.deleteBuffers(NUM_BUFFERS, Sys.getDirectBufferAddress(buffers)); - System.exit(-1); - } + wavefile.dispose(); + wavefile = null; // Load Wave2.wav - data = alut.loadWAVFile("Wave2.WAV"); - if ((error = al.getError()) != AL.NO_ERROR) { - displayALError("alutLoadWAVFile Wave2.wav : ", error); + wavefile = WaveData.create("Wave2.WAV"); + if (wavefile == null) { + displayALError("LoadWAVFile Wave2.wav : ", error); // Delete Buffers al.deleteBuffers(NUM_BUFFERS, Sys.getDirectBufferAddress(buffers)); System.exit(-1); } // Copy Wave2.wav data into AL Buffer 3 - al.bufferData(buffers.get(3), data.format, data.data, data.size, data.freq); + al.bufferData(buffers.get(3), wavefile.format, Sys.getDirectBufferAddress(wavefile.data), wavefile.data.capacity(), wavefile.samplerate); if ((error = al.getError()) != AL.NO_ERROR) { displayALError("alBufferData buffer 3 : ", error); // Delete buffers @@ -439,25 +423,20 @@ } // Unload Wave2.wav - alut.unloadWAV(data.format, data.data, data.size, data.freq); - if ((error = al.getError()) != AL.NO_ERROR) { - displayALError("alutUnloadWAV : ", error); - // Delete buffers - al.deleteBuffers(NUM_BUFFERS, Sys.getDirectBufferAddress(buffers)); - System.exit(-1); - } + wavefile.dispose(); + wavefile = null; // Load wave3.wav - data = alut.loadWAVFile("Wave3.WAV"); - if ((error = al.getError()) != AL.NO_ERROR) { - displayALError("alutLoadWAVFile wave3.wav : ", error); + wavefile = WaveData.create("Wave3.WAV"); + if (wavefile == null) { + displayALError("LoadWAVFile wave3.wav : ", error); // Delete Buffers al.deleteBuffers(NUM_BUFFERS, Sys.getDirectBufferAddress(buffers)); System.exit(-1); } // Copy wave3.wav data into AL Buffer 4 - al.bufferData(buffers.get(4), data.format, data.data, data.size, data.freq); + al.bufferData(buffers.get(4), wavefile.format, Sys.getDirectBufferAddress(wavefile.data), wavefile.data.capacity(), wavefile.samplerate); if ((error = al.getError()) != AL.NO_ERROR) { displayALError("alBufferData buffer 4 : ", error); // Delete buffers @@ -466,25 +445,20 @@ } // Unload wave3.wav - alut.unloadWAV(data.format, data.data, data.size, data.freq); - if ((error = al.getError()) != AL.NO_ERROR) { - displayALError("alutUnloadWAV : ", error); - // Delete buffers - al.deleteBuffers(NUM_BUFFERS, Sys.getDirectBufferAddress(buffers)); - System.exit(-1); - } + wavefile.dispose(); + wavefile = null; // Load wave4.wav - data = alut.loadWAVFile("Wave4.WAV"); - if ((error = al.getError()) != AL.NO_ERROR) { - displayALError("alutLoadWAVFile wave4.wav : ", error); + wavefile = WaveData.create("Wave4.WAV"); + if (wavefile == null) { + displayALError("LoadWAVFile wave4.wav : ", error); // Delete Buffers al.deleteBuffers(NUM_BUFFERS, Sys.getDirectBufferAddress(buffers)); System.exit(-1); } // Copy wave4.wav data into AL Buffer 5 - al.bufferData(buffers.get(5), data.format, data.data, data.size, data.freq); + al.bufferData(buffers.get(5), wavefile.format, Sys.getDirectBufferAddress(wavefile.data), wavefile.data.capacity(), wavefile.samplerate); if ((error = al.getError()) != AL.NO_ERROR) { displayALError("alBufferData buffer 5 : ", error); // Delete buffers @@ -493,25 +467,20 @@ } // Unload wave4.wav - alut.unloadWAV(data.format, data.data, data.size, data.freq); - if ((error = al.getError()) != AL.NO_ERROR) { - displayALError("alutUnloadWAV : ", error); - // Delete buffers - al.deleteBuffers(NUM_BUFFERS, Sys.getDirectBufferAddress(buffers)); - System.exit(-1); - } + wavefile.dispose(); + wavefile = null; // Load stereo.wav - data = alut.loadWAVFile("stereo.wav"); - if ((error = al.getError()) != AL.NO_ERROR) { - displayALError("alutLoadWAVFile stereo.wav : ", error); + wavefile = WaveData.create("stereo.wav"); + if (wavefile == null) { + displayALError("LoadWAVFile stereo.wav : ", error); // Delete Buffers al.deleteBuffers(NUM_BUFFERS, Sys.getDirectBufferAddress(buffers)); System.exit(-1); } // Copy stereo.wav data into AL Buffer 6 - al.bufferData(buffers.get(6), data.format, data.data, data.size, data.freq); + al.bufferData(buffers.get(6), wavefile.format, Sys.getDirectBufferAddress(wavefile.data), wavefile.data.capacity(), wavefile.samplerate); if ((error = al.getError()) != AL.NO_ERROR) { displayALError("alBufferData buffer 6 : ", error); // Delete buffers @@ -520,13 +489,8 @@ } // Unload stereo.wav - alut.unloadWAV(data.format, data.data, data.size, data.freq); - if ((error = al.getError()) != AL.NO_ERROR) { - displayALError("alutUnloadWAV : ", error); - // Delete buffers - al.deleteBuffers(NUM_BUFFERS, Sys.getDirectBufferAddress(buffers)); - System.exit(-1); - } + wavefile.dispose(); + wavefile = null; //do EAX check (can only be performed after device / context creation eaxAvailable = al.isExtensionPresent("EAX"); Index: BasicTest.java CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/test/openal/BasicTest.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/test/openal/BasicTest.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- BasicTest.java 14 Dec 2002 12:43:45 -0000 1.2 +++ BasicTest.java 18 Dec 2002 16:53:27 -0000 1.3 @@ -35,7 +35,6 @@ import org.lwjgl.openal.ALC; import org.lwjgl.openal.ALCcontext; import org.lwjgl.openal.ALCdevice; -import org.lwjgl.openal.ALUT; import java.nio.ByteBuffer; import java.nio.ByteOrder; @@ -56,10 +55,7 @@ /** OpenAL Context instance */ protected ALC alc; - - /** OpenAL Util library instance */ - protected ALUT alut; - + /** OpenAL context */ protected ALCcontext context; @@ -84,15 +80,7 @@ } catch (Exception e) { e.printStackTrace(); return; - } - - alut = new ALUT(); - try { - alut.create(); - } catch (Exception e) { - e.printStackTrace(); - return; - } + } } /** @@ -152,7 +140,7 @@ temp.order(ByteOrder.nativeOrder()); return temp.asIntBuffer(); - } + } /** * Exits the test NOW, printing errorcode to stdout Index: PlayTest.java CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/test/openal/PlayTest.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/test/openal/PlayTest.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- PlayTest.java 14 Dec 2002 12:44:17 -0000 1.2 +++ PlayTest.java 18 Dec 2002 16:53:27 -0000 1.3 @@ -33,7 +33,6 @@ import org.lwjgl.Sys; import org.lwjgl.openal.AL; -import org.lwjgl.openal.ALUTLoadWAVData; import java.nio.IntBuffer; @@ -85,23 +84,16 @@ } //load wave data - ALUTLoadWAVData file = alut.loadWAVFile(args[0]); - if((lastError = al.getError()) != AL.NO_ERROR) { - exit(lastError); - } - + WaveData wavefile = WaveData.create(args[0]); //copy to buffers - al.bufferData(buffers.get(0), file.format, file.data, file.size, file.freq); + al.bufferData(buffers.get(0), wavefile.format, Sys.getDirectBufferAddress(wavefile.data), wavefile.data.capacity(), wavefile.samplerate); if((lastError = al.getError()) != AL.NO_ERROR) { exit(lastError); } //unload file again - alut.unloadWAV(file.format, file.data, file.size, file.freq); - if((lastError = al.getError()) != AL.NO_ERROR) { - exit(lastError); - } + wavefile.dispose(); //set up source input al.sourcei(sources.get(0), AL.BUFFER, buffers.get(0)); Index: PlayTestMemory.java CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/test/openal/PlayTestMemory.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/test/openal/PlayTestMemory.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- PlayTestMemory.java 14 Dec 2002 12:44:17 -0000 1.2 +++ PlayTestMemory.java 18 Dec 2002 16:53:27 -0000 1.3 @@ -33,7 +33,6 @@ import org.lwjgl.Sys; import org.lwjgl.openal.AL; -import org.lwjgl.openal.ALUTLoadWAVData; import java.io.BufferedInputStream; import java.io.ByteArrayOutputStream; @@ -97,23 +96,18 @@ System.exit(-1); } - ALUTLoadWAVData file = alut.loadWAVMemory(Sys.getDirectBufferAddress(filebuffer)); - if((lastError = al.getError()) != AL.NO_ERROR) { - exit(lastError); - } + //ALUTLoadWAVData file = alut.loadWAVMemory(Sys.getDirectBufferAddress(filebuffer)); + WaveData wavefile = WaveData.create(filebuffer.array()); //copy to buffers - al.bufferData(buffers.get(0), file.format, file.data, file.size, file.freq); + al.bufferData(buffers.get(0), wavefile.format, Sys.getDirectBufferAddress(wavefile.data), wavefile.data.capacity(), wavefile.samplerate); if((lastError = al.getError()) != AL.NO_ERROR) { exit(lastError); - } - + } + //unload file again - alut.unloadWAV(file.format, file.data, file.size, file.freq); - if((lastError = al.getError()) != AL.NO_ERROR) { - exit(lastError); - } + wavefile.dispose(); //set up source input al.sourcei(sources.get(0), AL.BUFFER, buffers.get(0)); @@ -158,7 +152,6 @@ } //no errorchecking from now on, since our context is gone. - //shutdown alExit(); } @@ -198,7 +191,7 @@ //done reading, close bis.close(); - buffer = ByteBuffer.allocateDirect(baos.size()); + buffer = ByteBuffer.allocate(baos.size()); buffer.order(ByteOrder.nativeOrder()); buffer.put(baos.toByteArray()); } catch (Exception ioe) { --- ALUTTest.java DELETED --- CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/test/openal/ALUTTest.java |
