From 64443584c41d9209b3033afe763e61d72c637a22 Mon Sep 17 00:00:00 2001 From: Ethan Lee Date: Thu, 2 Feb 2012 14:33:11 -0500 Subject: [PATCH] - Updated flibitEFX with a Filter class and renamed EFXEffectUnderwater. - flibitEFX is now under the LGPLv3. Not sure why I picked 2[.1]. --- doc/license.flibitEFX | 2 +- lib/flibitEFX.jar | Bin 4003 -> 5677 bytes src/lwjake2/sound/lwjgl/LWJGLSoundImpl.java | 6 +++--- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/license.flibitEFX b/doc/license.flibitEFX index 1242742..695fe51 100644 --- a/doc/license.flibitEFX +++ b/doc/license.flibitEFX @@ -3,7 +3,7 @@ * * flibitEFX is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 2 of the License, or + * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * * flibitEFX is distributed in the hope that it will be useful, diff --git a/lib/flibitEFX.jar b/lib/flibitEFX.jar index 213d412a5bede332c56ff258d5e0e5606d97440e..cab70eee47277a8ff339f1d1fef84e107c471bce 100644 GIT binary patch delta 3977 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 C0##H1 diff --git a/src/lwjake2/sound/lwjgl/LWJGLSoundImpl.java b/src/lwjake2/sound/lwjgl/LWJGLSoundImpl.java index 1615d46..a55eb94 100644 --- a/src/lwjake2/sound/lwjgl/LWJGLSoundImpl.java +++ b/src/lwjake2/sound/lwjgl/LWJGLSoundImpl.java @@ -42,7 +42,7 @@ import java.nio.FloatBuffer; import java.nio.IntBuffer; import java.nio.ShortBuffer; -import com.flibitijibibo.flibitEFX.EFXUnderwater; +import com.flibitijibibo.flibitEFX.EFXEffectUnderwater; import org.lwjgl.LWJGLException; import org.lwjgl.openal.AL; import org.lwjgl.openal.AL10; @@ -68,7 +68,7 @@ public final class LWJGLSoundImpl implements Sound { /** EFX Variables */ private int currentEffectIndex; - private EFXUnderwater underwaterEffect; + private EFXEffectUnderwater underwaterEffect; // singleton private LWJGLSoundImpl() { @@ -153,7 +153,7 @@ public final class LWJGLSoundImpl implements Sound { private void initOpenALExtensions() { Com.Printf("... using EFX effects:\n"); - underwaterEffect = new EFXUnderwater(); + underwaterEffect = new EFXEffectUnderwater(); }