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

fixed offset/length to use buffer properties

This commit is contained in:
Brian Matzon 2006-06-23 08:16:27 +00:00
parent d20c118cd6
commit 9e811f332a
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/native/common/fmod3/org_lwjgl_fmod3_FMusic.c
View File

@ -57,15 +57,15 @@ JNIEXPORT jlong JNICALL Java_org_lwjgl_fmod3_FMusic_nFMUSIC_1LoadSong(JNIEnv *en
* Method: nFMUSIC_LoadSongEx
* Signature: (Ljava/nio/ByteBuffer;IIILjava/nio/IntBuffer;I)J
*/
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){
JNIEXPORT jlong JNICALL Java_org_lwjgl_fmod3_FMusic_nFMUSIC_1LoadSongEx__Ljava_nio_ByteBuffer_2IIILjava_nio_IntBuffer_2II
(JNIEnv *env, jclass clazz, jobject data, jint offset, jint length, jint mode, jobject sampleList, jint sampleListOffset, jint samplelistnum){
int *sampleData = NULL;
const char *songData = dataOffset + (char *) (*env)->GetDirectBufferAddress(env, data);
const char *songData = offset + (char *) (*env)->GetDirectBufferAddress(env, data);
if(sampleList != NULL) {
sampleData = sampleListOffset + (int *) (*env)->GetDirectBufferAddress(env, sampleList);
}
return (jlong) fmod_instance->FMUSIC_LoadSongEx(songData, offset, length, mode, sampleData, samplelistnum);
return (jlong) fmod_instance->FMUSIC_LoadSongEx(songData, 0, length, mode, sampleData, samplelistnum);
}
/*

12
src/native/common/fmod3/org_lwjgl_fmod3_FSound.c
View File

@ -438,9 +438,9 @@ JNIEXPORT jstring JNICALL Java_org_lwjgl_fmod3_FSound_nFSOUND_1Sample_1GetName(J
* Method: nFSOUND_Sample_Load
* Signature: (ILjava/nio/ByteBuffer;IIII)J
*/
JNIEXPORT jlong JNICALL Java_org_lwjgl_fmod3_FSound_nFSOUND_1Sample_1Load__ILjava_nio_ByteBuffer_2IIII(JNIEnv * env, jclass clazz, jint index, jobject data, jint dataOffset, jint inputmode, jint offset, jint length) {
const char * nData = dataOffset + (const char *) (*env)->GetDirectBufferAddress(env, data);
return (long) fmod_instance->FSOUND_Sample_Load(index, nData, inputmode, offset, length);
JNIEXPORT jlong JNICALL Java_org_lwjgl_fmod3_FSound_nFSOUND_1Sample_1Load__ILjava_nio_ByteBuffer_2III(JNIEnv * env, jclass clazz, jint index, jobject data, jint inputmode, jint offset, jint length) {
const char * nData = offset + (const char *) (*env)->GetDirectBufferAddress(env, data);
return (long) fmod_instance->FSOUND_Sample_Load(index, nData, inputmode, 0, length);
}
/*
@ -969,9 +969,9 @@ JNIEXPORT void JNICALL Java_org_lwjgl_fmod3_FSound_FSOUND_13D_1SetRolloffFactor(
* Method: nFSOUND_Stream_Open
* Signature: (Ljava/nio/ByteBuffer;IIII)J
*/
JNIEXPORT jlong JNICALL Java_org_lwjgl_fmod3_FSound_nFSOUND_1Stream_1Open__Ljava_nio_ByteBuffer_2IIII(JNIEnv * env, jclass clazz, jobject data, jint dataOffset, jint mode, jint offset, jint length) {
const char *streamData = dataOffset + (char *) (*env)->GetDirectBufferAddress(env, data);
return (jlong) fmod_instance->FSOUND_Stream_Open(streamData, mode, offset, length);
JNIEXPORT jlong JNICALL Java_org_lwjgl_fmod3_FSound_nFSOUND_1Stream_1Open__Ljava_nio_ByteBuffer_2III(JNIEnv * env, jclass clazz, jobject data, jint mode, jint offset, jint length) {
const char *streamData = offset + (char *) (*env)->GetDirectBufferAddress(env, data);
return (jlong) fmod_instance->FSOUND_Stream_Open(streamData, mode, 0, length);
}
/*