|
From: Brian M. <ma...@us...> - 2005-05-22 12:12:43
|
Update of /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/test/fmod3 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3724/java/org/lwjgl/test/fmod3 Modified Files: CDDAPlayer.java CDPlayer.java DSPTest.java MusicPlayer.java NetTest.java StreamPlayer.java StreamPlayerMemory.java StreamTest.java SyncTest.java TagFieldTest.java Log Message: added System.exit so that vm instances gets nuked in webstart Index: DSPTest.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/test/fmod3/DSPTest.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- DSPTest.java 3 Oct 2004 09:35:38 -0000 1.4 +++ DSPTest.java 22 May 2005 12:12:02 -0000 1.5 @@ -67,21 +67,21 @@ File file = new File(args[0]); if (!file.exists()) { System.out.println("No such file: " + args[0]); - return; + System.exit(0); } try { FMOD.create(); } catch (FMODException fmode) { fmode.printStackTrace(); - return; + System.exit(0); } System.out.println("Initializing FMOD"); if (!FSound.FSOUND_Init(44100, 32, 0)) { System.out.println("Failed to initialize FMOD"); System.out.println("Error: " + FMOD.FMOD_ErrorString(FSound.FSOUND_GetError())); - return; + System.exit(0); } System.out.println("Loading " + args[0]); @@ -156,6 +156,7 @@ FSound.FSOUND_Close(); FMOD.destroy(); + System.exit(0); } public class TestDspCallback implements FSoundDSPCallback { Index: StreamPlayer.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/test/fmod3/StreamPlayer.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- StreamPlayer.java 3 Oct 2004 09:35:38 -0000 1.4 +++ StreamPlayer.java 22 May 2005 12:12:02 -0000 1.5 @@ -59,21 +59,21 @@ File file = new File(args[0]); if (!file.exists()) { System.out.println("No such file: " + args[0]); - return; + System.exit(0); } try { FMOD.create(); } catch (FMODException fmode) { fmode.printStackTrace(); - return; + System.exit(0); } System.out.println("Initializing FMOD"); if (!FSound.FSOUND_Init(44100, 32, 0)) { System.out.println("Failed to initialize FMOD"); System.out.println("Error: " + FMOD.FMOD_ErrorString(FSound.FSOUND_GetError())); - return; + System.exit(0); } System.out.println("Loading " + args[0]); @@ -98,5 +98,6 @@ FSound.FSOUND_Close(); FMOD.destroy(); + System.exit(0); } } \ No newline at end of file Index: CDDAPlayer.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/test/fmod3/CDDAPlayer.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- CDDAPlayer.java 12 Jun 2004 20:28:25 -0000 1.2 +++ CDDAPlayer.java 22 May 2005 12:12:02 -0000 1.3 @@ -53,13 +53,14 @@ FMOD.create(); } catch (FMODException fmode) { fmode.printStackTrace(); - return; + System.exit(0); } System.out.println("Initializing FMOD"); if (!FSound.FSOUND_Init(44100, 32, 0)) { System.out.println("Failed to initialize FMOD"); - return; + System.exit(0); + } boolean running = true; @@ -115,5 +116,8 @@ } FSound.FSOUND_Close(); FMOD.destroy(); + System.exit(0); } + + } \ No newline at end of file Index: SyncTest.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/test/fmod3/SyncTest.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- SyncTest.java 7 Feb 2005 16:39:54 -0000 1.5 +++ SyncTest.java 22 May 2005 12:12:03 -0000 1.6 @@ -109,7 +109,7 @@ File file = new File(args[0]); if (!file.exists()) { System.out.println("No such file: " + args[0]); - return; + System.exit(0); } // initialize FMOD @@ -118,7 +118,7 @@ FMOD.create(); } catch (FMODException fmode) { fmode.printStackTrace(); - return; + System.exit(0); } // start actual test @@ -254,5 +254,6 @@ } FSound.FSOUND_Close(); FMOD.destroy(); + System.exit(0); } } Index: NetTest.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/test/fmod3/NetTest.java,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- NetTest.java 3 Oct 2004 09:00:36 -0000 1.6 +++ NetTest.java 22 May 2005 12:12:02 -0000 1.7 @@ -110,6 +110,7 @@ stop(); FSound.FSOUND_Close(); FMOD.destroy(); + System.exit(0); } } Index: StreamPlayerMemory.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/test/fmod3/StreamPlayerMemory.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- StreamPlayerMemory.java 7 Dec 2004 06:38:37 -0000 1.4 +++ StreamPlayerMemory.java 22 May 2005 12:12:03 -0000 1.5 @@ -62,14 +62,14 @@ FMOD.create(); } catch (FMODException fmode) { fmode.printStackTrace(); - return; + System.exit(0); } System.out.println("Initializing FMOD"); if (!FSound.FSOUND_Init(44100, 32, 0)) { System.out.println("Failed to initialize FMOD"); System.out.println("Error: " + FMOD.FMOD_ErrorString(FSound.FSOUND_GetError())); - return; + System.exit(0); } ByteBuffer data = getData(args[0]); @@ -97,6 +97,7 @@ FSound.FSOUND_Close(); FMOD.destroy(); + System.exit(0); } /** Index: MusicPlayer.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/test/fmod3/MusicPlayer.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- MusicPlayer.java 3 Oct 2004 09:35:38 -0000 1.3 +++ MusicPlayer.java 22 May 2005 12:12:02 -0000 1.4 @@ -60,14 +60,14 @@ File file = new File(args[0]); if (!file.exists()) { System.out.println("No such file: " + args[0]); - return; + System.exit(0); } try { FMOD.create(); } catch (FMODException fmode) { fmode.printStackTrace(); - return; + System.exit(0); } System.out.println("Initializing FMOD"); @@ -101,5 +101,6 @@ FSound.FSOUND_Close(); FMOD.destroy(); + System.exit(0); } } \ No newline at end of file Index: TagFieldTest.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/test/fmod3/TagFieldTest.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- TagFieldTest.java 28 Oct 2004 20:01:08 -0000 1.2 +++ TagFieldTest.java 22 May 2005 12:12:03 -0000 1.3 @@ -75,11 +75,11 @@ System.out.println("Failed to initialize FMOD"); System.out.println("Error: " + FMOD.FMOD_ErrorString(FSound.FSOUND_GetError())); FMOD.destroy(); - return; + System.exit(0); } } catch (FMODException fmode) { fmode.printStackTrace(); - return; + System.exit(0); } // scan the supplied arg @@ -89,6 +89,7 @@ // shutdown FSound.FSOUND_Close(); FMOD.destroy(); + System.exit(0); } /** Index: StreamTest.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/test/fmod3/StreamTest.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- StreamTest.java 3 Oct 2004 09:35:38 -0000 1.2 +++ StreamTest.java 22 May 2005 12:12:03 -0000 1.3 @@ -51,7 +51,7 @@ FMOD.create(); } catch (FMODException fmode) { fmode.printStackTrace(); - return; + System.exit(0); } IntBuffer caps = BufferUtils.createIntBuffer(1); @@ -68,7 +68,7 @@ if (!FSound.FSOUND_Init(44100, 32, 0)) { System.out.println("Failed to initialize FMOD"); System.out.println("Error: " + FMOD.FMOD_ErrorString(FSound.FSOUND_GetError())); - return; + System.exit(0); } IntBuffer mem = BufferUtils.createIntBuffer(2); Index: CDPlayer.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/test/fmod3/CDPlayer.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- CDPlayer.java 12 Jun 2004 20:28:25 -0000 1.2 +++ CDPlayer.java 22 May 2005 12:12:02 -0000 1.3 @@ -52,13 +52,13 @@ FMOD.create(); } catch (FMODException fmode) { fmode.printStackTrace(); - return; + System.exit(0); } System.out.println("Initializing FMOD"); if (!FSound.FSOUND_Init(44100, 32, 0)) { System.out.println("Failed to initialize FMOD"); - return; + System.exit(0); } boolean running = true; @@ -132,5 +132,6 @@ FSound.FSOUND_Close(); FMOD.destroy(); + System.exit(0); } } \ No newline at end of file |