fmod -> fmod3

src/java/org/lwjgl/fmod3/FMOD.java

@@ -29,7 +29,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.lwjgl.fmod;
+package org.lwjgl.fmod3;
 
 import java.io.File;
 import java.nio.FloatBuffer;
@@ -187,7 +187,7 @@ public class FMOD {
   private static boolean initialized;
   
   /** The native JNI library name */
-  private static String JNI_LIBRARY_NAME = "lwjgl-fmod";
+  private static String JNI_LIBRARY_NAME = "lwjgl-fmod3";
   
   /** The native library name on win32 */
   private static String FMOD_WIN32_LIBRARY_NAME = "fmod.dll";

src/java/org/lwjgl/fmod3/FMODException.java

@@ -29,7 +29,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.lwjgl.fmod;
+package org.lwjgl.fmod3;
 
 import org.lwjgl.LWJGLException;
 

src/java/org/lwjgl/fmod3/FMusic.java

@@ -29,14 +29,14 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.lwjgl.fmod;
+package org.lwjgl.fmod3;
 
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
 import java.nio.IntBuffer;
 import java.util.ArrayList;
 
-import org.lwjgl.fmod.callbacks.FMusicCallback;
+import org.lwjgl.fmod3.callbacks.FMusicCallback;
 
 /**
  * $Id$

src/java/org/lwjgl/fmod3/FMusicModule.java

@@ -29,7 +29,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.lwjgl.fmod;
+package org.lwjgl.fmod3;
 
 /**
  * This class is a representation of a Module in FMod.

src/java/org/lwjgl/fmod3/FSound.java

@@ -29,21 +29,21 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.lwjgl.fmod;
+package org.lwjgl.fmod3;
 
 import java.nio.ByteBuffer;
 import java.nio.FloatBuffer;
 import java.nio.IntBuffer;
 import java.util.ArrayList;
 
-import org.lwjgl.fmod.callbacks.FSoundCloseCallback;
-import org.lwjgl.fmod.callbacks.FSoundDSPCallback;
-import org.lwjgl.fmod.callbacks.FSoundMetaDataCallback;
-import org.lwjgl.fmod.callbacks.FSoundOpenCallback;
-import org.lwjgl.fmod.callbacks.FSoundReadCallback;
-import org.lwjgl.fmod.callbacks.FSoundSeekCallback;
-import org.lwjgl.fmod.callbacks.FSoundStreamCallback;
-import org.lwjgl.fmod.callbacks.FSoundTellCallback;
+import org.lwjgl.fmod3.callbacks.FSoundCloseCallback;
+import org.lwjgl.fmod3.callbacks.FSoundDSPCallback;
+import org.lwjgl.fmod3.callbacks.FSoundMetaDataCallback;
+import org.lwjgl.fmod3.callbacks.FSoundOpenCallback;
+import org.lwjgl.fmod3.callbacks.FSoundReadCallback;
+import org.lwjgl.fmod3.callbacks.FSoundSeekCallback;
+import org.lwjgl.fmod3.callbacks.FSoundStreamCallback;
+import org.lwjgl.fmod3.callbacks.FSoundTellCallback;
 
 /**
  * $Id$

src/java/org/lwjgl/fmod3/FSoundDSPUnit.java

@@ -29,7 +29,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.lwjgl.fmod;
+package org.lwjgl.fmod3;
 
 /**
  * This class is a representation of a DSPUnit in FMod.

src/java/org/lwjgl/fmod3/FSoundReverbChannelProperties.java

@@ -29,7 +29,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.lwjgl.fmod;
+package org.lwjgl.fmod3;
 
 /**
  * This class is a representation of a Reverb channel property object in FMod.

src/java/org/lwjgl/fmod3/FSoundReverbProperties.java

@@ -29,7 +29,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.lwjgl.fmod;
+package org.lwjgl.fmod3;
 
 /**
  * This class is a representation of a Reverb property object in FMod.

src/java/org/lwjgl/fmod3/FSoundSample.java

@@ -29,7 +29,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.lwjgl.fmod;
+package org.lwjgl.fmod3;
 
 /**
  * This class is a representation of a Sound Sample in FMod.

src/java/org/lwjgl/fmod3/FSoundSampleLock.java

@@ -29,7 +29,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.lwjgl.fmod;
+package org.lwjgl.fmod3;
 
 import java.nio.ByteBuffer;
 

src/java/org/lwjgl/fmod3/FSoundStream.java

@@ -29,7 +29,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.lwjgl.fmod;
+package org.lwjgl.fmod3;
 
 /**
  * This class is a representation of a Sound stream in FMod.

src/java/org/lwjgl/fmod3/FSoundSyncPoint.java

@@ -29,7 +29,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.lwjgl.fmod;
+package org.lwjgl.fmod3;
 
 /**
  * This class is a representation of a SyncPoint in FMod.

src/java/org/lwjgl/fmod3/FSoundTagField.java

@@ -29,7 +29,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.lwjgl.fmod;
+package org.lwjgl.fmod3;
 
 import java.nio.ByteBuffer;
 

src/java/org/lwjgl/fmod3/FSoundTocTag.java

@@ -29,7 +29,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.lwjgl.fmod;
+package org.lwjgl.fmod3;
 
 /**
  * This class is a representation of a FSOUND_TOC_TAG property object in FMod.

src/java/org/lwjgl/fmod3/callbacks/FMusicCallback.java

@@ -29,9 +29,9 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.lwjgl.fmod.callbacks;
+package org.lwjgl.fmod3.callbacks;
 
-import org.lwjgl.fmod.FMusicModule;
+import org.lwjgl.fmod3.FMusicModule;
 
 /**
  * This interface describes a callback interface to Fmod music

src/java/org/lwjgl/fmod3/callbacks/FSoundCloseCallback.java

@@ -29,7 +29,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.lwjgl.fmod.callbacks;
+package org.lwjgl.fmod3.callbacks;
 
 
 /**

src/java/org/lwjgl/fmod3/callbacks/FSoundDSPCallback.java

@@ -29,7 +29,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.lwjgl.fmod.callbacks;
+package org.lwjgl.fmod3.callbacks;
 
 import java.nio.ByteBuffer;
 

src/java/org/lwjgl/fmod3/callbacks/FSoundMetaDataCallback.java

@@ -29,11 +29,11 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.lwjgl.fmod.callbacks;
+package org.lwjgl.fmod3.callbacks;
 
 import java.nio.ByteBuffer;
 
-import org.lwjgl.fmod.FSoundStream;
+import org.lwjgl.fmod3.FSoundStream;
 
 /**
  * This interface describes a callback interface to Fmod music

src/java/org/lwjgl/fmod3/callbacks/FSoundOpenCallback.java

@@ -29,7 +29,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.lwjgl.fmod.callbacks;
+package org.lwjgl.fmod3.callbacks;
 
 
 /**

src/java/org/lwjgl/fmod3/callbacks/FSoundReadCallback.java

@@ -29,7 +29,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.lwjgl.fmod.callbacks;
+package org.lwjgl.fmod3.callbacks;
 
 import java.nio.ByteBuffer;
 

src/java/org/lwjgl/fmod3/callbacks/FSoundSeekCallback.java

@@ -29,7 +29,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.lwjgl.fmod.callbacks;
+package org.lwjgl.fmod3.callbacks;
 
 
 /**

src/java/org/lwjgl/fmod3/callbacks/FSoundStreamCallback.java

@@ -29,11 +29,11 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.lwjgl.fmod.callbacks;
+package org.lwjgl.fmod3.callbacks;
 
 import java.nio.ByteBuffer;
 
-import org.lwjgl.fmod.FSoundStream;
+import org.lwjgl.fmod3.FSoundStream;
 
 /**
  * This interface describes a callback interface to Fmod music

src/java/org/lwjgl/fmod3/callbacks/FSoundTellCallback.java

@@ -29,7 +29,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.lwjgl.fmod.callbacks;
+package org.lwjgl.fmod3.callbacks;
 
 
 /**

src/java/org/lwjgl/test/fmod3/CDDAPlayer.java

@@ -29,16 +29,16 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.lwjgl.test.fmod;
+package org.lwjgl.test.fmod3;
 
 import java.io.BufferedReader;
 import java.io.InputStreamReader;
 import java.util.StringTokenizer;
 
-import org.lwjgl.fmod.FMOD;
-import org.lwjgl.fmod.FMODException;
-import org.lwjgl.fmod.FSound;
-import org.lwjgl.fmod.FSoundStream;
+import org.lwjgl.fmod3.FMOD;
+import org.lwjgl.fmod3.FMODException;
+import org.lwjgl.fmod3.FSound;
+import org.lwjgl.fmod3.FSoundStream;
 
 /**
  * $Id$

src/java/org/lwjgl/test/fmod3/CDPlayer.java

@@ -29,15 +29,15 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.lwjgl.test.fmod;
+package org.lwjgl.test.fmod3;
 
 import java.io.BufferedReader;
 import java.io.InputStreamReader;
 import java.util.StringTokenizer;
 
-import org.lwjgl.fmod.FMOD;
-import org.lwjgl.fmod.FMODException;
-import org.lwjgl.fmod.FSound;
+import org.lwjgl.fmod3.FMOD;
+import org.lwjgl.fmod3.FMODException;
+import org.lwjgl.fmod3.FSound;
 
 /**
  * $Id$

src/java/org/lwjgl/test/fmod3/MusicPlayer.java

@@ -29,7 +29,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.lwjgl.test.fmod;
+package org.lwjgl.test.fmod3;
 
 import java.io.BufferedInputStream;
 import java.io.ByteArrayOutputStream;
@@ -38,11 +38,11 @@ import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
 
-import org.lwjgl.fmod.FMOD;
-import org.lwjgl.fmod.FMODException;
-import org.lwjgl.fmod.FMusic;
-import org.lwjgl.fmod.FMusicModule;
-import org.lwjgl.fmod.FSound;
+import org.lwjgl.fmod3.FMOD;
+import org.lwjgl.fmod3.FMODException;
+import org.lwjgl.fmod3.FMusic;
+import org.lwjgl.fmod3.FMusicModule;
+import org.lwjgl.fmod3.FSound;
 
 /**
  * $Id$

src/java/org/lwjgl/test/fmod3/StreamPlayer.java

@@ -29,7 +29,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.lwjgl.test.fmod;
+package org.lwjgl.test.fmod3;
 
 import java.io.BufferedInputStream;
 import java.io.ByteArrayOutputStream;
@@ -38,10 +38,10 @@ import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
 
-import org.lwjgl.fmod.FMOD;
-import org.lwjgl.fmod.FMODException;
-import org.lwjgl.fmod.FSound;
-import org.lwjgl.fmod.FSoundStream;
+import org.lwjgl.fmod3.FMOD;
+import org.lwjgl.fmod3.FMODException;
+import org.lwjgl.fmod3.FSound;
+import org.lwjgl.fmod3.FSoundStream;
 
 /**
  * $Id$ <br>

src/java/org/lwjgl/test/fmod3/SyncTest.java

@@ -29,7 +29,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.lwjgl.test.fmod;
+package org.lwjgl.test.fmod3;
 
 import java.io.File;
 import java.io.IOException;
@@ -37,12 +37,12 @@ import java.nio.ByteBuffer;
 
 import org.lwjgl.BufferUtils;
 import org.lwjgl.Sys;
-import org.lwjgl.fmod.FMOD;
-import org.lwjgl.fmod.FMODException;
-import org.lwjgl.fmod.FMusic;
-import org.lwjgl.fmod.FMusicModule;
-import org.lwjgl.fmod.FSound;
-import org.lwjgl.fmod.callbacks.FMusicCallback;
+import org.lwjgl.fmod3.FMOD;
+import org.lwjgl.fmod3.FMODException;
+import org.lwjgl.fmod3.FMusic;
+import org.lwjgl.fmod3.FMusicModule;
+import org.lwjgl.fmod3.FSound;
+import org.lwjgl.fmod3.callbacks.FMusicCallback;
 
 /**
  * $Id$ <br>
@@ -218,12 +218,22 @@ public class SyncTest {
         lastRow = row;        
       	update();
       } else {
-      	Thread.yield();
+      	pause(5);
       }
     }
   }
   
-  // clean up our own mess
+  /**
+	 * @param i
+	 */
+	private void pause(long i) {
+    try {
+    	Thread.sleep(i);
+    } catch (InterruptedException inte) {
+    }
+	}
+
+	// clean up our own mess
   private void destroy() {
     if(module != null) {
       // retrieve userdata