java-game-lib-cvs Mailing List for Lightweight Java Game Library (Page 5)

Update of /cvsroot/java-game-lib/LWJGL/src/native/common/fmod3
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18363

Modified Files:
	extfmod3.cpp extfmod3.h 
Log Message:
cleanup

Index: extfmod3.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/fmod3/extfmod3.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- extfmod3.cpp	20 Aug 2004 06:20:51 -0000	1.4
+++ extfmod3.cpp	3 Sep 2004 06:03:32 -0000	1.5
@@ -78,15 +78,20 @@
  * @param path path to try to load dll
  */
 void fmod_create(JNIEnv *env, char* path) {
+  // try to create an instance using the supplied path
   fmod_instance = FMOD_CreateInstance(path);
   
+  // if we got one, we need to locate and cache jni stuff used for callbacks
   if (fmod_instance != NULL) {
+    
+    // fmusic specific callbacks
     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");
     music_zxxcallback = env->GetStaticMethodID(fmusic, "music_zxxcallback", "(JI)V");
 		
+    // fsound specefic callbacks
 		fsound = env->FindClass("org/lwjgl/fmod3/FSound");
 		sound_dspcallback = env->GetStaticMethodID(fsound, "dsp_callback", "(JLjava/nio/ByteBuffer;Ljava/nio/ByteBuffer;I)Ljava/nio/ByteBuffer;");
 		sound_stream_endcallback = env->GetStaticMethodID(fsound, "end_callback", "(J)V");
@@ -94,7 +99,8 @@
 		sound_stream_callback = env->GetStaticMethodID(fsound, "stream_callback", "(JLjava/nio/ByteBuffer;I)V");
 		sound_metadata_callback = env->GetStaticMethodID(fsound, "meta_callback", "(JLjava/nio/ByteBuffer;Ljava/nio/ByteBuffer;)V");
 		
-		// cache some data
+		// we need the size of the mix buffer, so we start out by caching it and
+		// update it accordingly on changes
 		switch(fmod_instance->FSOUND_GetMixer()) {
 			case FSOUND_MIXER_AUTODETECT:
 			case FSOUND_MIXER_BLENDMODE:

Index: extfmod3.h
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/fmod3/extfmod3.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- extfmod3.h	20 Aug 2004 06:20:51 -0000	1.4
+++ extfmod3.h	3 Sep 2004 06:03:32 -0000	1.5
@@ -39,19 +39,23 @@
 #include "fmoddyn.h"
 #include "fmod_errors.h"
 
+// Called to create an FMOD instance
 void fmod_create(JNIEnv *env, char*);
+
+// Called to destroy our FMOD instance
 void fmod_destroy();
 
-extern void attachMixerThread();
-extern void attachStreamThread();
+// Actual FMOD instance to invoke methods on
 extern FMOD_INSTANCE * fmod_instance;
 
 // Setup for callback. The callbacks don't have access to a JNIEnv pointer, so we have to provide
-// one. Unfortunately we cannot cache one, since JNIEnv er thread local copies. We can however
+// one. Unfortunately we cannot cache one, since JNIEnv are thread local copies. We can however
 // aquire one, using AttachCurrent<ThreadAsDaemon>. However we need a VM instance for that.
 // so we supply 1 VM instance for use by threads (in common_tools) (VM instances are shared across threads), and
 // 1 JNIEnv pointer per thread. At this time, 2 threads have been identified - the Stream thread
-// and the mixer thread.
+// and the Mixer thread.
+extern void attachMixerThread();
+extern void attachStreamThread();
 extern JNIEnv *mixer_jnienv;
 extern JNIEnv *stream_jnienv;
 

Update of /cvsroot/java-game-lib/LWJGL/src/native/common/fmod3
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18262

Modified Files:
	org_lwjgl_fmod3_FSound.cpp 
Log Message:
update cache fields

Index: org_lwjgl_fmod3_FSound.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/fmod3/org_lwjgl_fmod3_FSound.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- org_lwjgl_fmod3_FSound.cpp	20 Aug 2004 06:20:51 -0000	1.7
+++ org_lwjgl_fmod3_FSound.cpp	3 Sep 2004 06:02:33 -0000	1.8
@@ -119,7 +119,27 @@
 * Signature: (I)Z
 */
 JNIEXPORT jboolean JNICALL Java_org_lwjgl_fmod3_FSound_FSOUND_1SetMixer(JNIEnv * env, jclass clazz, jint mixer) {
-  return fmod_instance->FSOUND_SetMixer(mixer);
+  jboolean result = fmod_instance->FSOUND_SetMixer(mixer);
+  
+  // if we successfully changed mixer - update cached size field
+  if(result) {
+		switch(fmod_instance->FSOUND_GetMixer()) {
+			case FSOUND_MIXER_AUTODETECT:
+			case FSOUND_MIXER_BLENDMODE:
+			case FSOUND_MIXER_QUALITY_AUTODETECT:
+			case FSOUND_MIXER_QUALITY_FPU:
+			case FSOUND_MIXER_MONO:
+			case FSOUND_MIXER_QUALITY_MONO:
+			case FSOUND_MIXER_MAX:
+				fsound_dsp_buffer_size = 8;
+				break;
+			default:
+				fsound_dsp_buffer_size = 4;
+				break;
+		}    
+  }
+  
+  return result;
 }
 
 /*