Menu
▾
▴
java-game-lib-cvs — Commits to the repository will be send to this list.
You can subscribe to this list here.
| 2002 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(134) |
Sep
(52) |
Oct
(13) |
Nov
(342) |
Dec
(163) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2003 |
Jan
(44) |
Feb
(62) |
Mar
(158) |
Apr
(38) |
May
(70) |
Jun
(58) |
Jul
(104) |
Aug
(207) |
Sep
(83) |
Oct
(122) |
Nov
(23) |
Dec
(49) |
| 2004 |
Jan
(119) |
Feb
(132) |
Mar
(192) |
Apr
(140) |
May
(77) |
Jun
(74) |
Jul
(201) |
Aug
(63) |
Sep
(102) |
Oct
(70) |
Nov
(173) |
Dec
(78) |
| 2005 |
Jan
(174) |
Feb
(197) |
Mar
(105) |
Apr
(59) |
May
(77) |
Jun
(43) |
Jul
(21) |
Aug
(18) |
Sep
(47) |
Oct
(37) |
Nov
(74) |
Dec
(50) |
| 2006 |
Jan
(44) |
Feb
(19) |
Mar
(32) |
Apr
(24) |
May
(31) |
Jun
(55) |
Jul
(138) |
Aug
(28) |
Sep
(12) |
Oct
(41) |
Nov
(58) |
Dec
(24) |
| 2007 |
Jan
(28) |
Feb
(14) |
Mar
(10) |
Apr
(68) |
May
(30) |
Jun
(26) |
Jul
(18) |
Aug
(63) |
Sep
(19) |
Oct
(29) |
Nov
(20) |
Dec
(10) |
| 2008 |
Jan
(38) |
Feb
(7) |
Mar
(37) |
Apr
(120) |
May
(41) |
Jun
(36) |
Jul
(39) |
Aug
(24) |
Sep
(28) |
Oct
(30) |
Nov
(36) |
Dec
(75) |
| 2009 |
Jan
(46) |
Feb
(22) |
Mar
(50) |
Apr
(70) |
May
(134) |
Jun
(105) |
Jul
(75) |
Aug
(34) |
Sep
(38) |
Oct
(34) |
Nov
(19) |
Dec
(20) |
| 2010 |
Jan
(11) |
Feb
(20) |
Mar
(65) |
Apr
(83) |
May
(104) |
Jun
(73) |
Jul
(78) |
Aug
(57) |
Sep
(43) |
Oct
(35) |
Nov
(9) |
Dec
(4) |
| 2011 |
Jan
(21) |
Feb
(11) |
Mar
(18) |
Apr
(10) |
May
(18) |
Jun
(15) |
Jul
(48) |
Aug
(25) |
Sep
(17) |
Oct
(45) |
Nov
(15) |
Dec
(12) |
| 2012 |
Jan
(21) |
Feb
(9) |
Mar
(12) |
Apr
(9) |
May
(9) |
Jun
(5) |
Jul
(1) |
Aug
(10) |
Sep
(12) |
Oct
(1) |
Nov
(28) |
Dec
(5) |
| 2013 |
Jan
(4) |
Feb
(1) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2014 |
Jan
|
Feb
(1) |
Mar
(1) |
Apr
|
May
(2) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(1) |
Nov
|
Dec
|
| 2015 |
Jan
(1) |
Feb
|
Mar
|
Apr
|
May
|
Jun
(1) |
Jul
|
Aug
|
Sep
|
Oct
(2) |
Nov
|
Dec
|
| 2016 |
Jan
(2) |
Feb
(1) |
Mar
(1) |
Apr
(1) |
May
(2) |
Jun
|
Jul
(1) |
Aug
(2) |
Sep
|
Oct
|
Nov
(1) |
Dec
|
| 2017 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(1) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| S | M | T | W | T | F | S |
|---|---|---|---|---|---|---|
|
|
|
|
|
|
1
(1) |
2
|
|
3
|
4
(3) |
5
|
6
|
7
|
8
|
9
(12) |
|
10
|
11
(4) |
12
(18) |
13
(2) |
14
(1) |
15
|
16
|
|
17
(1) |
18
(2) |
19
(1) |
20
|
21
|
22
|
23
|
|
24
|
25
(2) |
26
|
27
(2) |
28
(7) |
29
(2) |
30
(1) |
|
From: Brian M. <ma...@us...> - 2005-04-12 19:14:05
|
Update of /cvsroot/java-game-lib/LWJGL/src/native/common/fmod3 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27418 Modified Files: org_lwjgl_fmod3_FMOD.c Log Message: removed debug Index: org_lwjgl_fmod3_FMOD.c =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/fmod3/org_lwjgl_fmod3_FMOD.c,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- org_lwjgl_fmod3_FMOD.c 12 Apr 2005 18:57:00 -0000 1.10 +++ org_lwjgl_fmod3_FMOD.c 12 Apr 2005 19:13:35 -0000 1.11 @@ -53,7 +53,6 @@ * Signature: ()Ljava/lang/String; */ JNIEXPORT jstring JNICALL Java_org_lwjgl_fmod3_FMOD_getNativeLibraryVersion(JNIEnv * env, jclass clazz) { - printfDebug("getNativeLibrary: %s", VERSION); return NewStringNative(env, VERSION); } |
|
From: Brian M. <ma...@us...> - 2005-04-12 18:57:54
|
Update of /cvsroot/java-game-lib/LWJGL/src/native/common/fmod3 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18344 Modified Files: org_lwjgl_fmod3_FMOD.c Log Message: ignore fmod load path Index: org_lwjgl_fmod3_FMOD.c =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/fmod3/org_lwjgl_fmod3_FMOD.c,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- org_lwjgl_fmod3_FMOD.c 16 Mar 2005 21:18:41 -0000 1.9 +++ org_lwjgl_fmod3_FMOD.c 12 Apr 2005 18:57:00 -0000 1.10 @@ -53,6 +53,7 @@ * Signature: ()Ljava/lang/String; */ JNIEXPORT jstring JNICALL Java_org_lwjgl_fmod3_FMOD_getNativeLibraryVersion(JNIEnv * env, jclass clazz) { + printfDebug("getNativeLibrary: %s", VERSION); return NewStringNative(env, VERSION); } @@ -75,10 +76,10 @@ lib_str = concatenate(path_str, "fmod.dll"); #endif #ifdef _X11 - lib_str = concatenate(path_str, "libfmod.so"); + lib_str = concatenate(path_str, "libfmod.so"); #endif #ifdef _MACOSX - lib_str = concatenate(path_str, "fmod_cfm.shlb"); + lib_str = concatenate(path_str, "ignored"); #endif printfDebug("Testing '%s'\n", lib_str); fmod_create(env, lib_str); |
|
From: Brian M. <ma...@us...> - 2005-04-12 18:54:38
|
Update of /cvsroot/java-game-lib/LWJGL/src/native/common/fmod3 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16955 Modified Files: extfmod3.h Log Message: use "dynamic" header on mac Index: extfmod3.h =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/fmod3/extfmod3.h,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- extfmod3.h 19 Sep 2004 11:17:07 -0000 1.6 +++ extfmod3.h 12 Apr 2005 18:53:40 -0000 1.7 @@ -36,7 +36,11 @@ #include <jni.h> #include "../common_tools.h" +#ifdef _MACOSX +#include "fmoddyn_mac.h" +#else #include "fmoddyn.h" +#endif #include "fmod_errors.h" // Called to create an FMOD instance |
|
From: Brian M. <ma...@us...> - 2005-04-12 18:54:30
|
Update of /cvsroot/java-game-lib/LWJGL/src/native/common/fmod3 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17502 Modified Files: extfmod3.c Log Message: please mac compilation Index: extfmod3.c =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/fmod3/extfmod3.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- extfmod3.c 19 Sep 2004 11:17:07 -0000 1.2 +++ extfmod3.c 12 Apr 2005 18:54:21 -0000 1.3 @@ -42,26 +42,26 @@ FMOD_INSTANCE * fmod_instance = NULL; // jnienvs -JNIEnv *mixer_jnienv; -JNIEnv *stream_jnienv; +JNIEnv *mixer_jnienv = NULL; +JNIEnv *stream_jnienv = NULL; // FMusic cached fields -jmethodID music_instcallback; -jmethodID music_ordercallback; -jmethodID music_rowcallback; -jmethodID music_zxxcallback; -jclass fmusic; +jmethodID music_instcallback = NULL; +jmethodID music_ordercallback = NULL; +jmethodID music_rowcallback = NULL; +jmethodID music_zxxcallback= NULL; +jclass fmusic = NULL; // FSound cached fields -jmethodID sound_dspcallback; -jmethodID sound_stream_endcallback; -jmethodID sound_stream_synccallback; -jmethodID sound_stream_callback; -jmethodID sound_metadata_callback; -jclass fsound; +jmethodID sound_dspcallback = NULL; +jmethodID sound_stream_endcallback = NULL; +jmethodID sound_stream_synccallback = NULL; +jmethodID sound_stream_callback = NULL; +jmethodID sound_metadata_callback = NULL; +jclass fsound = NULL; // size of dsp buffer (in bytes) -int fsound_dsp_buffer_size; +int fsound_dsp_buffer_size = 0; #ifdef _WIN32 /** @@ -80,7 +80,7 @@ void fmod_create(JNIEnv *env, const char* path) { // try to create an instance using the supplied path fmod_instance = FMOD_CreateInstance((char *)path); - + // if we got one, we need to locate and cache jni stuff used for callbacks if (fmod_instance != NULL) { @@ -115,7 +115,7 @@ fsound_dsp_buffer_size = 4; break; } - } + } } /** |
|
From: Brian M. <ma...@us...> - 2005-04-12 18:52:12
|
Update of /cvsroot/java-game-lib/LWJGL/src/native/common/fmod3 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15587 Added Files: fmoddyn_mac.h Log Message: fake "dynamic" header for MacOSX, which uses a static lib *grumble* --- NEW FILE: fmoddyn_mac.h --- #include "fmod.h" #ifndef _LWJGL_FMOD_DYN_H_ #define _LWJGL_FMOD_DYN_H_ typedef struct { void *module; signed char (F_API *FSOUND_SetOutput)(int outputtype); signed char (F_API *FSOUND_SetDriver)(int driver); signed char (F_API *FSOUND_SetMixer)(int mixer); signed char (F_API *FSOUND_SetBufferSize)(int len_ms); signed char (F_API *FSOUND_SetHWND)(void *hwnd); signed char (F_API *FSOUND_SetMinHardwareChannels)(int min); signed char (F_API *FSOUND_SetMaxHardwareChannels)(int max); signed char (F_API *FSOUND_SetMemorySystem)(void *pool, int poollen, FSOUND_ALLOCCALLBACK useralloc, FSOUND_REALLOCCALLBACK userrealloc, FSOUND_FREECALLBACK userfree); signed char (F_API *FSOUND_Init)(int mixrate, int maxsoftwarechannels, unsigned int flags); void (F_API *FSOUND_Close)(); void (F_API *FSOUND_Update)(); /* you must call this once a frame */ void (F_API *FSOUND_SetSpeakerMode)(unsigned int speakermode); void (F_API *FSOUND_SetSFXMasterVolume)(int volume); void (F_API *FSOUND_SetPanSeperation)(float pansep); void (F_API *FSOUND_File_SetCallbacks)(FSOUND_OPENCALLBACK useropen, FSOUND_CLOSECALLBACK userclose, FSOUND_READCALLBACK userread, FSOUND_SEEKCALLBACK userseek, FSOUND_TELLCALLBACK usertell); int (F_API *FSOUND_GetError)(); float (F_API *FSOUND_GetVersion)(); int (F_API *FSOUND_GetOutput)(); void * (F_API *FSOUND_GetOutputHandle)(); int (F_API *FSOUND_GetDriver)(); int (F_API *FSOUND_GetMixer)(); int (F_API *FSOUND_GetNumDrivers)(); const char * (F_API *FSOUND_GetDriverName)(int id); signed char (F_API *FSOUND_GetDriverCaps)(int id, unsigned int *caps); int (F_API *FSOUND_GetOutputRate)(); int (F_API *FSOUND_GetMaxChannels)(); int (F_API *FSOUND_GetMaxSamples)(); int (F_API *FSOUND_GetSFXMasterVolume)(); signed char (F_API *FSOUND_GetNumHWChannels)(int *num2d, int *num3d, int *total); int (F_API *FSOUND_GetChannelsPlaying)(); float (F_API *FSOUND_GetCPUUsage)(); void (F_API *FSOUND_GetMemoryStats)(unsigned int *currentalloced, unsigned int *maxalloced); FSOUND_SAMPLE * (F_API *FSOUND_Sample_Load)(int index, const char *name_or_data, unsigned int mode, int offset, int length); FSOUND_SAMPLE * (F_API *FSOUND_Sample_Alloc)(int index, int length, unsigned int mode, int deffreq, int defvol, int defpan, int defpri); void (F_API *FSOUND_Sample_Free)(FSOUND_SAMPLE *sptr); signed char (F_API *FSOUND_Sample_Upload)(FSOUND_SAMPLE *sptr, void *srcdata, unsigned int mode); signed char (F_API *FSOUND_Sample_Lock)(FSOUND_SAMPLE *sptr, int offset, int length, void **ptr1, void **ptr2, unsigned int *len1, unsigned int *len2); signed char (F_API *FSOUND_Sample_Unlock)(FSOUND_SAMPLE *sptr, void *ptr1, void *ptr2, unsigned int len1, unsigned int len2); signed char (F_API *FSOUND_Sample_SetMode)(FSOUND_SAMPLE *sptr, unsigned int mode); signed char (F_API *FSOUND_Sample_SetLoopPoints)(FSOUND_SAMPLE *sptr, int loopstart, int loopend); signed char (F_API *FSOUND_Sample_SetDefaults)(FSOUND_SAMPLE *sptr, int deffreq, int defvol, int defpan, int defpri); signed char (F_API *FSOUND_Sample_SetDefaultsEx)(FSOUND_SAMPLE *sptr, int deffreq, int defvol, int defpan, int defpri, int varfreq, int varvol, int varpan); signed char (F_API *FSOUND_Sample_SetMinMaxDistance)(FSOUND_SAMPLE *sptr, float min, float max); signed char (F_API *FSOUND_Sample_SetMaxPlaybacks)(FSOUND_SAMPLE *sptr, int max); FSOUND_SAMPLE * (F_API *FSOUND_Sample_Get)(int sampno); const char * (F_API *FSOUND_Sample_GetName)(FSOUND_SAMPLE *sptr); unsigned int (F_API *FSOUND_Sample_GetLength)(FSOUND_SAMPLE *sptr); signed char (F_API *FSOUND_Sample_GetLoopPoints)(FSOUND_SAMPLE *sptr, int *loopstart, int *loopend); signed char (F_API *FSOUND_Sample_GetDefaults)(FSOUND_SAMPLE *sptr, int *deffreq, int *defvol, int *defpan, int *defpri); signed char (F_API *FSOUND_Sample_GetDefaultsEx)(FSOUND_SAMPLE *sptr, int *deffreq, int *defvol, int *defpan, int *defpri, int *varfreq, int *varvol, int *varpan); unsigned int (F_API *FSOUND_Sample_GetMode)(FSOUND_SAMPLE *sptr); signed char (F_API *FSOUND_Sample_GetMinMaxDistance)(FSOUND_SAMPLE *sptr, float *min, float *max); int (F_API *FSOUND_PlaySound)(int channel, FSOUND_SAMPLE *sptr); int (F_API *FSOUND_PlaySoundEx)(int channel, FSOUND_SAMPLE *sptr, FSOUND_DSPUNIT *dsp, signed char startpaused); signed char (F_API *FSOUND_StopSound)(int channel); signed char (F_API *FSOUND_SetFrequency)(int channel, int freq); signed char (F_API *FSOUND_SetVolume)(int channel, int vol); signed char (F_API *FSOUND_SetVolumeAbsolute)(int channel, int vol); signed char (F_API *FSOUND_SetPan)(int channel, int pan); signed char (F_API *FSOUND_SetSurround)(int channel, signed char surround); signed char (F_API *FSOUND_SetMute)(int channel, signed char mute); signed char (F_API *FSOUND_SetPriority)(int channel, int priority); signed char (F_API *FSOUND_SetReserved)(int channel, signed char reserved); signed char (F_API *FSOUND_SetPaused)(int channel, signed char paused); signed char (F_API *FSOUND_SetLoopMode)(int channel, unsigned int loopmode); signed char (F_API *FSOUND_SetCurrentPosition)(int channel, unsigned int offset); signed char (F_API *FSOUND_3D_SetAttributes)(int channel, const float *pos, const float *vel); signed char (F_API *FSOUND_3D_SetMinMaxDistance)(int channel, float min, float max); signed char (F_API *FSOUND_IsPlaying)(int channel); int (F_API *FSOUND_GetFrequency)(int channel); int (F_API *FSOUND_GetVolume)(int channel); int (F_API *FSOUND_GetAmplitude)(int channel); int (F_API *FSOUND_GetPan)(int channel); signed char (F_API *FSOUND_GetSurround)(int channel); signed char (F_API *FSOUND_GetMute)(int channel); int (F_API *FSOUND_GetPriority)(int channel); signed char (F_API *FSOUND_GetReserved)(int channel); signed char (F_API *FSOUND_GetPaused)(int channel); unsigned int (F_API *FSOUND_GetLoopMode)(int channel); unsigned int (F_API *FSOUND_GetCurrentPosition)(int channel); FSOUND_SAMPLE * (F_API *FSOUND_GetCurrentSample)(int channel); signed char (F_API *FSOUND_GetCurrentLevels)(int channel, float *l, float *r); int (F_API *FSOUND_GetNumSubChannels)(int channel); int (F_API *FSOUND_GetSubChannel)(int channel, int subchannel); signed char (F_API *FSOUND_3D_GetAttributes)(int channel, float *pos, float *vel); signed char (F_API *FSOUND_3D_GetMinMaxDistance)(int channel, float *min, float *max); void (F_API *FSOUND_3D_SetDopplerFactor)(float scale); void (F_API *FSOUND_3D_SetDistanceFactor)(float scale); void (F_API *FSOUND_3D_SetRolloffFactor)(float scale); void (F_API *FSOUND_3D_Listener_SetCurrent)(int current, int numlisteners); /* use this if you use multiple listeners / splitscreen */ void (F_API *FSOUND_3D_Listener_SetAttributes)(const float *pos, const float *vel, float fx, float fy, float fz, float tx, float ty, float tz); void (F_API *FSOUND_3D_Listener_GetAttributes)(float *pos, float *vel, float *fx, float *fy, float *fz, float *tx, float *ty, float *tz); int (F_API *FSOUND_FX_Enable)(int channel, unsigned int fx); /* See FSOUND_FX_MODES */ signed char (F_API *FSOUND_FX_Disable)(int channel); signed char (F_API *FSOUND_FX_SetChorus)(int fxid, float WetDryMix, float Depth, float Feedback, float Frequency, int Waveform, float Delay, int Phase); signed char (F_API *FSOUND_FX_SetCompressor)(int fxid, float Gain, float Attack, float Release, float Threshold, float Ratio, float Predelay); signed char (F_API *FSOUND_FX_SetDistortion)(int fxid, float Gain, float Edge, float PostEQCenterFrequency, float PostEQBandwidth, float PreLowpassCutoff); signed char (F_API *FSOUND_FX_SetEcho)(int fxid, float WetDryMix, float Feedback, float LeftDelay, float RightDelay, int PanDelay); signed char (F_API *FSOUND_FX_SetFlanger)(int fxid, float WetDryMix, float Depth, float Feedback, float Frequency, int Waveform, float Delay, int Phase); signed char (F_API *FSOUND_FX_SetGargle)(int fxid, int RateHz, int WaveShape); signed char (F_API *FSOUND_FX_SetI3DL2Reverb)(int fxid, int Room, int RoomHF, float RoomRolloffFactor, float DecayTime, float DecayHFRatio, int Reflections, float ReflectionsDelay, int Reverb, float ReverbDelay, float Diffusion, float Density, float HFReference); signed char (F_API *FSOUND_FX_SetParamEQ)(int fxid, float Center, float Bandwidth, float Gain); signed char (F_API *FSOUND_FX_SetWavesReverb)(int fxid, float InGain, float ReverbMix, float ReverbTime, float HighFreqRTRatio); signed char (F_API *FSOUND_Stream_SetBufferSize)(int ms); /* call this before opening streams, not after */ FSOUND_STREAM * (F_API *FSOUND_Stream_Open)(const char *name_or_data, unsigned int mode, int offset, int length); FSOUND_STREAM * (F_API *FSOUND_Stream_Create)(FSOUND_STREAMCALLBACK callback, int length, unsigned int mode, int samplerate, void *userdata); signed char (F_API *FSOUND_Stream_Close)(FSOUND_STREAM *stream); int (F_API *FSOUND_Stream_Play)(int channel, FSOUND_STREAM *stream); int (F_API *FSOUND_Stream_PlayEx)(int channel, FSOUND_STREAM *stream, FSOUND_DSPUNIT *dsp, signed char startpaused); signed char (F_API *FSOUND_Stream_Stop)(FSOUND_STREAM *stream); signed char (F_API *FSOUND_Stream_SetPosition)(FSOUND_STREAM *stream, unsigned int position); unsigned int (F_API *FSOUND_Stream_GetPosition)(FSOUND_STREAM *stream); signed char (F_API *FSOUND_Stream_SetTime)(FSOUND_STREAM *stream, int ms); int (F_API *FSOUND_Stream_GetTime)(FSOUND_STREAM *stream); int (F_API *FSOUND_Stream_GetLength)(FSOUND_STREAM *stream); int (F_API *FSOUND_Stream_GetLengthMs)(FSOUND_STREAM *stream); signed char (F_API *FSOUND_Stream_SetMode)(FSOUND_STREAM *stream, unsigned int mode); unsigned int (F_API *FSOUND_Stream_GetMode)(FSOUND_STREAM *stream); signed char (F_API *FSOUND_Stream_SetLoopPoints)(FSOUND_STREAM *stream, unsigned int loopstartpcm, unsigned int loopendpcm); signed char (F_API *FSOUND_Stream_SetLoopCount)(FSOUND_STREAM *stream, int count); int (F_API *FSOUND_Stream_GetOpenState)(FSOUND_STREAM *stream); FSOUND_SAMPLE * (F_API *FSOUND_Stream_GetSample)(FSOUND_STREAM *stream); /* every stream contains a sample to playback on */ FSOUND_DSPUNIT * (F_API *FSOUND_Stream_CreateDSP)(FSOUND_STREAM *stream, FSOUND_DSPCALLBACK callback, int priority, void *userdata); signed char (F_API *FSOUND_Stream_SetEndCallback)(FSOUND_STREAM *stream, FSOUND_STREAMCALLBACK callback, void *userdata); signed char (F_API *FSOUND_Stream_SetSyncCallback)(FSOUND_STREAM *stream, FSOUND_STREAMCALLBACK callback, void *userdata); FSOUND_SYNCPOINT *(F_API *FSOUND_Stream_AddSyncPoint)(FSOUND_STREAM *stream, unsigned int pcmoffset, const char *name); signed char (F_API *FSOUND_Stream_DeleteSyncPoint)(FSOUND_SYNCPOINT *point); int (F_API *FSOUND_Stream_GetNumSyncPoints)(FSOUND_STREAM *stream); FSOUND_SYNCPOINT *(F_API *FSOUND_Stream_GetSyncPoint)(FSOUND_STREAM *stream, int index); char * (F_API *FSOUND_Stream_GetSyncPointInfo)(FSOUND_SYNCPOINT *point, unsigned int *pcmoffset); signed char (F_API *FSOUND_Stream_SetSubStream)(FSOUND_STREAM *stream, int index); int (F_API *FSOUND_Stream_GetNumSubStreams)(FSOUND_STREAM *stream); signed char (F_API *FSOUND_Stream_SetSubStreamSentence)(FSOUND_STREAM *stream, const int *sentencelist, int numitems); signed char (F_API *FSOUND_Stream_GetNumTagFields)(FSOUND_STREAM *stream, int *num); signed char (F_API *FSOUND_Stream_GetTagField)(FSOUND_STREAM *stream, int num, int *type, char **name, void **value, int *length); signed char (F_API *FSOUND_Stream_FindTagField)(FSOUND_STREAM *stream, int type, const char *name, void **value, int *length); signed char (F_API *FSOUND_Stream_Net_SetProxy)(const char *proxy); char * (F_API *FSOUND_Stream_Net_GetLastServerStatus)(); signed char (F_API *FSOUND_Stream_Net_SetBufferProperties)(int buffersize, int prebuffer_percent, int rebuffer_percent); signed char (F_API *FSOUND_Stream_Net_GetBufferProperties)(int *buffersize, int *prebuffer_percent, int *rebuffer_percent); signed char (F_API *FSOUND_Stream_Net_SetMetadataCallback)(FSOUND_STREAM *stream, FSOUND_METADATACALLBACK callback, void *userdata); signed char (F_API *FSOUND_Stream_Net_GetStatus)(FSOUND_STREAM *stream, int *status, int *bufferpercentused, int *bitrate, unsigned int *flags); signed char (F_API *FSOUND_CD_Play)(char drive, int track); void (F_API *FSOUND_CD_SetPlayMode)(char drive, signed char mode); signed char (F_API *FSOUND_CD_Stop)(char drive); signed char (F_API *FSOUND_CD_SetPaused)(char drive, signed char paused); signed char (F_API *FSOUND_CD_SetVolume)(char drive, int volume); signed char (F_API *FSOUND_CD_SetTrackTime)(char drive, unsigned int ms); // Not available on Mac //signed char (F_API *FSOUND_CD_OpenTray)(char drive, signed char open); signed char (F_API *FSOUND_CD_GetPaused)(char drive); int (F_API *FSOUND_CD_GetTrack)(char drive); int (F_API *FSOUND_CD_GetNumTracks)(char drive); int (F_API *FSOUND_CD_GetVolume)(char drive); int (F_API *FSOUND_CD_GetTrackLength)(char drive, int track); int (F_API *FSOUND_CD_GetTrackTime)(char drive); FSOUND_DSPUNIT * (F_API *FSOUND_DSP_Create)(FSOUND_DSPCALLBACK callback, int priority, void *userdata); void (F_API *FSOUND_DSP_Free)(FSOUND_DSPUNIT *unit); void (F_API *FSOUND_DSP_SetPriority)(FSOUND_DSPUNIT *unit, int priority); int (F_API *FSOUND_DSP_GetPriority)(FSOUND_DSPUNIT *unit); void (F_API *FSOUND_DSP_SetActive)(FSOUND_DSPUNIT *unit, signed char active); signed char (F_API *FSOUND_DSP_GetActive)(FSOUND_DSPUNIT *unit); FSOUND_DSPUNIT * (F_API *FSOUND_DSP_GetClearUnit)(); FSOUND_DSPUNIT * (F_API *FSOUND_DSP_GetSFXUnit)(); FSOUND_DSPUNIT * (F_API *FSOUND_DSP_GetMusicUnit)(); FSOUND_DSPUNIT * (F_API *FSOUND_DSP_GetFFTUnit)(); FSOUND_DSPUNIT * (F_API *FSOUND_DSP_GetClipAndCopyUnit)(); signed char (F_API *FSOUND_DSP_MixBuffers)(void *destbuffer, void *srcbuffer, int len, int freq, int vol, int pan, unsigned int mode); void (F_API *FSOUND_DSP_ClearMixBuffer)(); int (F_API *FSOUND_DSP_GetBufferLength)(); /* Length of each DSP update */ int (F_API *FSOUND_DSP_GetBufferLengthTotal)(); /* Total buffer length due to FSOUND_SetBufferSize */ float * (F_API *FSOUND_DSP_GetSpectrum)(); /* Array of 512 floats - call FSOUND_DSP_SetActive(FSOUND_DSP_GetFFTUnit(), TRUE)) for this to work. */ signed char (F_API *FSOUND_Reverb_SetProperties)(const FSOUND_REVERB_PROPERTIES *prop); signed char (F_API *FSOUND_Reverb_GetProperties)(FSOUND_REVERB_PROPERTIES *prop); signed char (F_API *FSOUND_Reverb_SetChannelProperties)(int channel, const FSOUND_REVERB_CHANNELPROPERTIES *prop); signed char (F_API *FSOUND_Reverb_GetChannelProperties)(int channel, FSOUND_REVERB_CHANNELPROPERTIES *prop); signed char (F_API *FSOUND_Record_SetDriver)(int outputtype); int (F_API *FSOUND_Record_GetNumDrivers)(); const char * (F_API *FSOUND_Record_GetDriverName)(int id); int (F_API *FSOUND_Record_GetDriver)(); signed char (F_API *FSOUND_Record_StartSample)(FSOUND_SAMPLE *sptr, signed char loop); signed char (F_API *FSOUND_Record_Stop)(); int (F_API *FSOUND_Record_GetPosition)(); FMUSIC_MODULE * (F_API *FMUSIC_LoadSong)(const char *name); FMUSIC_MODULE * (F_API *FMUSIC_LoadSongEx)(const char *name_or_data, int offset, int length, unsigned int mode, const int *samplelist, int samplelistnum); int (F_API *FMUSIC_GetOpenState)(FMUSIC_MODULE *mod); signed char (F_API *FMUSIC_FreeSong)(FMUSIC_MODULE *mod); signed char (F_API *FMUSIC_PlaySong)(FMUSIC_MODULE *mod); signed char (F_API *FMUSIC_StopSong)(FMUSIC_MODULE *mod); void (F_API *FMUSIC_StopAllSongs)(); signed char (F_API *FMUSIC_SetZxxCallback)(FMUSIC_MODULE *mod, FMUSIC_CALLBACK callback); signed char (F_API *FMUSIC_SetRowCallback)(FMUSIC_MODULE *mod, FMUSIC_CALLBACK callback, int rowstep); signed char (F_API *FMUSIC_SetOrderCallback)(FMUSIC_MODULE *mod, FMUSIC_CALLBACK callback, int orderstep); signed char (F_API *FMUSIC_SetInstCallback)(FMUSIC_MODULE *mod, FMUSIC_CALLBACK callback, int instrument); signed char (F_API *FMUSIC_SetSample)(FMUSIC_MODULE *mod, int sampno, FSOUND_SAMPLE *sptr); signed char (F_API *FMUSIC_SetUserData)(FMUSIC_MODULE *mod, void *userdata); signed char (F_API *FMUSIC_OptimizeChannels)(FMUSIC_MODULE *mod, int maxchannels, int minvolume); signed char (F_API *FMUSIC_SetReverb)(signed char reverb); /* MIDI only */ signed char (F_API *FMUSIC_SetLooping)(FMUSIC_MODULE *mod, signed char looping); signed char (F_API *FMUSIC_SetOrder)(FMUSIC_MODULE *mod, int order); signed char (F_API *FMUSIC_SetPaused)(FMUSIC_MODULE *mod, signed char pause); signed char (F_API *FMUSIC_SetMasterVolume)(FMUSIC_MODULE *mod, int volume); signed char (F_API *FMUSIC_SetMasterSpeed)(FMUSIC_MODULE *mode, float speed); signed char (F_API *FMUSIC_SetPanSeperation)(FMUSIC_MODULE *mod, float pansep); const char * (F_API *FMUSIC_GetName)(FMUSIC_MODULE *mod); int (F_API *FMUSIC_GetType)(FMUSIC_MODULE *mod); int (F_API *FMUSIC_GetNumOrders)(FMUSIC_MODULE *mod); int (F_API *FMUSIC_GetNumPatterns)(FMUSIC_MODULE *mod); int (F_API *FMUSIC_GetNumInstruments)(FMUSIC_MODULE *mod); int (F_API *FMUSIC_GetNumSamples)(FMUSIC_MODULE *mod); int (F_API *FMUSIC_GetNumChannels)(FMUSIC_MODULE *mod); FSOUND_SAMPLE * (F_API *FMUSIC_GetSample)(FMUSIC_MODULE *mod, int sampno); int (F_API *FMUSIC_GetPatternLength)(FMUSIC_MODULE *mod, int orderno); signed char (F_API *FMUSIC_IsFinished)(FMUSIC_MODULE *mod); signed char (F_API *FMUSIC_IsPlaying)(FMUSIC_MODULE *mod); int (F_API *FMUSIC_GetMasterVolume)(FMUSIC_MODULE *mod); int (F_API *FMUSIC_GetGlobalVolume)(FMUSIC_MODULE *mod); int (F_API *FMUSIC_GetOrder)(FMUSIC_MODULE *mod); int (F_API *FMUSIC_GetPattern)(FMUSIC_MODULE *mod); int (F_API *FMUSIC_GetSpeed)(FMUSIC_MODULE *mod); int (F_API *FMUSIC_GetBPM)(FMUSIC_MODULE *mod); int (F_API *FMUSIC_GetRow)(FMUSIC_MODULE *mod); signed char (F_API *FMUSIC_GetPaused)(FMUSIC_MODULE *mod); int (F_API *FMUSIC_GetTime)(FMUSIC_MODULE *mod); int (F_API *FMUSIC_GetRealChannel)(FMUSIC_MODULE *mod, int modchannel); void* (F_API *FMUSIC_GetUserData)(FMUSIC_MODULE *mod); } FMOD_INSTANCE; static FMOD_INSTANCE *FMOD_CreateInstance(char *dllName) { FMOD_INSTANCE *instance; instance = (FMOD_INSTANCE *)calloc(sizeof(FMOD_INSTANCE), 1); if(instance) { instance->FSOUND_SetOutput = &FSOUND_SetOutput; instance->FSOUND_SetDriver = &FSOUND_SetDriver; instance->FSOUND_SetMixer = &FSOUND_SetMixer; instance->FSOUND_SetBufferSize = &FSOUND_SetBufferSize; instance->FSOUND_SetHWND = &FSOUND_SetHWND; instance->FSOUND_SetMinHardwareChannels = &FSOUND_SetMinHardwareChannels; instance->FSOUND_SetMaxHardwareChannels = &FSOUND_SetMaxHardwareChannels; instance->FSOUND_SetMemorySystem = &FSOUND_SetMemorySystem; instance->FSOUND_Init = &FSOUND_Init; instance->FSOUND_Close = &FSOUND_Close; instance->FSOUND_Update = &FSOUND_Update; instance->FSOUND_SetSpeakerMode = &FSOUND_SetSpeakerMode; instance->FSOUND_SetSFXMasterVolume = &FSOUND_SetSFXMasterVolume; instance->FSOUND_SetPanSeperation = &FSOUND_SetPanSeperation; instance->FSOUND_File_SetCallbacks = &FSOUND_File_SetCallbacks; instance->FSOUND_GetError = &FSOUND_GetError; instance->FSOUND_GetVersion = &FSOUND_GetVersion; instance->FSOUND_GetOutput = &FSOUND_GetOutput; instance->FSOUND_GetOutputHandle = &FSOUND_GetOutputHandle; instance->FSOUND_GetDriver = &FSOUND_GetDriver; instance->FSOUND_GetMixer = &FSOUND_GetMixer; instance->FSOUND_GetNumDrivers = &FSOUND_GetNumDrivers; instance->FSOUND_GetDriverName = &FSOUND_GetDriverName; instance->FSOUND_GetDriverCaps = &FSOUND_GetDriverCaps; instance->FSOUND_GetOutputRate = &FSOUND_GetOutputRate; instance->FSOUND_GetMaxChannels = &FSOUND_GetMaxChannels; instance->FSOUND_GetMaxSamples = &FSOUND_GetMaxSamples; instance->FSOUND_GetSFXMasterVolume = &FSOUND_GetSFXMasterVolume; instance->FSOUND_GetNumHWChannels = &FSOUND_GetNumHWChannels; instance->FSOUND_GetChannelsPlaying = &FSOUND_GetChannelsPlaying; instance->FSOUND_GetCPUUsage = &FSOUND_GetCPUUsage; instance->FSOUND_GetMemoryStats = &FSOUND_GetMemoryStats; instance->FSOUND_Sample_Load = &FSOUND_Sample_Load; instance->FSOUND_Sample_Alloc = &FSOUND_Sample_Alloc; instance->FSOUND_Sample_Free = &FSOUND_Sample_Free; instance->FSOUND_Sample_Upload = &FSOUND_Sample_Upload; instance->FSOUND_Sample_Lock = &FSOUND_Sample_Lock; instance->FSOUND_Sample_Unlock = &FSOUND_Sample_Unlock; instance->FSOUND_Sample_SetMode = &FSOUND_Sample_SetMode; instance->FSOUND_Sample_SetLoopPoints = &FSOUND_Sample_SetLoopPoints; instance->FSOUND_Sample_SetDefaults = &FSOUND_Sample_SetDefaults; instance->FSOUND_Sample_SetDefaultsEx = &FSOUND_Sample_SetDefaultsEx; instance->FSOUND_Sample_SetMinMaxDistance = &FSOUND_Sample_SetMinMaxDistance; instance->FSOUND_Sample_SetMaxPlaybacks = &FSOUND_Sample_SetMaxPlaybacks; instance->FSOUND_Sample_Get = &FSOUND_Sample_Get; instance->FSOUND_Sample_GetName = &FSOUND_Sample_GetName; instance->FSOUND_Sample_GetLength = &FSOUND_Sample_GetLength; instance->FSOUND_Sample_GetLoopPoints = &FSOUND_Sample_GetLoopPoints; instance->FSOUND_Sample_GetDefaults = &FSOUND_Sample_GetDefaults; instance->FSOUND_Sample_GetDefaultsEx = &FSOUND_Sample_GetDefaultsEx; instance->FSOUND_Sample_GetMode = &FSOUND_Sample_GetMode; instance->FSOUND_Sample_GetMinMaxDistance = &FSOUND_Sample_GetMinMaxDistance; instance->FSOUND_PlaySound = &FSOUND_PlaySound; instance->FSOUND_PlaySoundEx = &FSOUND_PlaySoundEx; instance->FSOUND_StopSound = &FSOUND_StopSound; instance->FSOUND_SetFrequency = &FSOUND_SetFrequency; instance->FSOUND_SetVolume = &FSOUND_SetVolume; instance->FSOUND_SetVolumeAbsolute = &FSOUND_SetVolumeAbsolute; instance->FSOUND_SetPan = &FSOUND_SetPan; instance->FSOUND_SetSurround = &FSOUND_SetSurround; instance->FSOUND_SetMute = &FSOUND_SetMute; instance->FSOUND_SetPriority = &FSOUND_SetPriority; instance->FSOUND_SetReserved = &FSOUND_SetReserved; instance->FSOUND_SetPaused = &FSOUND_SetPaused; instance->FSOUND_SetLoopMode = &FSOUND_SetLoopMode; instance->FSOUND_SetCurrentPosition = &FSOUND_SetCurrentPosition; instance->FSOUND_3D_SetAttributes = &FSOUND_3D_SetAttributes; instance->FSOUND_3D_SetMinMaxDistance = &FSOUND_3D_SetMinMaxDistance; instance->FSOUND_IsPlaying = &FSOUND_IsPlaying; instance->FSOUND_GetFrequency = &FSOUND_GetFrequency; instance->FSOUND_GetVolume = &FSOUND_GetVolume; instance->FSOUND_GetAmplitude = &FSOUND_GetAmplitude; instance->FSOUND_GetPan = &FSOUND_GetPan; instance->FSOUND_GetSurround = &FSOUND_GetSurround; instance->FSOUND_GetMute = &FSOUND_GetMute; instance->FSOUND_GetPriority = &FSOUND_GetPriority; instance->FSOUND_GetReserved = &FSOUND_GetReserved; instance->FSOUND_GetPaused = &FSOUND_GetPaused; instance->FSOUND_GetLoopMode = &FSOUND_GetLoopMode; instance->FSOUND_GetCurrentPosition = &FSOUND_GetCurrentPosition; instance->FSOUND_GetCurrentSample = &FSOUND_GetCurrentSample; instance->FSOUND_GetCurrentLevels = &FSOUND_GetCurrentLevels; instance->FSOUND_GetNumSubChannels = &FSOUND_GetNumSubChannels; instance->FSOUND_GetSubChannel = &FSOUND_GetSubChannel; instance->FSOUND_3D_GetAttributes = &FSOUND_3D_GetAttributes; instance->FSOUND_3D_GetMinMaxDistance = &FSOUND_3D_GetMinMaxDistance; instance->FSOUND_3D_SetDopplerFactor = &FSOUND_3D_SetDopplerFactor; instance->FSOUND_3D_SetDistanceFactor = &FSOUND_3D_SetDistanceFactor; instance->FSOUND_3D_SetRolloffFactor = &FSOUND_3D_SetRolloffFactor; instance->FSOUND_3D_Listener_SetCurrent = &FSOUND_3D_Listener_SetCurrent; instance->FSOUND_3D_Listener_SetAttributes = &FSOUND_3D_Listener_SetAttributes; instance->FSOUND_3D_Listener_GetAttributes = &FSOUND_3D_Listener_GetAttributes; instance->FSOUND_FX_Enable = &FSOUND_FX_Enable; instance->FSOUND_FX_Disable = &FSOUND_FX_Disable; instance->FSOUND_FX_SetChorus = &FSOUND_FX_SetChorus; instance->FSOUND_FX_SetCompressor = &FSOUND_FX_SetCompressor; instance->FSOUND_FX_SetDistortion = &FSOUND_FX_SetDistortion; instance->FSOUND_FX_SetEcho = &FSOUND_FX_SetEcho; instance->FSOUND_FX_SetFlanger = &FSOUND_FX_SetFlanger; instance->FSOUND_FX_SetGargle = &FSOUND_FX_SetGargle; instance->FSOUND_FX_SetI3DL2Reverb = &FSOUND_FX_SetI3DL2Reverb; instance->FSOUND_FX_SetParamEQ = &FSOUND_FX_SetParamEQ; instance->FSOUND_FX_SetWavesReverb = &FSOUND_FX_SetWavesReverb; instance->FSOUND_Stream_SetBufferSize = &FSOUND_Stream_SetBufferSize; instance->FSOUND_Stream_Open = &FSOUND_Stream_Open; instance->FSOUND_Stream_Create = &FSOUND_Stream_Create; instance->FSOUND_Stream_Close = &FSOUND_Stream_Close; instance->FSOUND_Stream_Play = &FSOUND_Stream_Play; instance->FSOUND_Stream_PlayEx = &FSOUND_Stream_PlayEx; instance->FSOUND_Stream_Stop = &FSOUND_Stream_Stop; instance->FSOUND_Stream_SetPosition = &FSOUND_Stream_SetPosition; instance->FSOUND_Stream_GetPosition = &FSOUND_Stream_GetPosition; instance->FSOUND_Stream_SetTime = &FSOUND_Stream_SetTime; instance->FSOUND_Stream_GetTime = &FSOUND_Stream_GetTime; instance->FSOUND_Stream_GetLength = &FSOUND_Stream_GetLength; instance->FSOUND_Stream_GetLengthMs = &FSOUND_Stream_GetLengthMs; instance->FSOUND_Stream_SetMode = &FSOUND_Stream_SetMode; instance->FSOUND_Stream_GetMode = &FSOUND_Stream_GetMode; instance->FSOUND_Stream_SetLoopPoints = &FSOUND_Stream_SetLoopPoints; instance->FSOUND_Stream_SetLoopCount = &FSOUND_Stream_SetLoopCount; instance->FSOUND_Stream_GetOpenState = &FSOUND_Stream_GetOpenState; instance->FSOUND_Stream_GetSample = &FSOUND_Stream_GetSample; instance->FSOUND_Stream_CreateDSP = &FSOUND_Stream_CreateDSP; instance->FSOUND_Stream_SetEndCallback = &FSOUND_Stream_SetEndCallback; instance->FSOUND_Stream_SetSyncCallback = &FSOUND_Stream_SetSyncCallback; instance->FSOUND_Stream_AddSyncPoint = &FSOUND_Stream_AddSyncPoint; instance->FSOUND_Stream_DeleteSyncPoint = &FSOUND_Stream_DeleteSyncPoint; instance->FSOUND_Stream_GetNumSyncPoints = &FSOUND_Stream_GetNumSyncPoints; instance->FSOUND_Stream_GetSyncPoint = &FSOUND_Stream_GetSyncPoint; instance->FSOUND_Stream_GetSyncPointInfo = &FSOUND_Stream_GetSyncPointInfo; instance->FSOUND_Stream_SetSubStream = &FSOUND_Stream_SetSubStream; instance->FSOUND_Stream_GetNumSubStreams = &FSOUND_Stream_GetNumSubStreams; instance->FSOUND_Stream_SetSubStreamSentence = &FSOUND_Stream_SetSubStreamSentence; instance->FSOUND_Stream_GetNumTagFields = &FSOUND_Stream_GetNumTagFields; instance->FSOUND_Stream_GetTagField = &FSOUND_Stream_GetTagField; instance->FSOUND_Stream_FindTagField = &FSOUND_Stream_FindTagField; instance->FSOUND_Stream_Net_SetProxy = &FSOUND_Stream_Net_SetProxy; instance->FSOUND_Stream_Net_GetLastServerStatus = &FSOUND_Stream_Net_GetLastServerStatus; instance->FSOUND_Stream_Net_SetBufferProperties = &FSOUND_Stream_Net_SetBufferProperties; instance->FSOUND_Stream_Net_GetBufferProperties = &FSOUND_Stream_Net_GetBufferProperties; instance->FSOUND_Stream_Net_SetMetadataCallback = &FSOUND_Stream_Net_SetMetadataCallback; instance->FSOUND_Stream_Net_GetStatus = &FSOUND_Stream_Net_GetStatus; instance->FSOUND_CD_Play = &FSOUND_CD_Play; instance->FSOUND_CD_SetPlayMode = &FSOUND_CD_SetPlayMode; instance->FSOUND_CD_Stop = &FSOUND_CD_Stop; instance->FSOUND_CD_SetPaused = &FSOUND_CD_SetPaused; instance->FSOUND_CD_SetVolume = &FSOUND_CD_SetVolume; instance->FSOUND_CD_SetTrackTime = &FSOUND_CD_SetTrackTime; // Not available on mac //instance->FSOUND_CD_OpenTray = &FSOUND_CD_OpenTray_noop; instance->FSOUND_CD_GetPaused = &FSOUND_CD_GetPaused; instance->FSOUND_CD_GetTrack = &FSOUND_CD_GetTrack; instance->FSOUND_CD_GetNumTracks = &FSOUND_CD_GetNumTracks; instance->FSOUND_CD_GetVolume = &FSOUND_CD_GetVolume; instance->FSOUND_CD_GetTrackLength = &FSOUND_CD_GetTrackLength; instance->FSOUND_CD_GetTrackTime = &FSOUND_CD_GetTrackTime; instance->FSOUND_DSP_Create = &FSOUND_DSP_Create; instance->FSOUND_DSP_Free = &FSOUND_DSP_Free; instance->FSOUND_DSP_SetPriority = &FSOUND_DSP_SetPriority; instance->FSOUND_DSP_GetPriority = &FSOUND_DSP_GetPriority; instance->FSOUND_DSP_SetActive = &FSOUND_DSP_SetActive; instance->FSOUND_DSP_GetActive = &FSOUND_DSP_GetActive; instance->FSOUND_DSP_GetClearUnit = &FSOUND_DSP_GetClearUnit; instance->FSOUND_DSP_GetSFXUnit = &FSOUND_DSP_GetSFXUnit; instance->FSOUND_DSP_GetMusicUnit = &FSOUND_DSP_GetMusicUnit; instance->FSOUND_DSP_GetFFTUnit = &FSOUND_DSP_GetFFTUnit; instance->FSOUND_DSP_GetClipAndCopyUnit = &FSOUND_DSP_GetClipAndCopyUnit; instance->FSOUND_DSP_MixBuffers = &FSOUND_DSP_MixBuffers; instance->FSOUND_DSP_ClearMixBuffer = &FSOUND_DSP_ClearMixBuffer; instance->FSOUND_DSP_GetBufferLength = &FSOUND_DSP_GetBufferLength; instance->FSOUND_DSP_GetBufferLengthTotal = &FSOUND_DSP_GetBufferLengthTotal; instance->FSOUND_DSP_GetSpectrum = &FSOUND_DSP_GetSpectrum; instance->FSOUND_Reverb_SetProperties = &FSOUND_Reverb_SetProperties; instance->FSOUND_Reverb_GetProperties = &FSOUND_Reverb_GetProperties; instance->FSOUND_Reverb_SetChannelProperties = &FSOUND_Reverb_SetChannelProperties; instance->FSOUND_Reverb_GetChannelProperties = &FSOUND_Reverb_GetChannelProperties; instance->FSOUND_Record_SetDriver = &FSOUND_Record_SetDriver; instance->FSOUND_Record_GetNumDrivers = &FSOUND_Record_GetNumDrivers; instance->FSOUND_Record_GetDriverName = &FSOUND_Record_GetDriverName; instance->FSOUND_Record_GetDriver = &FSOUND_Record_GetDriver; instance->FSOUND_Record_StartSample = &FSOUND_Record_StartSample; instance->FSOUND_Record_Stop = &FSOUND_Record_Stop; instance->FSOUND_Record_GetPosition = &FSOUND_Record_GetPosition; instance->FMUSIC_LoadSong = &FMUSIC_LoadSong; instance->FMUSIC_LoadSongEx = &FMUSIC_LoadSongEx; instance->FMUSIC_GetOpenState = &FMUSIC_GetOpenState; instance->FMUSIC_FreeSong = &FMUSIC_FreeSong; instance->FMUSIC_PlaySong = &FMUSIC_PlaySong; instance->FMUSIC_StopSong = &FMUSIC_StopSong; instance->FMUSIC_StopAllSongs = &FMUSIC_StopAllSongs; instance->FMUSIC_SetZxxCallback = &FMUSIC_SetZxxCallback; instance->FMUSIC_SetRowCallback = &FMUSIC_SetRowCallback; instance->FMUSIC_SetOrderCallback = &FMUSIC_SetOrderCallback; instance->FMUSIC_SetInstCallback = &FMUSIC_SetInstCallback; instance->FMUSIC_SetSample = &FMUSIC_SetSample; instance->FMUSIC_SetUserData = &FMUSIC_SetUserData; instance->FMUSIC_OptimizeChannels = &FMUSIC_OptimizeChannels; instance->FMUSIC_SetReverb = &FMUSIC_SetReverb; instance->FMUSIC_SetLooping = &FMUSIC_SetLooping; instance->FMUSIC_SetOrder = &FMUSIC_SetOrder; instance->FMUSIC_SetPaused = &FMUSIC_SetPaused; instance->FMUSIC_SetMasterVolume = &FMUSIC_SetMasterVolume; instance->FMUSIC_SetMasterSpeed = &FMUSIC_SetMasterSpeed; instance->FMUSIC_SetPanSeperation = &FMUSIC_SetPanSeperation; instance->FMUSIC_GetName = &FMUSIC_GetName; instance->FMUSIC_GetType = &FMUSIC_GetType; instance->FMUSIC_GetNumOrders = &FMUSIC_GetNumOrders; instance->FMUSIC_GetNumPatterns = &FMUSIC_GetNumPatterns; instance->FMUSIC_GetNumInstruments = &FMUSIC_GetNumInstruments; instance->FMUSIC_GetNumSamples = &FMUSIC_GetNumSamples; instance->FMUSIC_GetNumChannels = &FMUSIC_GetNumChannels; instance->FMUSIC_GetSample = &FMUSIC_GetSample; instance->FMUSIC_GetPatternLength = &FMUSIC_GetPatternLength; instance->FMUSIC_IsFinished = &FMUSIC_IsFinished; instance->FMUSIC_IsPlaying = &FMUSIC_IsPlaying; instance->FMUSIC_GetMasterVolume = &FMUSIC_GetMasterVolume; instance->FMUSIC_GetGlobalVolume = &FMUSIC_GetGlobalVolume; instance->FMUSIC_GetOrder = &FMUSIC_GetOrder; instance->FMUSIC_GetPattern = &FMUSIC_GetPattern; instance->FMUSIC_GetSpeed = &FMUSIC_GetSpeed; instance->FMUSIC_GetBPM = &FMUSIC_GetBPM; instance->FMUSIC_GetRow = &FMUSIC_GetRow; instance->FMUSIC_GetPaused = &FMUSIC_GetPaused; instance->FMUSIC_GetTime = &FMUSIC_GetTime; instance->FMUSIC_GetRealChannel = &FMUSIC_GetRealChannel; instance->FMUSIC_GetUserData = &FMUSIC_GetUserData; } return instance; } static void FMOD_FreeInstance(FMOD_INSTANCE *instance) { if (instance) { free(instance); instance = NULL; } } #endif |
|
From: Brian M. <ma...@us...> - 2005-04-12 18:50:15
|
Update of /cvsroot/java-game-lib/LWJGL/src/native/common/fmod3 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14733 Added Files: Makefile.macosx Log Message: Makefile for mac fmod --- NEW FILE: Makefile.macosx --- CC=gcc LINKER=gcc STRIP=strip CFLAGS_LINK=-dynamiclib -framework JavaVM -framework Carbon STATIC_LIBS=${FMOD}/api/lib/libfmod.a CFLAGS_O=-fPIC -O2 -D_MACOSX -Wall -c -I.. -I${FMOD}/api/inc -I. -I/System/Library/Frameworks/JavaVM.framework/Versions/A/Headers SRC=$(wildcard *.c) ../common_tools.c OBJECTS=$(subst .c,.o,$(SRC)) LIBRARY=liblwjgl-fmod3.jnilib $(LIBRARY): $(OBJECTS) $(LINKER) $(CFLAGS_LINK) -o $@ $(OBJECTS) $(STATIC_LIBS) $(STRIP) -S -X $@ .c.o: $(CC) $(CFLAGS_O) $< -o $@ clean: rm -f $(OBJECTS) $(LIBRARY) |
|
From: Brian M. <ma...@us...> - 2005-04-12 18:48:50
|
Update of /cvsroot/java-game-lib/LWJGL/src/native/common/fmod3 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14045 Modified Files: org_lwjgl_fmod3_FSound.c Log Message: don't call OpenTray on mac Index: org_lwjgl_fmod3_FSound.c =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/fmod3/org_lwjgl_fmod3_FSound.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- org_lwjgl_fmod3_FSound.c 14 Nov 2004 10:42:18 -0000 1.7 +++ org_lwjgl_fmod3_FSound.c 12 Apr 2005 18:48:40 -0000 1.8 @@ -1391,7 +1391,11 @@ * Signature: (C)Z */ JNIEXPORT jboolean JNICALL Java_org_lwjgl_fmod3_FSound_FSOUND_1CD_1OpenTray(JNIEnv * env, jclass clazz, jchar drive, jboolean open) { +#ifdef _MACOSX + return false; +#else return fmod_instance->FSOUND_CD_OpenTray(drive, open); +#endif } /* |
|
From: Elias N. <eli...@us...> - 2005-04-12 12:05:08
|
Update of /cvsroot/java-game-lib/LWJGL/src/native/win32 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9564/src/native/win32 Modified Files: org_lwjgl_input_Mouse.c Log Message: Win32: Implemented Mouse.setCursorPosition() Index: org_lwjgl_input_Mouse.c =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/win32/org_lwjgl_input_Mouse.c,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- org_lwjgl_input_Mouse.c 12 Apr 2005 09:53:18 -0000 1.11 +++ org_lwjgl_input_Mouse.c 12 Apr 2005 12:04:36 -0000 1.12 @@ -352,6 +352,20 @@ UpdateMouseFields(env, coord_buffer_obj, button_buffer_obj); } +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_Win32Display_setCursorPosition +(JNIEnv * env, jobject self, jint x, jint y) { + int transformed_x, transformed_y; + RECT window_rect; + if (!GetWindowRect(getCurrentHWND(), &window_rect)) { + printfDebugJava(env, "GetWindowRect failed"); + return; + } + transformed_x = window_rect.left + x; + transformed_y = window_rect.bottom - y; + if (!SetCursorPos(transformed_x, transformed_y)) + printfDebugJava(env, "SetCursorPos failed"); +} + JNIEXPORT void JNICALL Java_org_lwjgl_opengl_Win32Display_grabMouse (JNIEnv * env, jobject self, jboolean grab) { HRESULT di_res; |
|
From: Elias N. <eli...@us...> - 2005-04-12 11:57:27
|
Update of /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/input In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5484/src/java/org/lwjgl/input Modified Files: Mouse.java Log Message: Index: Mouse.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/input/Mouse.java,v retrieving revision 1.77 retrieving revision 1.78 diff -u -d -r1.77 -r1.78 --- Mouse.java 12 Apr 2005 11:45:05 -0000 1.77 +++ Mouse.java 12 Apr 2005 11:56:59 -0000 1.78 @@ -185,6 +185,10 @@ public static void setCursorPosition(int x, int y) { if ((Cursor.getCapabilities() & Cursor.CURSOR_ONE_BIT_TRANSPARENCY) == 0) throw new IllegalStateException("Mouse doesn't support native cursors"); + if (isGrabbed()) + throw new IllegalStateException("Cursor is grabbed"); + if (!isCreated()) + throw new IllegalStateException("Mouse is not created"); Display.getImplementation().setCursorPosition(x, y); } @@ -211,6 +215,7 @@ x = width / 2; y = height / 2; readBuffer.clear(); + if (!isGrabbed() && (Cursor.getCapabilities() & Cursor.CURSOR_ONE_BIT_TRANSPARENCY) != 0) setCursorPosition(x, y); } |
|
From: Elias N. <eli...@us...> - 2005-04-12 11:45:16
|
Update of /cvsroot/java-game-lib/LWJGL/src/native/linux In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31729/src/native/linux Modified Files: org_lwjgl_input_Mouse.c Log Message: Added Mouse.setCursorPosition(x, y) Index: org_lwjgl_input_Mouse.c =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/linux/org_lwjgl_input_Mouse.c,v retrieving revision 1.34 retrieving revision 1.35 diff -u -d -r1.34 -r1.35 --- org_lwjgl_input_Mouse.c 20 Feb 2005 11:24:22 -0000 1.34 +++ org_lwjgl_input_Mouse.c 12 Apr 2005 11:45:06 -0000 1.35 @@ -342,6 +342,17 @@ return copyEvents(&event_queue, buffer_ptr + buffer_position, buffer_size); } +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_LinuxDisplay_nSetCursorPosition(JNIEnv * env, jclass clazz, jint x, jint y) { + XWindowAttributes attributes; + if (!XGetWindowAttributes(getDisplay(), getCurrentWindow(), &attributes)) { + printfDebugJava(env, "XGetWindowAttributes failed"); + return; + } + int transformed_x = attributes.x + x; + int transformed_y = attributes.y + transformY(y); + XWarpPointer(getDisplay(), None, getCurrentWindow(), 0, 0, 0, 0, transformed_x, transformed_y); +} + JNIEXPORT void JNICALL Java_org_lwjgl_opengl_LinuxDisplay_nGrabMouse(JNIEnv * env, jclass clazz, jboolean new_grab) { Window root_return, child_return; int root_x, root_y, win_x, win_y; |
|
From: Elias N. <eli...@us...> - 2005-04-12 11:45:16
|
Update of /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/input In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31729/src/java/org/lwjgl/input Modified Files: Mouse.java Log Message: Added Mouse.setCursorPosition(x, y) Index: Mouse.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/input/Mouse.java,v retrieving revision 1.76 retrieving revision 1.77 diff -u -d -r1.76 -r1.77 --- Mouse.java 9 Apr 2005 17:35:37 -0000 1.76 +++ Mouse.java 12 Apr 2005 11:45:05 -0000 1.77 @@ -152,10 +152,6 @@ * * NOTE: The native cursor is not constrained to the window, but * relative events will not be generated if the cursor is outside. - * The initial position of the cursor is the middle of the window, - * that is, {window_width/2, window_height/2}. - * The cursor will be moved to this origin when a - * native cursor is set and the previous cursor is null. * * @param cursor the native cursor object to bind. May be null. * @return The previous Cursor object set, or null. @@ -178,6 +174,21 @@ } /** + * Set the position of the native cursor. This method is only valid when + * the cursor is not grabbed and native cursors are supported. + * + * @param x The x coordinate of the new cursor position in OpenGL coordinates relative + * to the window origin. + * @param y The y coordinate of the new cursor position in OpenGL coordinates relative + * to the window origin. + */ + public static void setCursorPosition(int x, int y) { + if ((Cursor.getCapabilities() & Cursor.CURSOR_ONE_BIT_TRANSPARENCY) == 0) + throw new IllegalStateException("Mouse doesn't support native cursors"); + Display.getImplementation().setCursorPosition(x, y); + } + + /** * Static initialization */ private static void initialize() { @@ -200,6 +211,7 @@ x = width / 2; y = height / 2; readBuffer.clear(); + setCursorPosition(x, y); } /** |
|
From: Elias N. <eli...@us...> - 2005-04-12 11:45:16
|
Update of /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31729/src/java/org/lwjgl/opengl Modified Files: DisplayImplementation.java LinuxDisplay.java MacOSXDisplay.java Win32Display.java Log Message: Added Mouse.setCursorPosition(x, y) Index: Win32Display.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/Win32Display.java,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- Win32Display.java 29 Mar 2005 18:09:30 -0000 1.16 +++ Win32Display.java 12 Apr 2005 11:45:06 -0000 1.17 @@ -106,6 +106,7 @@ return Cursor.CURSOR_ONE_BIT_TRANSPARENCY; } + public native void setCursorPosition(int x, int y); public native void setNativeCursor(Object handle) throws LWJGLException; public native int getMinCursorSize(); public native int getMaxCursorSize(); Index: DisplayImplementation.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/DisplayImplementation.java,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- DisplayImplementation.java 23 Feb 2005 11:11:07 -0000 1.11 +++ DisplayImplementation.java 12 Apr 2005 11:45:06 -0000 1.12 @@ -162,6 +162,9 @@ */ int getNativeCursorCapabilities(); + /** Method to set the native cursor position */ + void setCursorPosition(int x, int y); + /** Method to set the native cursor */ void setNativeCursor(Object handle) throws LWJGLException; Index: MacOSXDisplay.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/MacOSXDisplay.java,v retrieving revision 1.26 retrieving revision 1.27 diff -u -d -r1.26 -r1.27 --- MacOSXDisplay.java 29 Mar 2005 18:09:30 -0000 1.26 +++ MacOSXDisplay.java 12 Apr 2005 11:45:06 -0000 1.27 @@ -306,6 +306,10 @@ return 0; } + public void setCursorPosition(int x, int y) { + throw new UnsupportedOperationException(); + } + public void setNativeCursor(Object handle) throws LWJGLException { Cursor awt_cursor = (Cursor)handle; frame.setCursor(awt_cursor); Index: LinuxDisplay.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/LinuxDisplay.java,v retrieving revision 1.22 retrieving revision 1.23 diff -u -d -r1.22 -r1.23 --- LinuxDisplay.java 29 Mar 2005 18:09:30 -0000 1.22 +++ LinuxDisplay.java 12 Apr 2005 11:45:06 -0000 1.23 @@ -268,6 +268,13 @@ } private static native int nReadMouse(IntBuffer buffer, int buffer_position); + public void setCursorPosition(int x, int y) { + lockAWT(); + nSetCursorPosition(x, y); + unlockAWT(); + } + private native void nSetCursorPosition(int x, int y); + public void grabMouse(boolean grab) { lockAWT(); nGrabMouse(grab); |
|
From: Elias N. <eli...@us...> - 2005-04-12 10:55:34
|
Update of /cvsroot/java-game-lib/LWJGL/src/native/common In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7405/src/native/common Modified Files: org_lwjgl_openal_AL.c org_lwjgl_openal_AL10.c org_lwjgl_openal_ALC.c Removed Files: checkALerror.h Log Message: Moved ALC error check to java. Fix linux type cast warnings Index: org_lwjgl_openal_AL10.c =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/org_lwjgl_openal_AL10.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- org_lwjgl_openal_AL10.c 15 Feb 2005 11:05:14 -0000 1.6 +++ org_lwjgl_openal_AL10.c 12 Apr 2005 10:55:23 -0000 1.7 @@ -1,7 +1,6 @@ /* MACHINE GENERATED FILE, DO NOT EDIT */ #include <jni.h> -#include "checkALerror.h" #include "extal.h" typedef ALvoid (ALAPIENTRY *alDopplerVelocityPROC) (ALfloat value); Index: org_lwjgl_openal_AL.c =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/org_lwjgl_openal_AL.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- org_lwjgl_openal_AL.c 10 Sep 2004 08:13:48 -0000 1.1 +++ org_lwjgl_openal_AL.c 12 Apr 2005 10:55:23 -0000 1.2 @@ -33,7 +33,6 @@ #include "org_lwjgl_openal_AL.h" /* OpenAL includes */ -#include "checkALerror.h" #include "extal.h" JNIEXPORT void JNICALL Java_org_lwjgl_openal_AL_nCreate (JNIEnv *env, jclass clazz, jobjectArray oalPaths) { --- checkALerror.h DELETED --- Index: org_lwjgl_openal_ALC.c =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/org_lwjgl_openal_ALC.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- org_lwjgl_openal_ALC.c 12 Apr 2005 10:30:05 -0000 1.7 +++ org_lwjgl_openal_ALC.c 12 Apr 2005 10:55:23 -0000 1.8 @@ -40,7 +40,6 @@ */ /* OpenAL includes */ -#include "checkALerror.h" #include "extal.h" //alc @@ -82,7 +81,7 @@ * ALubyte * alcGetString(ALCdevice *device, ALenum token); */ static jstring JNICALL Java_org_lwjgl_openal_ALC_nalcGetString (JNIEnv *env, jclass clazz, jlong deviceaddress, jint token) { - const char* alcString = (const char*) alcGetString((ALCdevice*) deviceaddress, (ALenum) token); + const char* alcString = (const char*) alcGetString((ALCdevice*)((intptr_t)deviceaddress), (ALenum) token); jstring string; if(alcString == NULL) { @@ -91,7 +90,6 @@ string = NewStringNative(env, alcString); - CHECK_ALC_ERROR return string; } @@ -102,12 +100,11 @@ * ALvoid alcGetIntegerv(ALCdevice *device, ALenum token, ALsizei size, ALint *dest); */ static void JNICALL Java_org_lwjgl_openal_ALC_nalcGetIntegerv (JNIEnv *env, jclass clazz, jlong deviceaddress, jint token, jint size, jobject dest, jint offset) { - ALint* address = NULL; - if (dest != NULL) { - address = offset + (ALint*) (*env)->GetDirectBufferAddress(env, dest); - } - alcGetIntegerv((ALCdevice*) deviceaddress, (ALenum) token, (ALsizei) size, address); - CHECK_ALC_ERROR + ALint* address = NULL; + if (dest != NULL) { + address = offset + (ALint*) (*env)->GetDirectBufferAddress(env, dest); + } + alcGetIntegerv((ALCdevice*)((intptr_t)deviceaddress), (ALenum) token, (ALsizei) size, address); } /** @@ -146,7 +143,7 @@ alcDevice_method = (*env)->GetMethodID(env, alcDevice_class, "<init>", "(J)V"); /* create instance */ - alcDevice_object = (*env)->NewObject(env, alcDevice_class, alcDevice_method, (jlong) device); + alcDevice_object = (*env)->NewObject(env, alcDevice_class, alcDevice_method, (jlong)((intptr_t)device)); /* clean up */ if (tokenstring != NULL) @@ -162,7 +159,7 @@ * void alcCloseDevice( ALCdevice *dev ); */ static void JNICALL Java_org_lwjgl_openal_ALC_alcCloseDevice (JNIEnv *env, jclass clazz, jlong deviceaddress) { - alcCloseDevice((ALCdevice*) deviceaddress); + alcCloseDevice((ALCdevice*)((intptr_t)deviceaddress)); } /** @@ -171,7 +168,7 @@ * C Specification: * ALCcontext* alcCreateContext( ALCdevice *dev, ALint* attrlist ); */ -static jobject JNICALL Java_org_lwjgl_openal_ALC_alcCreateContext (JNIEnv *env, jclass clazz, jlong deviceaddress, jobject attrlist) { +static jobject JNICALL Java_org_lwjgl_openal_ALC_nalcCreateContext (JNIEnv *env, jclass clazz, jlong deviceaddress, jobject attrlist) { ALint* address = NULL; ALCcontext* context; /* get ready to create ALCcontext instance */ @@ -182,7 +179,7 @@ if (attrlist != NULL) { address = (ALint*) (*env)->GetDirectBufferAddress(env, attrlist); } - context = alcCreateContext((ALCdevice*) deviceaddress, address); + context = alcCreateContext((ALCdevice*)((intptr_t)deviceaddress), address); /* if error - get out */ if(context == NULL) { @@ -194,9 +191,8 @@ alcContext_method = (*env)->GetMethodID(env, alcContext_class, "<init>", "(J)V"); /* create instance */ - alcContext_object = (*env)->NewObject(env, alcContext_class, alcContext_method, (jlong)context); + alcContext_object = (*env)->NewObject(env, alcContext_class, alcContext_method, (jlong)((intptr_t)context)); - CHECK_ALC_ERROR return alcContext_object; } @@ -207,7 +203,7 @@ * ALCboolean alcMakeContextCurrent(ALCcontext *context); */ static jint JNICALL Java_org_lwjgl_openal_ALC_alcMakeContextCurrent (JNIEnv *env, jclass clazz, jlong contextaddress) { - ALCcontext* context = (ALCcontext*) contextaddress; + ALCcontext* context = (ALCcontext*)((intptr_t)contextaddress); ALCenum result; if(context == NULL) { result = alcMakeContextCurrent(NULL); @@ -224,7 +220,7 @@ * void alcProcessContext(ALCcontext *context); */ static void JNICALL Java_org_lwjgl_openal_ALC_nalcProcessContext (JNIEnv *env, jclass clazz, jlong contextaddress) { - alcProcessContext((ALCcontext*) contextaddress); + alcProcessContext((ALCcontext*)((intptr_t)contextaddress)); } /** @@ -249,7 +245,7 @@ alcContext_method = (*env)->GetMethodID(env, alcContext_class, "<init>", "(J)V"); /* create instance */ - alcContext_object = (*env)->NewObject(env, alcContext_class, alcContext_method, (jlong) context); + alcContext_object = (*env)->NewObject(env, alcContext_class, alcContext_method, (jlong)((intptr_t)context)); return alcContext_object; } @@ -261,8 +257,7 @@ * ALCdevice* alcGetContextsDevice(ALCcontext *context); */ static jobject JNICALL Java_org_lwjgl_openal_ALC_alcGetContextsDevice (JNIEnv *env, jclass clazz, jlong contextaddress) { - - ALCdevice* device = alcGetContextsDevice((ALCcontext*) contextaddress); + ALCdevice* device = alcGetContextsDevice((ALCcontext*)((intptr_t)contextaddress)); /* get ready to create ALCdevice instance */ jobject alcDevice_object = NULL; jclass alcDevice_class = NULL; @@ -277,7 +272,7 @@ alcDevice_method = (*env)->GetMethodID(env, alcDevice_class, "<init>", "(J)V"); /* create instance */ - alcDevice_object = (*env)->NewObject(env, alcDevice_class, alcDevice_method, (jlong) device); + alcDevice_object = (*env)->NewObject(env, alcDevice_class, alcDevice_method, (jlong)((intptr_t)device)); return alcDevice_object; } @@ -289,7 +284,7 @@ * void alcSuspendContext(ALCcontext *context); */ static void JNICALL Java_org_lwjgl_openal_ALC_nalcSuspendContext (JNIEnv *env, jclass clazz, jlong contextaddress) { - alcSuspendContext((ALCcontext*) contextaddress); + alcSuspendContext((ALCcontext*)((intptr_t)contextaddress)); } /** @@ -299,7 +294,7 @@ * void alcDestroyContext(ALCcontext *context); */ static void JNICALL Java_org_lwjgl_openal_ALC_alcDestroyContext (JNIEnv *env, jclass clazz, jlong contextaddress) { - alcDestroyContext((ALCcontext*) contextaddress); + alcDestroyContext((ALCcontext*)((intptr_t)contextaddress)); } /** @@ -309,8 +304,7 @@ * ALCenum alcGetError(ALCdevice *device); */ static jint JNICALL Java_org_lwjgl_openal_ALC_nalcGetError (JNIEnv *env, jclass clazz, jlong deviceaddress) { - jint result = alcGetError((ALCdevice*) deviceaddress); - CHECK_ALC_ERROR + jint result = alcGetError((ALCdevice*)((intptr_t)deviceaddress)); return result; } @@ -324,11 +318,10 @@ /* get extension */ ALubyte* functionname = (ALubyte*) GetStringNativeChars(env, extName); - jboolean result = (jboolean) alcIsExtensionPresent((ALCdevice*) deviceaddress, functionname); + jboolean result = (jboolean) alcIsExtensionPresent((ALCdevice*)((intptr_t)deviceaddress), functionname); free(functionname); - CHECK_ALC_ERROR return result; } @@ -342,11 +335,10 @@ /* get extension */ ALubyte* enumerationname = (ALubyte*) GetStringNativeChars(env, enumName); - jint result = (jint) alcGetEnumValue((ALCdevice*) deviceaddress, enumerationname); + jint result = (jint) alcGetEnumValue((ALCdevice*)((intptr_t)deviceaddress), enumerationname); free(enumerationname); - CHECK_ALC_ERROR return result; } @@ -364,7 +356,7 @@ {"nalcGetIntegerv", "(JIILjava/nio/Buffer;I)V", (void*)&Java_org_lwjgl_openal_ALC_nalcGetIntegerv, "alcGetIntegerv", (void*)&alcGetIntegerv}, {"alcOpenDevice", "(Ljava/lang/String;)Lorg/lwjgl/openal/ALCdevice;", (void*)&Java_org_lwjgl_openal_ALC_alcOpenDevice, "alcOpenDevice", (void*)&alcOpenDevice}, {"alcCloseDevice", "(J)V", (void*)&Java_org_lwjgl_openal_ALC_alcCloseDevice, "alcCloseDevice", (void*)&alcCloseDevice}, - {"alcCreateContext", "(JLjava/nio/IntBuffer;)Lorg/lwjgl/openal/ALCcontext;", (void*)&Java_org_lwjgl_openal_ALC_alcCreateContext, "alcCreateContext", (void*)&alcCreateContext}, + {"nalcCreateContext", "(JLjava/nio/IntBuffer;)Lorg/lwjgl/openal/ALCcontext;", (void*)&Java_org_lwjgl_openal_ALC_nalcCreateContext, "alcCreateContext", (void*)&alcCreateContext}, {"alcMakeContextCurrent", "(J)I", (void*)&Java_org_lwjgl_openal_ALC_alcMakeContextCurrent, "alcMakeContextCurrent", (void*)&alcMakeContextCurrent}, {"nalcProcessContext", "(J)V", (void*)&Java_org_lwjgl_openal_ALC_nalcProcessContext, "alcProcessContext", (void*)&alcProcessContext}, {"alcGetCurrentContext", "()Lorg/lwjgl/openal/ALCcontext;", (void*)&Java_org_lwjgl_openal_ALC_alcGetCurrentContext, "alcGetCurrentContext", (void*)&alcGetCurrentContext}, |
|
From: Elias N. <eli...@us...> - 2005-04-12 10:55:32
|
Update of /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/openal In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7405/src/java/org/lwjgl/openal Modified Files: ALC.java Util.java Log Message: Moved ALC error check to java. Fix linux type cast warnings Index: Util.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/openal/Util.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- Util.java 15 Feb 2005 11:05:00 -0000 1.1 +++ Util.java 12 Apr 2005 10:55:22 -0000 1.2 @@ -47,6 +47,12 @@ private Util() { } + public static void checkALCError() { + int err = ALC.alcGetError(); + if (err != ALC.ALC_NO_ERROR) + throw new OpenALException(ALC.alcGetString(err)); + } + public static void checkALError() { int err = AL10.alGetError(); if (err != AL10.AL_NO_ERROR) Index: ALC.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/openal/ALC.java,v retrieving revision 1.26 retrieving revision 1.27 diff -u -d -r1.26 -r1.27 --- ALC.java 12 Apr 2005 10:30:03 -0000 1.26 +++ ALC.java 12 Apr 2005 10:55:22 -0000 1.27 @@ -164,10 +164,11 @@ * @return String property from device */ public static String alcGetString(int pname) { - return nalcGetString(AL.device.device, pname); + String result = nalcGetString(AL.device.device, pname); + Util.checkALCError(); + return result; } - - native static String nalcGetString(long device, int pname); + private native static String nalcGetString(long device, int pname); /** * The application can query ALC for information using an integer query function. @@ -192,9 +193,9 @@ public static void alcGetInteger(int pname, IntBuffer integerdata) { BufferChecks.checkDirect(integerdata); nalcGetIntegerv(AL.device.device, pname, integerdata.remaining(), integerdata, integerdata.position()); + Util.checkALCError(); } - - native static void nalcGetIntegerv(long device, int pname, int size, Buffer integerdata, int offset); + private native static void nalcGetIntegerv(long device, int pname, int size, Buffer integerdata, int offset); /** * The <code>alcOpenDevice</code> function allows the application (i.e. the client program) to @@ -236,7 +237,12 @@ * @param attrList Buffer to read attributes from * @return New context, or null if creation failed */ - native static ALCcontext alcCreateContext(long device, IntBuffer attrList); + static ALCcontext alcCreateContext(long device, IntBuffer attrList) { + ALCcontext result = nalcCreateContext(device, attrList); + Util.checkALCError(); + return result; + } + private native static ALCcontext nalcCreateContext(long device, IntBuffer attrList); /** * To make a Context current with respect to AL Operation (state changes by issueing @@ -268,8 +274,7 @@ public static void alcProcessContext() { nalcProcessContext(AL.context.context); } - - native static void nalcProcessContext(long context); + private native static void nalcProcessContext(long context); /** * The application can query for, and obtain an handle to, the current context for the @@ -299,10 +304,10 @@ * * @param context address of context to suspend */ - public static void alcSuspendContext() { - nalcSuspendContext(AL.context.context); - } - native static void nalcSuspendContext(long context); + public static void alcSuspendContext() { + nalcSuspendContext(AL.context.context); + } + private native static void nalcSuspendContext(long context); /** * The correct way to destroy a context is to first release it using <code>alcMakeCurrent</code> and @@ -330,8 +335,7 @@ public static int alcGetError() { return nalcGetError(AL.device.device); } - - native static int nalcGetError(long device); + private native static int nalcGetError(long device); /** * Verify that a given extension is available for the current context and the device it @@ -343,10 +347,11 @@ * @return true if extension is available, false if not */ public static boolean alcIsExtensionPresent(String extName) { - return nalcIsExtensionPresent(AL.device.device, extName); + boolean result = nalcIsExtensionPresent(AL.device.device, extName); + Util.checkALCError(); + return result; } - - native static boolean nalcIsExtensionPresent(long device, String extName); + private native static boolean nalcIsExtensionPresent(long device, String extName); /** * Enumeration/token values are device independend, but tokens defined for @@ -359,8 +364,9 @@ * @return value of enumeration */ public static int alcGetEnumValue(String enumName) { - return nalcGetEnumValue(AL.device.device, enumName); + int result = nalcGetEnumValue(AL.device.device, enumName); + Util.checkALCError(); + return result; } - - native static int nalcGetEnumValue(long device, String enumName); + private native static int nalcGetEnumValue(long device, String enumName); } |
|
From: Elias N. <eli...@us...> - 2005-04-12 10:30:20
|
Update of /cvsroot/java-game-lib/LWJGL/src/native/common In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27429/src/native/common Modified Files: org_lwjgl_openal_ALC.c Log Message: Converted ALC pointers from int to long Index: org_lwjgl_openal_ALC.c =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/org_lwjgl_openal_ALC.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- org_lwjgl_openal_ALC.c 28 Jan 2005 21:02:48 -0000 1.6 +++ org_lwjgl_openal_ALC.c 12 Apr 2005 10:30:05 -0000 1.7 @@ -81,7 +81,7 @@ * C Specification: * ALubyte * alcGetString(ALCdevice *device, ALenum token); */ -static jstring JNICALL Java_org_lwjgl_openal_ALC_nalcGetString (JNIEnv *env, jclass clazz, jint deviceaddress, jint token) { +static jstring JNICALL Java_org_lwjgl_openal_ALC_nalcGetString (JNIEnv *env, jclass clazz, jlong deviceaddress, jint token) { const char* alcString = (const char*) alcGetString((ALCdevice*) deviceaddress, (ALenum) token); jstring string; @@ -101,7 +101,7 @@ * C Specification: * ALvoid alcGetIntegerv(ALCdevice *device, ALenum token, ALsizei size, ALint *dest); */ -static void JNICALL Java_org_lwjgl_openal_ALC_nalcGetIntegerv (JNIEnv *env, jclass clazz, jint deviceaddress, jint token, jint size, jobject dest, jint offset) { +static void JNICALL Java_org_lwjgl_openal_ALC_nalcGetIntegerv (JNIEnv *env, jclass clazz, jlong deviceaddress, jint token, jint size, jobject dest, jint offset) { ALint* address = NULL; if (dest != NULL) { address = offset + (ALint*) (*env)->GetDirectBufferAddress(env, dest); @@ -143,10 +143,10 @@ /* find class and constructor */ alcDevice_class = (*env)->FindClass(env, "org/lwjgl/openal/ALCdevice"); - alcDevice_method = (*env)->GetMethodID(env, alcDevice_class, "<init>", "(I)V"); + alcDevice_method = (*env)->GetMethodID(env, alcDevice_class, "<init>", "(J)V"); /* create instance */ - alcDevice_object = (*env)->NewObject(env, alcDevice_class, alcDevice_method, (int) device); + alcDevice_object = (*env)->NewObject(env, alcDevice_class, alcDevice_method, (jlong) device); /* clean up */ if (tokenstring != NULL) @@ -161,7 +161,7 @@ * C Specification: * void alcCloseDevice( ALCdevice *dev ); */ -static void JNICALL Java_org_lwjgl_openal_ALC_alcCloseDevice (JNIEnv *env, jclass clazz, jint deviceaddress) { +static void JNICALL Java_org_lwjgl_openal_ALC_alcCloseDevice (JNIEnv *env, jclass clazz, jlong deviceaddress) { alcCloseDevice((ALCdevice*) deviceaddress); } @@ -171,7 +171,7 @@ * C Specification: * ALCcontext* alcCreateContext( ALCdevice *dev, ALint* attrlist ); */ -static jobject JNICALL Java_org_lwjgl_openal_ALC_alcCreateContext (JNIEnv *env, jclass clazz, jint deviceaddress, jobject attrlist) { +static jobject JNICALL Java_org_lwjgl_openal_ALC_alcCreateContext (JNIEnv *env, jclass clazz, jlong deviceaddress, jobject attrlist) { ALint* address = NULL; ALCcontext* context; /* get ready to create ALCcontext instance */ @@ -191,10 +191,10 @@ /* find class and constructor */ alcContext_class = (*env)->FindClass(env, "org/lwjgl/openal/ALCcontext"); - alcContext_method = (*env)->GetMethodID(env, alcContext_class, "<init>", "(I)V"); + alcContext_method = (*env)->GetMethodID(env, alcContext_class, "<init>", "(J)V"); /* create instance */ - alcContext_object = (*env)->NewObject(env, alcContext_class, alcContext_method, (int) context); + alcContext_object = (*env)->NewObject(env, alcContext_class, alcContext_method, (jlong)context); CHECK_ALC_ERROR return alcContext_object; @@ -206,7 +206,7 @@ * C Specification: * ALCboolean alcMakeContextCurrent(ALCcontext *context); */ -static jint JNICALL Java_org_lwjgl_openal_ALC_alcMakeContextCurrent (JNIEnv *env, jclass clazz, jint contextaddress) { +static jint JNICALL Java_org_lwjgl_openal_ALC_alcMakeContextCurrent (JNIEnv *env, jclass clazz, jlong contextaddress) { ALCcontext* context = (ALCcontext*) contextaddress; ALCenum result; if(context == NULL) { @@ -223,7 +223,7 @@ * C Specification: * void alcProcessContext(ALCcontext *context); */ -static void JNICALL Java_org_lwjgl_openal_ALC_nalcProcessContext (JNIEnv *env, jclass clazz, jint contextaddress) { +static void JNICALL Java_org_lwjgl_openal_ALC_nalcProcessContext (JNIEnv *env, jclass clazz, jlong contextaddress) { alcProcessContext((ALCcontext*) contextaddress); } @@ -246,10 +246,10 @@ } /* find class and constructor */ alcContext_class = (*env)->FindClass(env, "org/lwjgl/openal/ALCcontext"); - alcContext_method = (*env)->GetMethodID(env, alcContext_class, "<init>", "(I)V"); + alcContext_method = (*env)->GetMethodID(env, alcContext_class, "<init>", "(J)V"); /* create instance */ - alcContext_object = (*env)->NewObject(env, alcContext_class, alcContext_method, (int) context); + alcContext_object = (*env)->NewObject(env, alcContext_class, alcContext_method, (jlong) context); return alcContext_object; } @@ -260,7 +260,7 @@ * C Specification: * ALCdevice* alcGetContextsDevice(ALCcontext *context); */ -static jobject JNICALL Java_org_lwjgl_openal_ALC_alcGetContextsDevice (JNIEnv *env, jclass clazz, jint contextaddress) { +static jobject JNICALL Java_org_lwjgl_openal_ALC_alcGetContextsDevice (JNIEnv *env, jclass clazz, jlong contextaddress) { ALCdevice* device = alcGetContextsDevice((ALCcontext*) contextaddress); /* get ready to create ALCdevice instance */ @@ -274,10 +274,10 @@ /* find class and constructor */ alcDevice_class = (*env)->FindClass(env, "org/lwjgl/openal/ALCdevice"); - alcDevice_method = (*env)->GetMethodID(env, alcDevice_class, "<init>", "(I)V"); + alcDevice_method = (*env)->GetMethodID(env, alcDevice_class, "<init>", "(J)V"); /* create instance */ - alcDevice_object = (*env)->NewObject(env, alcDevice_class, alcDevice_method, (int) device); + alcDevice_object = (*env)->NewObject(env, alcDevice_class, alcDevice_method, (jlong) device); return alcDevice_object; } @@ -288,7 +288,7 @@ * C Specification: * void alcSuspendContext(ALCcontext *context); */ -static void JNICALL Java_org_lwjgl_openal_ALC_nalcSuspendContext (JNIEnv *env, jclass clazz, jint contextaddress) { +static void JNICALL Java_org_lwjgl_openal_ALC_nalcSuspendContext (JNIEnv *env, jclass clazz, jlong contextaddress) { alcSuspendContext((ALCcontext*) contextaddress); } @@ -298,7 +298,7 @@ * C Specification: * void alcDestroyContext(ALCcontext *context); */ -static void JNICALL Java_org_lwjgl_openal_ALC_alcDestroyContext (JNIEnv *env, jclass clazz, jint contextaddress) { +static void JNICALL Java_org_lwjgl_openal_ALC_alcDestroyContext (JNIEnv *env, jclass clazz, jlong contextaddress) { alcDestroyContext((ALCcontext*) contextaddress); } @@ -308,7 +308,7 @@ * C Specification: * ALCenum alcGetError(ALCdevice *device); */ -static jint JNICALL Java_org_lwjgl_openal_ALC_nalcGetError (JNIEnv *env, jclass clazz, jint deviceaddress) { +static jint JNICALL Java_org_lwjgl_openal_ALC_nalcGetError (JNIEnv *env, jclass clazz, jlong deviceaddress) { jint result = alcGetError((ALCdevice*) deviceaddress); CHECK_ALC_ERROR return result; @@ -320,7 +320,7 @@ * C Specification: * ALboolean alcIsExtensionPresent(ALCdevice *device, ALubyte *extName); */ -static jboolean JNICALL Java_org_lwjgl_openal_ALC_nalcIsExtensionPresent (JNIEnv *env, jclass clazz, jint deviceaddress, jstring extName) { +static jboolean JNICALL Java_org_lwjgl_openal_ALC_nalcIsExtensionPresent (JNIEnv *env, jclass clazz, jlong deviceaddress, jstring extName) { /* get extension */ ALubyte* functionname = (ALubyte*) GetStringNativeChars(env, extName); @@ -338,7 +338,7 @@ * C Specification: * ALenum alcGetEnumValue(ALCdevice *device, ALubyte *enumName); */ -static jint JNICALL Java_org_lwjgl_openal_ALC_nalcGetEnumValue (JNIEnv *env, jclass clazz, jint deviceaddress, jstring enumName) { +static jint JNICALL Java_org_lwjgl_openal_ALC_nalcGetEnumValue (JNIEnv *env, jclass clazz, jlong deviceaddress, jstring enumName) { /* get extension */ ALubyte* enumerationname = (ALubyte*) GetStringNativeChars(env, enumName); @@ -360,20 +360,20 @@ #endif JNIEXPORT void JNICALL Java_org_lwjgl_openal_ALC_initNativeStubs(JNIEnv *env, jclass clazz) { JavaMethodAndExtFunction functions[] = { - {"nalcGetString", "(II)Ljava/lang/String;", (void*)&Java_org_lwjgl_openal_ALC_nalcGetString, "alcGetString", (void*)&alcGetString}, - {"nalcGetIntegerv", "(IIILjava/nio/Buffer;I)V", (void*)&Java_org_lwjgl_openal_ALC_nalcGetIntegerv, "alcGetIntegerv", (void*)&alcGetIntegerv}, + {"nalcGetString", "(JI)Ljava/lang/String;", (void*)&Java_org_lwjgl_openal_ALC_nalcGetString, "alcGetString", (void*)&alcGetString}, + {"nalcGetIntegerv", "(JIILjava/nio/Buffer;I)V", (void*)&Java_org_lwjgl_openal_ALC_nalcGetIntegerv, "alcGetIntegerv", (void*)&alcGetIntegerv}, {"alcOpenDevice", "(Ljava/lang/String;)Lorg/lwjgl/openal/ALCdevice;", (void*)&Java_org_lwjgl_openal_ALC_alcOpenDevice, "alcOpenDevice", (void*)&alcOpenDevice}, - {"alcCloseDevice", "(I)V", (void*)&Java_org_lwjgl_openal_ALC_alcCloseDevice, "alcCloseDevice", (void*)&alcCloseDevice}, - {"alcCreateContext", "(ILjava/nio/IntBuffer;)Lorg/lwjgl/openal/ALCcontext;", (void*)&Java_org_lwjgl_openal_ALC_alcCreateContext, "alcCreateContext", (void*)&alcCreateContext}, - {"alcMakeContextCurrent", "(I)I", (void*)&Java_org_lwjgl_openal_ALC_alcMakeContextCurrent, "alcMakeContextCurrent", (void*)&alcMakeContextCurrent}, - {"nalcProcessContext", "(I)V", (void*)&Java_org_lwjgl_openal_ALC_nalcProcessContext, "alcProcessContext", (void*)&alcProcessContext}, + {"alcCloseDevice", "(J)V", (void*)&Java_org_lwjgl_openal_ALC_alcCloseDevice, "alcCloseDevice", (void*)&alcCloseDevice}, + {"alcCreateContext", "(JLjava/nio/IntBuffer;)Lorg/lwjgl/openal/ALCcontext;", (void*)&Java_org_lwjgl_openal_ALC_alcCreateContext, "alcCreateContext", (void*)&alcCreateContext}, + {"alcMakeContextCurrent", "(J)I", (void*)&Java_org_lwjgl_openal_ALC_alcMakeContextCurrent, "alcMakeContextCurrent", (void*)&alcMakeContextCurrent}, + {"nalcProcessContext", "(J)V", (void*)&Java_org_lwjgl_openal_ALC_nalcProcessContext, "alcProcessContext", (void*)&alcProcessContext}, {"alcGetCurrentContext", "()Lorg/lwjgl/openal/ALCcontext;", (void*)&Java_org_lwjgl_openal_ALC_alcGetCurrentContext, "alcGetCurrentContext", (void*)&alcGetCurrentContext}, - {"alcGetContextsDevice", "(I)Lorg/lwjgl/openal/ALCdevice;", (void*)&Java_org_lwjgl_openal_ALC_alcGetContextsDevice, "alcGetContextsDevice", (void*)&alcGetContextsDevice}, - {"nalcSuspendContext", "(I)V", (void*)&Java_org_lwjgl_openal_ALC_nalcSuspendContext, "alcSuspendContext", (void*)&alcSuspendContext}, - {"alcDestroyContext", "(I)V", (void*)&Java_org_lwjgl_openal_ALC_alcDestroyContext, "alcDestroyContext", (void*)&alcDestroyContext}, - {"nalcGetError", "(I)I", (void*)&Java_org_lwjgl_openal_ALC_nalcGetError, "alcGetError", (void*)&alcGetError}, - {"nalcIsExtensionPresent", "(ILjava/lang/String;)Z", (void*)&Java_org_lwjgl_openal_ALC_nalcIsExtensionPresent, "alcIsExtensionPresent", (void*)&alcIsExtensionPresent}, - {"nalcGetEnumValue", "(ILjava/lang/String;)I", (void*)&Java_org_lwjgl_openal_ALC_nalcGetEnumValue, "alcGetEnumValue", (void*)&alcGetEnumValue} + {"alcGetContextsDevice", "(J)Lorg/lwjgl/openal/ALCdevice;", (void*)&Java_org_lwjgl_openal_ALC_alcGetContextsDevice, "alcGetContextsDevice", (void*)&alcGetContextsDevice}, + {"nalcSuspendContext", "(J)V", (void*)&Java_org_lwjgl_openal_ALC_nalcSuspendContext, "alcSuspendContext", (void*)&alcSuspendContext}, + {"alcDestroyContext", "(J)V", (void*)&Java_org_lwjgl_openal_ALC_alcDestroyContext, "alcDestroyContext", (void*)&alcDestroyContext}, + {"nalcGetError", "(J)I", (void*)&Java_org_lwjgl_openal_ALC_nalcGetError, "alcGetError", (void*)&alcGetError}, + {"nalcIsExtensionPresent", "(JLjava/lang/String;)Z", (void*)&Java_org_lwjgl_openal_ALC_nalcIsExtensionPresent, "alcIsExtensionPresent", (void*)&alcIsExtensionPresent}, + {"nalcGetEnumValue", "(JLjava/lang/String;)I", (void*)&Java_org_lwjgl_openal_ALC_nalcGetEnumValue, "alcGetEnumValue", (void*)&alcGetEnumValue} }; int num_functions = NUMFUNCTIONS(functions); extal_InitializeClass(env, clazz, num_functions, functions); |
|
From: Elias N. <eli...@us...> - 2005-04-12 10:30:20
|
Update of /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/openal In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27429/src/java/org/lwjgl/openal Modified Files: ALC.java ALCcontext.java ALCdevice.java Log Message: Converted ALC pointers from int to long Index: ALCcontext.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/openal/ALCcontext.java,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- ALCcontext.java 20 Aug 2004 06:22:53 -0000 1.12 +++ ALCcontext.java 12 Apr 2005 10:30:03 -0000 1.13 @@ -46,14 +46,14 @@ final class ALCcontext { /** address of actual context */ - final int context; + final long context; /** * Creates a new instance of ALCcontext * * @param context address of actual context */ - ALCcontext(int context) { + ALCcontext(long context) { this.context = context; } Index: ALC.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/openal/ALC.java,v retrieving revision 1.25 retrieving revision 1.26 diff -u -d -r1.25 -r1.26 --- ALC.java 1 Aug 2004 21:26:25 -0000 1.25 +++ ALC.java 12 Apr 2005 10:30:03 -0000 1.26 @@ -167,7 +167,7 @@ return nalcGetString(AL.device.device, pname); } - native static String nalcGetString(int device, int pname); + native static String nalcGetString(long device, int pname); /** * The application can query ALC for information using an integer query function. @@ -194,7 +194,7 @@ nalcGetIntegerv(AL.device.device, pname, integerdata.remaining(), integerdata, integerdata.position()); } - native static void nalcGetIntegerv(int device, int pname, int size, Buffer integerdata, int offset); + native static void nalcGetIntegerv(long device, int pname, int size, Buffer integerdata, int offset); /** * The <code>alcOpenDevice</code> function allows the application (i.e. the client program) to @@ -219,7 +219,7 @@ * * @param device address of native device to close */ - native static void alcCloseDevice(int device); + native static void alcCloseDevice(long device); /** * A context is created using <code>alcCreateContext</code>. The device parameter has to be a valid @@ -236,7 +236,7 @@ * @param attrList Buffer to read attributes from * @return New context, or null if creation failed */ - native static ALCcontext alcCreateContext(int device, IntBuffer attrList); + native static ALCcontext alcCreateContext(long device, IntBuffer attrList); /** * To make a Context current with respect to AL Operation (state changes by issueing @@ -252,7 +252,7 @@ * @param context address of context to make current * @return true if successfull, false if not */ - native static int alcMakeContextCurrent(int context); + native static int alcMakeContextCurrent(long context); /** * The current context is the only context accessible to state changes by AL commands @@ -269,7 +269,7 @@ nalcProcessContext(AL.context.context); } - native static void nalcProcessContext(int context); + native static void nalcProcessContext(long context); /** * The application can query for, and obtain an handle to, the current context for the @@ -285,7 +285,7 @@ * @param context address of context to get device for * @param ALCdevice associated with context */ - native static ALCdevice alcGetContextsDevice(int context); + native static ALCdevice alcGetContextsDevice(long context); /** * The application can suspend any context from processing (including the current @@ -302,7 +302,7 @@ public static void alcSuspendContext() { nalcSuspendContext(AL.context.context); } - native static void nalcSuspendContext(int context); + native static void nalcSuspendContext(long context); /** * The correct way to destroy a context is to first release it using <code>alcMakeCurrent</code> and @@ -310,7 +310,7 @@ * * @param context address of context to Destroy */ - native static void alcDestroyContext(int context); + native static void alcDestroyContext(long context); /** * ALC uses the same conventions and mechanisms as AL for error handling. In @@ -331,7 +331,7 @@ return nalcGetError(AL.device.device); } - native static int nalcGetError(int device); + native static int nalcGetError(long device); /** * Verify that a given extension is available for the current context and the device it @@ -346,7 +346,7 @@ return nalcIsExtensionPresent(AL.device.device, extName); } - native static boolean nalcIsExtensionPresent(int device, String extName); + native static boolean nalcIsExtensionPresent(long device, String extName); /** * Enumeration/token values are device independend, but tokens defined for @@ -362,5 +362,5 @@ return nalcGetEnumValue(AL.device.device, enumName); } - native static int nalcGetEnumValue(int device, String enumName); + native static int nalcGetEnumValue(long device, String enumName); } Index: ALCdevice.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/openal/ALCdevice.java,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- ALCdevice.java 12 Jun 2004 20:28:22 -0000 1.8 +++ ALCdevice.java 12 Apr 2005 10:30:04 -0000 1.9 @@ -42,14 +42,14 @@ final class ALCdevice { /** address of actual device */ - final int device; + final long device; /** * Creates a new instance of ALCdevice * * @param device address of actual device */ - ALCdevice(int device) { + ALCdevice(long device) { this.device = device; } -} \ No newline at end of file +} |
|
From: Elias N. <eli...@us...> - 2005-04-12 09:53:33
|
Update of /cvsroot/java-game-lib/LWJGL/src/native/win32 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7036/src/native/win32 Modified Files: org_lwjgl_input_Mouse.c Log Message: Win32: Fixed 64 bit warnings in Mouse.c Index: org_lwjgl_input_Mouse.c =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/win32/org_lwjgl_input_Mouse.c,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- org_lwjgl_input_Mouse.c 18 Jan 2005 16:42:31 -0000 1.10 +++ org_lwjgl_input_Mouse.c 12 Apr 2005 09:53:18 -0000 1.11 @@ -336,10 +336,10 @@ if (handle_buffer != NULL) { cursor_handle = (HCURSOR *)(*env)->GetDirectBufferAddress(env, handle_buffer); cursor = *cursor_handle; - SetClassLong(getCurrentHWND(), GCL_HCURSOR, (LONG)cursor); + SetClassLongPtr(getCurrentHWND(), GCL_HCURSOR, (LONG_PTR)cursor); SetCursor(cursor); } else { - SetClassLong(getCurrentHWND(), GCL_HCURSOR, (LONG)NULL); + SetClassLongPtr(getCurrentHWND(), GCL_HCURSOR, (LONG_PTR)NULL); SetCursor(LoadCursor(NULL, IDC_ARROW)); } } |
|
From: Elias N. <eli...@us...> - 2005-04-12 09:11:17
|
Update of /cvsroot/java-game-lib/LWJGL/platform_build/win32_ms_cmdline In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17261/platform_build/win32_ms_cmdline Modified Files: build.bat Log Message: Win32: Added /Wp64 flag to the cmd line build.bat. It enables 64 bit specific warnings which should be fixed to be ready for 64 bit platforms. Index: build.bat =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/platform_build/win32_ms_cmdline/build.bat,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- build.bat 29 Mar 2005 18:43:49 -0000 1.18 +++ build.bat 12 Apr 2005 09:11:07 -0000 1.19 @@ -5,7 +5,7 @@ if "%CHOME%" == "" goto errorchome if "%ALHOME%" == "" goto erroralhome if "%DXHOME%" == "" goto errordxhome -set COPTIONS=/I"%DXHOME%\include" /I"%CHOME%\include" /I"%PLTSDKHOME%\include" /I"%JAVA_HOME%\include" /I"%JAVA_HOME%\include\win32" /I"%ALHOME%\include" /I"..\..\src\native\common" /Ox /Ob2 /Oi /Ot /Oy /FD /EHsc /MT /Gy /W2 /nologo /c /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_USRDLL" /D "LWJGL_EXPORTS" /D "_WINDLL" +set COPTIONS=/Wp64 /I"%DXHOME%\include" /I"%CHOME%\include" /I"%PLTSDKHOME%\include" /I"%JAVA_HOME%\include" /I"%JAVA_HOME%\include\win32" /I"%ALHOME%\include" /I"..\..\src\native\common" /Ox /Ob2 /Oi /Ot /Oy /FD /EHsc /MT /Gy /W2 /nologo /c /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_USRDLL" /D "LWJGL_EXPORTS" /D "_WINDLL" rem ************************************************* rem ** Build using free compiler requires jawt.dll ** rem ** and awt.dll in current dir. /delayload ** |
