michael/lwjgl
michael
/
lwjgl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fmod -> fmod3

This commit is contained in:
Brian Matzon 2004-06-09 19:53:45 +00:00
parent 3a7df43117
commit 0bcb13ceac
40 changed files with 1953 additions and 1943 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
platform_build/win32_ms_cmdline/build-fmod.bat
View File

@ -6,7 +6,7 @@ set COPTIONS=/I%FMODHOME% /I%JAVAHOME%\include /I%JAVAHOME%\include\win32 /I..\.
set LINKEROPTS=/link
set LIBS=user32.lib Gdi32.lib Advapi32.lib
for %%x in (..\..\src\native\common\fmod\*.cpp) do cl %COPTIONS% %%x
for %%x in (..\..\src\native\common\fmod3\*.cpp) do cl %COPTIONS% %%x
for %%x in (..\..\src\native\common\*common*.cpp) do cl %COPTIONS% %%x
cl /LD /Felwjgl-fmod.dll *.obj %LINKEROPTS% %LIBS%
cl /LD /Felwjgl-fmod3.dll *.obj %LINKEROPTS% %LIBS%

10
platform_build/win32_vs_net/lwjgl-fmod.vcproj
View File

@ -82,7 +82,7 @@
<Tool
Name="VCLinkerTool"
IgnoreImportLibrary="TRUE"
OutputFile="..\..\libs\win32\lwjgl-fmod.dll"
OutputFile="..\..\libs\win32\lwjgl-fmod3.dll"
LinkIncremental="1"
IgnoreAllDefaultLibraries="FALSE"
GenerateDebugInformation="FALSE"
@ -123,16 +123,16 @@
RelativePath="..\..\src\native\common\common_tools.cpp">
</File>
<File
RelativePath="..\..\src\native\common\fmod\extfmod.cpp">
RelativePath="..\..\src\native\common\fmod3\extfmod3.cpp">
</File>
<File
RelativePath="..\..\src\native\common\fmod\org_lwjgl_fmod_FMOD.cpp">
RelativePath="..\..\src\native\common\fmod3\org_lwjgl_fmod3_FMOD.cpp">
</File>
<File
RelativePath="..\..\src\native\common\fmod\org_lwjgl_fmod_FMusic.cpp">
RelativePath="..\..\src\native\common\fmod3\org_lwjgl_fmod3_FMusic.cpp">
</File>
<File
RelativePath="..\..\src\native\common\fmod\org_lwjgl_fmod_FSound.cpp">
RelativePath="..\..\src\native\common\fmod3\org_lwjgl_fmod3_FSound.cpp">
</File>
</Filter>
<Filter

BIN
platform_build/win32_vs_net/lwjgl.suo
View File

Binary file not shown.

4
src/java/org/lwjgl/fmod/FMOD.java → src/java/org/lwjgl/fmod3/FMOD.java
View File

@ -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";

2
src/java/org/lwjgl/fmod/FMODException.java → src/java/org/lwjgl/fmod3/FMODException.java
View File

@ -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;

4
src/java/org/lwjgl/fmod/FMusic.java → src/java/org/lwjgl/fmod3/FMusic.java
View File

@ -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$

2
src/java/org/lwjgl/fmod/FMusicModule.java → src/java/org/lwjgl/fmod3/FMusicModule.java
View File

@ -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.

18
src/java/org/lwjgl/fmod/FSound.java → src/java/org/lwjgl/fmod3/FSound.java
View File

@ -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$

2
src/java/org/lwjgl/fmod/FSoundDSPUnit.java → src/java/org/lwjgl/fmod3/FSoundDSPUnit.java
View File

@ -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.

2
src/java/org/lwjgl/fmod/FSoundReverbChannelProperties.java → src/java/org/lwjgl/fmod3/FSoundReverbChannelProperties.java
View File

@ -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.

2
src/java/org/lwjgl/fmod/FSoundReverbProperties.java → src/java/org/lwjgl/fmod3/FSoundReverbProperties.java
View File

@ -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.

2
src/java/org/lwjgl/fmod/FSoundSample.java → src/java/org/lwjgl/fmod3/FSoundSample.java
View File

@ -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.

2
src/java/org/lwjgl/fmod/FSoundSampleLock.java → src/java/org/lwjgl/fmod3/FSoundSampleLock.java
View File

@ -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;

2
src/java/org/lwjgl/fmod/FSoundStream.java → src/java/org/lwjgl/fmod3/FSoundStream.java
View File

@ -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.

2
src/java/org/lwjgl/fmod/FSoundSyncPoint.java → src/java/org/lwjgl/fmod3/FSoundSyncPoint.java
View File

@ -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.

2
src/java/org/lwjgl/fmod/FSoundTagField.java → src/java/org/lwjgl/fmod3/FSoundTagField.java
View File

@ -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;

2
src/java/org/lwjgl/fmod/FSoundTocTag.java → src/java/org/lwjgl/fmod3/FSoundTocTag.java
View File

@ -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.

4
src/java/org/lwjgl/fmod/callbacks/FMusicCallback.java → src/java/org/lwjgl/fmod3/callbacks/FMusicCallback.java
View File

@ -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

2
src/java/org/lwjgl/fmod/callbacks/FSoundCloseCallback.java → src/java/org/lwjgl/fmod3/callbacks/FSoundCloseCallback.java
View File

@ -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;
/**

2
src/java/org/lwjgl/fmod/callbacks/FSoundDSPCallback.java → src/java/org/lwjgl/fmod3/callbacks/FSoundDSPCallback.java
View File

@ -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;

4
src/java/org/lwjgl/fmod/callbacks/FSoundMetaDataCallback.java → src/java/org/lwjgl/fmod3/callbacks/FSoundMetaDataCallback.java
View File

@ -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

2
src/java/org/lwjgl/fmod/callbacks/FSoundOpenCallback.java → src/java/org/lwjgl/fmod3/callbacks/FSoundOpenCallback.java
View File

@ -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;
/**

2
src/java/org/lwjgl/fmod/callbacks/FSoundReadCallback.java → src/java/org/lwjgl/fmod3/callbacks/FSoundReadCallback.java
View File

@ -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;

2
src/java/org/lwjgl/fmod/callbacks/FSoundSeekCallback.java → src/java/org/lwjgl/fmod3/callbacks/FSoundSeekCallback.java
View File

@ -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;
/**

4
src/java/org/lwjgl/fmod/callbacks/FSoundStreamCallback.java → src/java/org/lwjgl/fmod3/callbacks/FSoundStreamCallback.java
View File

@ -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

2
src/java/org/lwjgl/fmod/callbacks/FSoundTellCallback.java → src/java/org/lwjgl/fmod3/callbacks/FSoundTellCallback.java
View File

@ -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;
/**

10
src/java/org/lwjgl/test/fmod/CDDAPlayer.java → src/java/org/lwjgl/test/fmod3/CDDAPlayer.java
View File

@ -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$

8
src/java/org/lwjgl/test/fmod/CDPlayer.java → src/java/org/lwjgl/test/fmod3/CDPlayer.java
View File

@ -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$

12
src/java/org/lwjgl/test/fmod/MusicPlayer.java → src/java/org/lwjgl/test/fmod3/MusicPlayer.java
View File

@ -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$

10
src/java/org/lwjgl/test/fmod/StreamPlayer.java → src/java/org/lwjgl/test/fmod3/StreamPlayer.java
View File

@ -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>

28
src/java/org/lwjgl/test/fmod/SyncTest.java → src/java/org/lwjgl/test/fmod3/SyncTest.java
View File

@ -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

11
src/native/common/fmod/Makefile.am
View File

@ -1,11 +0,0 @@
lib_LTLIBRARIES = liblwjgl-fmod.la
liblwjgl_fmod_la_SOURCES = $(FMOD_SOURCE)
liblwjgl_fmod_la_LIBADD = $(DEP_LIBS)
liblwjgl_fmod_la_DEPENDENCIES = $(DEP_LIBS)
INCLUDES = -I..
DEP_LIBS = ../libtools.la
FMOD_SOURCE = extfmod.cpp \
org_lwjgl_fmod_FMOD.cpp \
org_lwjgl_fmod_FMusic.cpp \
org_lwjgl_fmod_FSound.cpp

1757
src/native/common/fmod/org_lwjgl_fmod_FSound.cpp
View File

File diff suppressed because it is too large Load Diff

11
src/native/common/fmod3/Makefile.am Normal file
View File

@ -0,0 +1,11 @@
lib_LTLIBRARIES = liblwjgl-fmod3.la
liblwjgl_fmod_la_SOURCES = $(FMOD_SOURCE)
liblwjgl_fmod_la_LIBADD = $(DEP_LIBS)
liblwjgl_fmod_la_DEPENDENCIES = $(DEP_LIBS)
INCLUDES = -I..
DEP_LIBS = ../libtools.la
FMOD_SOURCE = extfmod3.cpp \
org_lwjgl_fmod3_FMOD.cpp \
org_lwjgl_fmod3_FMusic.cpp \
org_lwjgl_fmod3_FSound.cpp

4
src/native/common/fmod/extfmod.cpp → src/native/common/fmod3/extfmod3.cpp
View File

@ -36,7 +36,7 @@
#endif
#include <stdio.h>
#include "extfmod.h"
#include "extfmod3.h"
/** Instance of fmod */
FMOD_INSTANCE * fmod_instance = NULL;
@ -70,7 +70,7 @@ void fmod_create(JNIEnv *env, char* path) {
fmod_instance = FMOD_CreateInstance(path);
if (fmod_instance != NULL) {
fmusic = env->FindClass("org/lwjgl/fmod/FMusic");
fmusic = env->FindClass("org/lwjgl/fmod3/FMusic");
music_instcallback = env->GetStaticMethodID(fmusic, "music_instcallback", "(JI)V");
music_ordercallback = env->GetStaticMethodID(fmusic, "music_ordercallback", "(JI)V");
music_rowcallback = env->GetStaticMethodID(fmusic, "music_rowcallback", "(JI)V");

0
src/native/common/fmod/extfmod.h → src/native/common/fmod3/extfmod3.h
View File

20
src/native/common/fmod/org_lwjgl_fmod_FMOD.cpp → src/native/common/fmod3/org_lwjgl_fmod3_FMOD.cpp
View File

@ -30,26 +30,26 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "org_lwjgl_fmod_FMOD.h"
#include "extfmod.h"
#include "org_lwjgl_fmod3_FMOD.h"
#include "extfmod3.h"
static const char* VERSION = "0.9a";
/*
* Class: org_lwjgl_fmod_FMOD
* Class: org_lwjgl_fmod3_FMOD
* Method: getNativeLibraryVersion
* Signature: ()Ljava/lang/String;
*/
JNIEXPORT jstring JNICALL Java_org_lwjgl_fmod_FMOD_getNativeLibraryVersion(JNIEnv * env, jclass clazz) {
JNIEXPORT jstring JNICALL Java_org_lwjgl_fmod3_FMOD_getNativeLibraryVersion(JNIEnv * env, jclass clazz) {
return env->NewStringUTF(VERSION);
}
/*
* Class: org_lwjgl_fmod_FMOD
* Class: org_lwjgl_fmod3_FMOD
* Method: nCreate
* Signature: ()V
*/
JNIEXPORT void JNICALL Java_org_lwjgl_fmod_FMOD_nCreate(JNIEnv *env, jclass clazz, jobjectArray paths) {
JNIEXPORT void JNICALL Java_org_lwjgl_fmod3_FMOD_nCreate(JNIEnv *env, jclass clazz, jobjectArray paths) {
jsize pathcount = env->GetArrayLength(paths);
for(int i=0;i<pathcount;i++) {
jstring path = (jstring) env->GetObjectArrayElement(paths, i);
@ -66,19 +66,19 @@ JNIEXPORT void JNICALL Java_org_lwjgl_fmod_FMOD_nCreate(JNIEnv *env, jclass claz
}
/*
* Class: org_lwjgl_fmod_FMOD
* Class: org_lwjgl_fmod3_FMOD
* Method: nDestroy
* Signature: ()V
*/
JNIEXPORT void JNICALL Java_org_lwjgl_fmod_FMOD_nDestroy(JNIEnv *env, jclass clazz) {
JNIEXPORT void JNICALL Java_org_lwjgl_fmod3_FMOD_nDestroy(JNIEnv *env, jclass clazz) {
fmod_destroy();
}
/*
* Class: org_lwjgl_fmod_FMOD
* Class: org_lwjgl_fmod3_FMOD
* Method: FMOD_ErrorString
* Signature: (I)Ljava/lang/String;
*/
JNIEXPORT jstring JNICALL Java_org_lwjgl_fmod_FMOD_FMOD_1ErrorString(JNIEnv *env, jclass clazz, jint errorcode) {
JNIEXPORT jstring JNICALL Java_org_lwjgl_fmod3_FMOD_FMOD_1ErrorString(JNIEnv *env, jclass clazz, jint errorcode) {
return env->NewStringUTF(FMOD_ErrorString(errorcode));
}

180
src/native/common/fmod/org_lwjgl_fmod_FMusic.cpp → src/native/common/fmod3/org_lwjgl_fmod3_FMusic.cpp
View File

@ -30,8 +30,8 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "org_lwjgl_fmod_FMusic.h"
#include "extfmod.h"
#include "org_lwjgl_fmod3_FMusic.h"
#include "extfmod3.h"
// callback
void F_CALLBACKAPI fmusic_instcallback(FMUSIC_MODULE *mod, unsigned char param);
@ -40,21 +40,21 @@ void F_CALLBACKAPI fmusic_rowcallback(FMUSIC_MODULE *mod, unsigned char param);
void F_CALLBACKAPI fmusic_zxxcallback(FMUSIC_MODULE *mod, unsigned char param);
/*
* Class: org_lwjgl_fmod_FMusic
* Class: org_lwjgl_fmod3_FMusic
* Method: nFMUSIC_LoadSong
* Signature: (Ljava/lang/String;)J
*/
JNIEXPORT jlong JNICALL Java_org_lwjgl_fmod_FMusic_nFMUSIC_1LoadSong(JNIEnv *env, jclass clazz, jstring name) {
JNIEXPORT jlong JNICALL Java_org_lwjgl_fmod3_FMusic_nFMUSIC_1LoadSong(JNIEnv *env, jclass clazz, jstring name) {
const char* filename = (const char*) (env->GetStringUTFChars(name, 0));
return (jlong) fmod_instance->FMUSIC_LoadSong(filename);
}
/*
* Class: org_lwjgl_fmod_FMusic
* Class: org_lwjgl_fmod3_FMusic
* Method: nFMUSIC_LoadSongEx
* Signature: (Ljava/nio/ByteBuffer;IIILjava/nio/IntBuffer;I)J
*/
JNIEXPORT jlong JNICALL Java_org_lwjgl_fmod_FMusic_nFMUSIC_1LoadSongEx__Ljava_nio_ByteBuffer_2IIIILjava_nio_IntBuffer_2II
JNIEXPORT jlong JNICALL Java_org_lwjgl_fmod3_FMusic_nFMUSIC_1LoadSongEx__Ljava_nio_ByteBuffer_2IIIILjava_nio_IntBuffer_2II
(JNIEnv *env, jclass clazz, jobject data, jint dataOffset, jint offset, jint length, jint mode, jobject sampleList, jint sampleListOffset, jint samplelistnum){
int *sampleData = NULL;
const char *songData = dataOffset + (char *) env->GetDirectBufferAddress(data);
@ -66,11 +66,11 @@ JNIEXPORT jlong JNICALL Java_org_lwjgl_fmod_FMusic_nFMUSIC_1LoadSongEx__Ljava_ni
}
/*
* Class: org_lwjgl_fmod_FMusic
* Class: org_lwjgl_fmod3_FMusic
* Method: nFMUSIC_LoadSongEx
* Signature: (Ljava/nio/ByteBuffer;IIILjava/nio/IntBuffer;I)J
*/
JNIEXPORT jlong JNICALL Java_org_lwjgl_fmod_FMusic_nFMUSIC_1LoadSongEx__Ljava_lang_String_2IIILjava_nio_IntBuffer_2II
JNIEXPORT jlong JNICALL Java_org_lwjgl_fmod3_FMusic_nFMUSIC_1LoadSongEx__Ljava_lang_String_2IIILjava_nio_IntBuffer_2II
(JNIEnv *env, jclass clazz, jstring name, jint offset, jint length, jint mode, jobject sampleList, jint sampleListOffset, jint samplelistnum){
int *sampleData = NULL;
const char* filename = (const char*) (env->GetStringUTFChars(name, 0));
@ -82,408 +82,408 @@ JNIEXPORT jlong JNICALL Java_org_lwjgl_fmod_FMusic_nFMUSIC_1LoadSongEx__Ljava_la
/*
* Class: org_lwjgl_fmod_FMusic
* Class: org_lwjgl_fmod3_FMusic
* Method: nFMUSIC_GetOpenState
* Signature: (J)I
*/
JNIEXPORT jint JNICALL Java_org_lwjgl_fmod_FMusic_nFMUSIC_1GetOpenState
JNIEXPORT jint JNICALL Java_org_lwjgl_fmod3_FMusic_nFMUSIC_1GetOpenState
(JNIEnv *env, jclass clazz, jlong module){
return fmod_instance->FMUSIC_GetOpenState((FMUSIC_MODULE *) module);
}
/*
* Class: org_lwjgl_fmod_FMusic
* Class: org_lwjgl_fmod3_FMusic
* Method: nFMUSIC_FreeSong
* Signature: (J)Z
*/
JNIEXPORT jboolean JNICALL Java_org_lwjgl_fmod_FMusic_nFMUSIC_1FreeSong
JNIEXPORT jboolean JNICALL Java_org_lwjgl_fmod3_FMusic_nFMUSIC_1FreeSong
(JNIEnv *env, jclass clazz, jlong module){
return fmod_instance->FMUSIC_FreeSong((FMUSIC_MODULE *) module);
}
/*
* Class: org_lwjgl_fmod_FMusic
* Class: org_lwjgl_fmod3_FMusic
* Method: nFMUSIC_PlaySong
* Signature: (J)Z
*/
JNIEXPORT jboolean JNICALL Java_org_lwjgl_fmod_FMusic_nFMUSIC_1PlaySong
JNIEXPORT jboolean JNICALL Java_org_lwjgl_fmod3_FMusic_nFMUSIC_1PlaySong
(JNIEnv *env, jclass clazz, jlong module){
return fmod_instance->FMUSIC_PlaySong((FMUSIC_MODULE *) module);
}
/*
* Class: org_lwjgl_fmod_FMusic
* Class: org_lwjgl_fmod3_FMusic
* Method: nFMUSIC_StopSong
* Signature: (J)Z
*/
JNIEXPORT jboolean JNICALL Java_org_lwjgl_fmod_FMusic_nFMUSIC_1StopSong
JNIEXPORT jboolean JNICALL Java_org_lwjgl_fmod3_FMusic_nFMUSIC_1StopSong
(JNIEnv *env, jclass clazz, jlong module){
return fmod_instance->FMUSIC_StopSong((FMUSIC_MODULE *) module);
}
/*
* Class: org_lwjgl_fmod_FMusic
* Class: org_lwjgl_fmod3_FMusic
* Method: FMUSIC_StopAllSongs
* Signature: ()V
*/
JNIEXPORT void JNICALL Java_org_lwjgl_fmod_FMusic_FMUSIC_1StopAllSongs
JNIEXPORT void JNICALL Java_org_lwjgl_fmod3_FMusic_FMUSIC_1StopAllSongs
(JNIEnv *env, jclass clazz){
return fmod_instance->FMUSIC_StopAllSongs();
}
/*
* Class: org_lwjgl_fmod_FMusic
* Class: org_lwjgl_fmod3_FMusic
* Method: nFMUSIC_SetZxxCallback
* Signature: (JLorg/lwjgl/fmod_instance/FMusicCallback;)Z
*/
JNIEXPORT jboolean JNICALL Java_org_lwjgl_fmod_FMusic_nFMUSIC_1SetZxxCallback(JNIEnv *env, jclass clazz, jlong module){
JNIEXPORT jboolean JNICALL Java_org_lwjgl_fmod3_FMusic_nFMUSIC_1SetZxxCallback(JNIEnv *env, jclass clazz, jlong module){
return fmod_instance->FMUSIC_SetZxxCallback((FMUSIC_MODULE*)module, fmusic_zxxcallback);
}
/*
* Class: org_lwjgl_fmod_FMusic
* Class: org_lwjgl_fmod3_FMusic
* Method: nFMUSIC_SetRowCallback
* Signature: (JLorg/lwjgl/fmod_instance/FMusicCallback;I)Z
*/
JNIEXPORT jboolean JNICALL Java_org_lwjgl_fmod_FMusic_nFMUSIC_1SetRowCallback(JNIEnv *env, jclass clazz, jlong module, jint row) {
JNIEXPORT jboolean JNICALL Java_org_lwjgl_fmod3_FMusic_nFMUSIC_1SetRowCallback(JNIEnv *env, jclass clazz, jlong module, jint row) {
return fmod_instance->FMUSIC_SetRowCallback((FMUSIC_MODULE*)module, fmusic_rowcallback, row);
}
/*
* Class: org_lwjgl_fmod_FMusic
* Class: org_lwjgl_fmod3_FMusic
* Method: nFMUSIC_SetOrderCallback
* Signature: (JLorg/lwjgl/fmod_instance/FMusicCallback;I)Z
*/
JNIEXPORT jboolean JNICALL Java_org_lwjgl_fmod_FMusic_nFMUSIC_1SetOrderCallback(JNIEnv *env, jclass clazz, jlong module, jint order) {
JNIEXPORT jboolean JNICALL Java_org_lwjgl_fmod3_FMusic_nFMUSIC_1SetOrderCallback(JNIEnv *env, jclass clazz, jlong module, jint order) {
return fmod_instance->FMUSIC_SetOrderCallback((FMUSIC_MODULE*)module, fmusic_ordercallback, order);
}
/*
* Class: org_lwjgl_fmod_FMusic
* Class: org_lwjgl_fmod3_FMusic
* Method: nFMUSIC_SetInstCallback
* Signature: (JLorg/lwjgl/fmod_instance/FMusicCallback;I)Z
*/
JNIEXPORT jboolean JNICALL Java_org_lwjgl_fmod_FMusic_nFMUSIC_1SetInstCallback(JNIEnv *env, jclass clazz, jlong module, jint inst){
JNIEXPORT jboolean JNICALL Java_org_lwjgl_fmod3_FMusic_nFMUSIC_1SetInstCallback(JNIEnv *env, jclass clazz, jlong module, jint inst){
return fmod_instance->FMUSIC_SetInstCallback((FMUSIC_MODULE*)module, fmusic_instcallback, inst);
}
/*
* Class: org_lwjgl_fmod_FMusic
* Class: org_lwjgl_fmod3_FMusic
* Method: nFMUSIC_SetSample
* Signature: (JIJ)Z
*/
JNIEXPORT jboolean JNICALL Java_org_lwjgl_fmod_FMusic_nFMUSIC_1SetSample
JNIEXPORT jboolean JNICALL Java_org_lwjgl_fmod3_FMusic_nFMUSIC_1SetSample
(JNIEnv *env, jclass clazz, jlong module, jint sampno, jlong sample){
return fmod_instance->FMUSIC_SetSample((FMUSIC_MODULE *) module, sampno, (FSOUND_SAMPLE *) sample);
}
/*
* Class: org_lwjgl_fmod_FMusic
* Class: org_lwjgl_fmod3_FMusic
* Method: nFMUSIC_SetUserData
* Signature: (JLjava/nio/ByteBuffer;I)Z
*/
JNIEXPORT jboolean JNICALL Java_org_lwjgl_fmod_FMusic_nFMUSIC_1SetUserData(JNIEnv *env, jclass clazz, jlong module, jobject data, jint offset) {
JNIEXPORT jboolean JNICALL Java_org_lwjgl_fmod3_FMusic_nFMUSIC_1SetUserData(JNIEnv *env, jclass clazz, jlong module, jobject data, jint offset) {
void *userdata = offset + (char*) env->GetDirectBufferAddress(data);
return fmod_instance->FMUSIC_SetUserData((FMUSIC_MODULE *) module, userdata);
}
/*
* Class: org_lwjgl_fmod_FMusic
* Class: org_lwjgl_fmod3_FMusic
* Method: nFMUSIC_OptimizeChannels
* Signature: (JII)Z
*/
JNIEXPORT jboolean JNICALL Java_org_lwjgl_fmod_FMusic_nFMUSIC_1OptimizeChannels
JNIEXPORT jboolean JNICALL Java_org_lwjgl_fmod3_FMusic_nFMUSIC_1OptimizeChannels
(JNIEnv *env, jclass clazz, jlong module, jint max, jint min){
return fmod_instance->FMUSIC_OptimizeChannels((FMUSIC_MODULE *) module, max, min);
}
/*
* Class: org_lwjgl_fmod_FMusic
* Class: org_lwjgl_fmod3_FMusic
* Method: FMUSIC_SetReverb
* Signature: (Z)Z
*/
JNIEXPORT jboolean JNICALL Java_org_lwjgl_fmod_FMusic_FMUSIC_1SetReverb
JNIEXPORT jboolean JNICALL Java_org_lwjgl_fmod3_FMusic_FMUSIC_1SetReverb
(JNIEnv *env, jclass clazz, jboolean reverb){
return fmod_instance->FMUSIC_SetReverb(reverb);
}
/*
* Class: org_lwjgl_fmod_FMusic
* Class: org_lwjgl_fmod3_FMusic
* Method: nFMUSIC_SetLooping
* Signature: (JZ)Z
*/
JNIEXPORT jboolean JNICALL Java_org_lwjgl_fmod_FMusic_nFMUSIC_1SetLooping
JNIEXPORT jboolean JNICALL Java_org_lwjgl_fmod3_FMusic_nFMUSIC_1SetLooping
(JNIEnv *env, jclass clazz, jlong module, jboolean looping){
return fmod_instance->FMUSIC_SetLooping((FMUSIC_MODULE *) module, looping);
}
/*
* Class: org_lwjgl_fmod_FMusic
* Class: org_lwjgl_fmod3_FMusic
* Method: nFMUSIC_SetOrder
* Signature: (JI)Z
*/
JNIEXPORT jboolean JNICALL Java_org_lwjgl_fmod_FMusic_nFMUSIC_1SetOrder
JNIEXPORT jboolean JNICALL Java_org_lwjgl_fmod3_FMusic_nFMUSIC_1SetOrder
(JNIEnv *env, jclass clazz, jlong module, jint order){
return fmod_instance->FMUSIC_SetOrder((FMUSIC_MODULE *) module, order);
}
/*
* Class: org_lwjgl_fmod_FMusic
* Class: org_lwjgl_fmod3_FMusic
* Method: nFMUSIC_SetPaused
* Signature: (JZ)Z
*/
JNIEXPORT jboolean JNICALL Java_org_lwjgl_fmod_FMusic_nFMUSIC_1SetPaused
JNIEXPORT jboolean JNICALL Java_org_lwjgl_fmod3_FMusic_nFMUSIC_1SetPaused
(JNIEnv *env, jclass clazz, jlong module, jboolean paused){
return fmod_instance->FMUSIC_SetPaused((FMUSIC_MODULE *) module, paused);
}
/*
* Class: org_lwjgl_fmod_FMusic
* Class: org_lwjgl_fmod3_FMusic
* Method: nFMUSIC_SetMasterVolume
* Signature: (JI)Z
*/
JNIEXPORT jboolean JNICALL Java_org_lwjgl_fmod_FMusic_nFMUSIC_1SetMasterVolume
JNIEXPORT jboolean JNICALL Java_org_lwjgl_fmod3_FMusic_nFMUSIC_1SetMasterVolume
(JNIEnv *env, jclass clazz, jlong module, jint volume){
return fmod_instance->FMUSIC_SetMasterVolume((FMUSIC_MODULE *) module, volume);
}
/*
* Class: org_lwjgl_fmod_FMusic
* Class: org_lwjgl_fmod3_FMusic
* Method: nFMUSIC_SetMasterSpeed
* Signature: (JF)Z
*/
JNIEXPORT jboolean JNICALL Java_org_lwjgl_fmod_FMusic_nFMUSIC_1SetMasterSpeed
JNIEXPORT jboolean JNICALL Java_org_lwjgl_fmod3_FMusic_nFMUSIC_1SetMasterSpeed
(JNIEnv *env, jclass clazz, jlong module, jfloat speed){
return fmod_instance->FMUSIC_SetMasterSpeed((FMUSIC_MODULE *) module, speed);
}
/*
* Class: org_lwjgl_fmod_FMusic
* Class: org_lwjgl_fmod3_FMusic
* Method: nFMUSIC_SetPanSeperation
* Signature: (JF)Z
*/
JNIEXPORT jboolean JNICALL Java_org_lwjgl_fmod_FMusic_nFMUSIC_1SetPanSeperation
JNIEXPORT jboolean JNICALL Java_org_lwjgl_fmod3_FMusic_nFMUSIC_1SetPanSeperation
(JNIEnv *env, jclass clazz, jlong module, jfloat pan){
return fmod_instance->FMUSIC_SetPanSeperation((FMUSIC_MODULE *) module, pan);
}
/*
* Class: org_lwjgl_fmod_FMusic
* Class: org_lwjgl_fmod3_FMusic
* Method: nFMUSIC_GetName
* Signature: (J)Ljava/lang/String;
*/
JNIEXPORT jstring JNICALL Java_org_lwjgl_fmod_FMusic_nFMUSIC_1GetName
JNIEXPORT jstring JNICALL Java_org_lwjgl_fmod3_FMusic_nFMUSIC_1GetName
(JNIEnv *env, jclass clazz, jlong module) {
const char * name = fmod_instance->FMUSIC_GetName((FMUSIC_MODULE *) module);
return env->NewStringUTF(name);
}
/*
* Class: org_lwjgl_fmod_FMusic
* Class: org_lwjgl_fmod3_FMusic
* Method: nFMUSIC_GetType
* Signature: (J)I
*/
JNIEXPORT jint JNICALL Java_org_lwjgl_fmod_FMusic_nFMUSIC_1GetType
JNIEXPORT jint JNICALL Java_org_lwjgl_fmod3_FMusic_nFMUSIC_1GetType
(JNIEnv *env, jclass clazz, jlong module){
return fmod_instance->FMUSIC_GetType((FMUSIC_MODULE *) module);
}
/*
* Class: org_lwjgl_fmod_FMusic
* Class: org_lwjgl_fmod3_FMusic
* Method: nFMUSIC_GetNumOrders
* Signature: (J)I
*/
JNIEXPORT jint JNICALL Java_org_lwjgl_fmod_FMusic_nFMUSIC_1GetNumOrders
JNIEXPORT jint JNICALL Java_org_lwjgl_fmod3_FMusic_nFMUSIC_1GetNumOrders
(JNIEnv *env, jclass clazz, jlong module){
return fmod_instance->FMUSIC_GetNumOrders((FMUSIC_MODULE *) module);
}
/*
* Class: org_lwjgl_fmod_FMusic
* Class: org_lwjgl_fmod3_FMusic
* Method: nFMUSIC_GetNumPatterns
* Signature: (J)I
*/
JNIEXPORT jint JNICALL Java_org_lwjgl_fmod_FMusic_nFMUSIC_1GetNumPatterns
JNIEXPORT jint JNICALL Java_org_lwjgl_fmod3_FMusic_nFMUSIC_1GetNumPatterns
(JNIEnv *env, jclass clazz, jlong module){
return fmod_instance->FMUSIC_GetNumPatterns((FMUSIC_MODULE *) module);
}
/*
* Class: org_lwjgl_fmod_FMusic
* Class: org_lwjgl_fmod3_FMusic
* Method: nFMUSIC_GetNumInstruments
* Signature: (J)I
*/
JNIEXPORT jint JNICALL Java_org_lwjgl_fmod_FMusic_nFMUSIC_1GetNumInstruments
JNIEXPORT jint JNICALL Java_org_lwjgl_fmod3_FMusic_nFMUSIC_1GetNumInstruments
(JNIEnv *env, jclass clazz, jlong module){
return fmod_instance->FMUSIC_GetNumInstruments((FMUSIC_MODULE *) module);
}
/*
* Class: org_lwjgl_fmod_FMusic
* Class: org_lwjgl_fmod3_FMusic
* Method: nFMUSIC_GetNumSamples
* Signature: (J)I
*/
JNIEXPORT jint JNICALL Java_org_lwjgl_fmod_FMusic_nFMUSIC_1GetNumSamples
JNIEXPORT jint JNICALL Java_org_lwjgl_fmod3_FMusic_nFMUSIC_1GetNumSamples
(JNIEnv *env, jclass clazz, jlong module){
return fmod_instance->FMUSIC_GetNumSamples((FMUSIC_MODULE *) module);
}
/*
* Class: org_lwjgl_fmod_FMusic
* Class: org_lwjgl_fmod3_FMusic
* Method: nFMUSIC_GetNumChannels
* Signature: (J)I
*/
JNIEXPORT jint JNICALL Java_org_lwjgl_fmod_FMusic_nFMUSIC_1GetNumChannels
JNIEXPORT jint JNICALL Java_org_lwjgl_fmod3_FMusic_nFMUSIC_1GetNumChannels
(JNIEnv *env, jclass clazz, jlong module){
return fmod_instance->FMUSIC_GetNumChannels((FMUSIC_MODULE *) module);
}
/*
* Class: org_lwjgl_fmod_FMusic
* Class: org_lwjgl_fmod3_FMusic
* Method: nFMUSIC_GetSample
* Signature: (JI)J
*/
JNIEXPORT jlong JNICALL Java_org_lwjgl_fmod_FMusic_nFMUSIC_1GetSample
JNIEXPORT jlong JNICALL Java_org_lwjgl_fmod3_FMusic_nFMUSIC_1GetSample
(JNIEnv *env, jclass clazz, jlong module, jint sampleno){
return (jlong) fmod_instance->FMUSIC_GetSample((FMUSIC_MODULE *) module, sampleno);
}
/*
* Class: org_lwjgl_fmod_FMusic
* Class: org_lwjgl_fmod3_FMusic
* Method: nFMUSIC_GetPatternLength
* Signature: (JI)I
*/
JNIEXPORT jint JNICALL Java_org_lwjgl_fmod_FMusic_nFMUSIC_1GetPatternLength
JNIEXPORT jint JNICALL Java_org_lwjgl_fmod3_FMusic_nFMUSIC_1GetPatternLength
(JNIEnv *env, jclass clazz, jlong module, jint orderno){
return fmod_instance->FMUSIC_GetPatternLength((FMUSIC_MODULE *) module, orderno);
}
/*
* Class: org_lwjgl_fmod_FMusic
* Class: org_lwjgl_fmod3_FMusic
* Method: nFMUSIC_IsFinished
* Signature: (J)Z
*/
JNIEXPORT jboolean JNICALL Java_org_lwjgl_fmod_FMusic_nFMUSIC_1IsFinished
JNIEXPORT jboolean JNICALL Java_org_lwjgl_fmod3_FMusic_nFMUSIC_1IsFinished
(JNIEnv *env, jclass clazz, jlong module){
return fmod_instance->FMUSIC_IsFinished((FMUSIC_MODULE *) module);
}
/*
* Class: org_lwjgl_fmod_FMusic
* Class: org_lwjgl_fmod3_FMusic
* Method: nFMUSIC_IsPlaying
* Signature: (J)Z
*/
JNIEXPORT jboolean JNICALL Java_org_lwjgl_fmod_FMusic_nFMUSIC_1IsPlaying
JNIEXPORT jboolean JNICALL Java_org_lwjgl_fmod3_FMusic_nFMUSIC_1IsPlaying
(JNIEnv *env, jclass clazz, jlong module){
return fmod_instance->FMUSIC_IsPlaying((FMUSIC_MODULE *) module);
}
/*
* Class: org_lwjgl_fmod_FMusic
* Class: org_lwjgl_fmod3_FMusic
* Method: nFMUSIC_GetMasterVolume
* Signature: (J)I
*/
JNIEXPORT jint JNICALL Java_org_lwjgl_fmod_FMusic_nFMUSIC_1GetMasterVolume
JNIEXPORT jint JNICALL Java_org_lwjgl_fmod3_FMusic_nFMUSIC_1GetMasterVolume
(JNIEnv *env, jclass clazz, jlong module){
return fmod_instance->FMUSIC_GetMasterVolume((FMUSIC_MODULE *) module);
}
/*
* Class: org_lwjgl_fmod_FMusic
* Class: org_lwjgl_fmod3_FMusic
* Method: nFMUSIC_GetGlobalVolume
* Signature: (J)I
*/
JNIEXPORT jint JNICALL Java_org_lwjgl_fmod_FMusic_nFMUSIC_1GetGlobalVolume
JNIEXPORT jint JNICALL Java_org_lwjgl_fmod3_FMusic_nFMUSIC_1GetGlobalVolume
(JNIEnv *env, jclass clazz, jlong module){
return fmod_instance->FMUSIC_GetGlobalVolume((FMUSIC_MODULE *) module);
}
/*
* Class: org_lwjgl_fmod_FMusic
* Class: org_lwjgl_fmod3_FMusic
* Method: nFMUSIC_GetOrder
* Signature: (J)I
*/
JNIEXPORT jint JNICALL Java_org_lwjgl_fmod_FMusic_nFMUSIC_1GetOrder
JNIEXPORT jint JNICALL Java_org_lwjgl_fmod3_FMusic_nFMUSIC_1GetOrder
(JNIEnv *env, jclass clazz, jlong module){
return fmod_instance->FMUSIC_GetOrder((FMUSIC_MODULE *) module);
}
/*
* Class: org_lwjgl_fmod_FMusic
* Class: org_lwjgl_fmod3_FMusic
* Method: nFMUSIC_GetPattern
* Signature: (J)I
*/
JNIEXPORT jint JNICALL Java_org_lwjgl_fmod_FMusic_nFMUSIC_1GetPattern
JNIEXPORT jint JNICALL Java_org_lwjgl_fmod3_FMusic_nFMUSIC_1GetPattern
(JNIEnv *env, jclass clazz, jlong module){
return fmod_instance->FMUSIC_GetPattern((FMUSIC_MODULE *) module);
}
/*
* Class: org_lwjgl_fmod_FMusic
* Class: org_lwjgl_fmod3_FMusic
* Method: nFMUSIC_GetSpeed
* Signature: (J)I
*/
JNIEXPORT jint JNICALL Java_org_lwjgl_fmod_FMusic_nFMUSIC_1GetSpeed
JNIEXPORT jint JNICALL Java_org_lwjgl_fmod3_FMusic_nFMUSIC_1GetSpeed
(JNIEnv *env, jclass clazz, jlong module){
return fmod_instance->FMUSIC_GetSpeed((FMUSIC_MODULE *) module);
}
/*
* Class: org_lwjgl_fmod_FMusic
* Class: org_lwjgl_fmod3_FMusic
* Method: nFMUSIC_GetBPM
* Signature: (J)I
*/
JNIEXPORT jint JNICALL Java_org_lwjgl_fmod_FMusic_nFMUSIC_1GetBPM
JNIEXPORT jint JNICALL Java_org_lwjgl_fmod3_FMusic_nFMUSIC_1GetBPM
(JNIEnv *env, jclass clazz, jlong module){
return fmod_instance->FMUSIC_GetBPM((FMUSIC_MODULE *) module);
}
/*
* Class: org_lwjgl_fmod_FMusic
* Class: org_lwjgl_fmod3_FMusic
* Method: nFMUSIC_GetRow
* Signature: (J)I
*/
JNIEXPORT jint JNICALL Java_org_lwjgl_fmod_FMusic_nFMUSIC_1GetRow
JNIEXPORT jint JNICALL Java_org_lwjgl_fmod3_FMusic_nFMUSIC_1GetRow
(JNIEnv *env, jclass clazz, jlong module){
return fmod_instance->FMUSIC_GetRow((FMUSIC_MODULE *) module);
}
/*
* Class: org_lwjgl_fmod_FMusic
* Class: org_lwjgl_fmod3_FMusic
* Method: nFMUSIC_GetPaused
* Signature: (J)Z
*/
JNIEXPORT jboolean JNICALL Java_org_lwjgl_fmod_FMusic_nFMUSIC_1GetPaused
JNIEXPORT jboolean JNICALL Java_org_lwjgl_fmod3_FMusic_nFMUSIC_1GetPaused
(JNIEnv *env, jclass clazz, jlong module){
return fmod_instance->FMUSIC_GetPaused((FMUSIC_MODULE *) module);
}
/*
* Class: org_lwjgl_fmod_FMusic
* Class: org_lwjgl_fmod3_FMusic
* Method: nFMUSIC_GetTime
* Signature: (J)I
*/
JNIEXPORT jint JNICALL Java_org_lwjgl_fmod_FMusic_nFMUSIC_1GetTime
JNIEXPORT jint JNICALL Java_org_lwjgl_fmod3_FMusic_nFMUSIC_1GetTime
(JNIEnv *env, jclass clazz, jlong module){
return fmod_instance->FMUSIC_GetTime((FMUSIC_MODULE *) module);
}
/*
* Class: org_lwjgl_fmod_FMusic
* Class: org_lwjgl_fmod3_FMusic
* Method: nFMUSIC_GetRealChannel
* Signature: (JI)I
*/
JNIEXPORT jint JNICALL Java_org_lwjgl_fmod_FMusic_nFMUSIC_1GetRealChannel
JNIEXPORT jint JNICALL Java_org_lwjgl_fmod3_FMusic_nFMUSIC_1GetRealChannel
(JNIEnv *env, jclass clazz, jlong module, jint modchannel){
return fmod_instance->FMUSIC_GetRealChannel((FMUSIC_MODULE *) module, modchannel);
}
/*
* Class: org_lwjgl_fmod_FMusic
* Class: org_lwjgl_fmod3_FMusic
* Method: nFMUSIC_GetUserData
* Signature: (J)Ljava/nio/ByteBuffer;
*/
JNIEXPORT jobject JNICALL Java_org_lwjgl_fmod_FMusic_nFMUSIC_1GetUserData(JNIEnv *env, jclass clazz, jlong module, jint capacity) {
JNIEXPORT jobject JNICALL Java_org_lwjgl_fmod3_FMusic_nFMUSIC_1GetUserData(JNIEnv *env, jclass clazz, jlong module, jint capacity) {
void* data = (void*) fmod_instance->FMUSIC_GetUserData((FMUSIC_MODULE *) module);
return env->NewDirectByteBuffer(data, capacity);
}

1757
src/native/common/fmod3/org_lwjgl_fmod3_FSound.cpp Normal file
View File

File diff suppressed because it is too large Load Diff

2
src/native/configure.in
View File

@ -76,7 +76,7 @@ AC_CONFIG_FILES([Makefile
common/ati/Makefile
common/ext/Makefile
common/nv/Makefile
common/fmod/Makefile
common/fmod3/Makefile
linux/Makefile
macosx/Makefile])
AC_OUTPUT