|
From: Elias N. <eli...@us...> - 2004-05-23 19:45:17
|
Update of /cvsroot/java-game-lib/LWJGL/src/native/common/fmod In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32461/src/native/common/fmod Modified Files: extfmod.cpp extfmod.h org_lwjgl_fmod_FMOD.cpp org_lwjgl_fmod_FMusic.cpp org_lwjgl_fmod_FSound.cpp Log Message: Renamed fmod to fmod_instance Index: extfmod.h =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/fmod/extfmod.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- extfmod.h 23 May 2004 14:03:07 -0000 1.1 +++ extfmod.h 23 May 2004 19:45:00 -0000 1.2 @@ -34,14 +34,14 @@ #define _EXT_FMOD_H #include <jni.h> -#include "../common_tools.h" +#include "common_tools.h" #include "fmoddyn.h" #include "fmod_errors.h" -extern FMOD_INSTANCE * fmod; +extern FMOD_INSTANCE * fmod_instance; void fmod_create(char*); void fmod_destroy(); -#endif \ No newline at end of file +#endif Index: extfmod.cpp =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/fmod/extfmod.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- extfmod.cpp 23 May 2004 14:46:07 -0000 1.2 +++ extfmod.cpp 23 May 2004 19:45:00 -0000 1.3 @@ -39,7 +39,7 @@ #include "extfmod.h" /** Instance of fmod */ -FMOD_INSTANCE * fmod = NULL; +FMOD_INSTANCE * fmod_instance = NULL; #ifdef _WIN32 /** @@ -56,14 +56,14 @@ * @param path path to try to load dll */ void fmod_create(char* path) { - fmod = FMOD_CreateInstance(path); + fmod_instance = FMOD_CreateInstance(path); } /** * Destroys the fmod instance */ void fmod_destroy() { - if (fmod != NULL) { - FMOD_FreeInstance(fmod); + if (fmod_instance != NULL) { + FMOD_FreeInstance(fmod_instance); } } Index: org_lwjgl_fmod_FSound.cpp =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/fmod/org_lwjgl_fmod_FSound.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- org_lwjgl_fmod_FSound.cpp 23 May 2004 14:46:07 -0000 1.2 +++ org_lwjgl_fmod_FSound.cpp 23 May 2004 19:45:00 -0000 1.3 @@ -38,7 +38,7 @@ * Signature: ()V */ JNIEXPORT void JNICALL Java_org_lwjgl_fmod_FSound_FSOUND_1Close(JNIEnv * env, jclass clazz) { - fmod->FSOUND_Close(); + fmod_instance->FSOUND_Close(); } @@ -58,7 +58,7 @@ */ JNIEXPORT jboolean JNICALL Java_org_lwjgl_fmod_FSound_FSOUND_1Init [...1276 lines suppressed...] + return fmod_instance->FSOUND_Reverb_GetProperties((FSOUND_REVERB_PROPERTIES*) prop); } /* @@ -1744,7 +1744,7 @@ * Signature: (IJ)Z */ JNIEXPORT jboolean JNICALL Java_org_lwjgl_fmod_FSound_nFSOUND_1Reverb_1SetChannelProperties(JNIEnv * env, jclass clazz, jint channel, jlong prop) { - return fmod->FSOUND_Reverb_SetChannelProperties(channel, (FSOUND_REVERB_CHANNELPROPERTIES*) prop); + return fmod_instance->FSOUND_Reverb_SetChannelProperties(channel, (FSOUND_REVERB_CHANNELPROPERTIES*) prop); } /* @@ -1753,5 +1753,5 @@ * Signature: (IJ)Z */ JNIEXPORT jboolean JNICALL Java_org_lwjgl_fmod_FSound_nFSOUND_1Reverb_1GetChannelProperties(JNIEnv * env, jclass clazz, jint channel, jlong prop) { - return fmod->FSOUND_Reverb_GetChannelProperties(channel, (FSOUND_REVERB_CHANNELPROPERTIES*) prop); + return fmod_instance->FSOUND_Reverb_GetChannelProperties(channel, (FSOUND_REVERB_CHANNELPROPERTIES*) prop); } Index: org_lwjgl_fmod_FMOD.cpp =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/fmod/org_lwjgl_fmod_FMOD.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- org_lwjgl_fmod_FMOD.cpp 23 May 2004 14:03:07 -0000 1.1 +++ org_lwjgl_fmod_FMOD.cpp 23 May 2004 19:45:00 -0000 1.2 @@ -50,19 +50,19 @@ * Signature: ()V */ JNIEXPORT void JNICALL Java_org_lwjgl_fmod_FMOD_nCreate(JNIEnv *env, jclass clazz, jobjectArray paths) { - jsize pathcount = env->GetArrayLength(paths); + jsize pathcount = env->GetArrayLength(paths); for(int i=0;i<pathcount;i++) { jstring path = (jstring) env->GetObjectArrayElement(paths, i); char *path_str = (char *) env->GetStringUTFChars(path, NULL); - printfDebug("Trying to load fmod from %s\n", path_str); - fmod_create(path_str); - env->ReleaseStringUTFChars(path, path_str); - - if(fmod != NULL) { - return; - } - } - throwFMODException(env, "Unable to load fmod library"); + printfDebug("Trying to load fmod_instance from %s\n", path_str); + fmod_create(path_str); + env->ReleaseStringUTFChars(path, path_str); + + if(fmod_instance != NULL) { + return; + } + } + throwFMODException(env, "Unable to load fmod library"); } /* @@ -81,4 +81,4 @@ */ JNIEXPORT jstring JNICALL Java_org_lwjgl_fmod_FMOD_FMOD_1ErrorString(JNIEnv *env, jclass clazz, jint errorcode) { return env->NewStringUTF(FMOD_ErrorString(errorcode)); -} \ No newline at end of file +} Index: org_lwjgl_fmod_FMusic.cpp =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/fmod/org_lwjgl_fmod_FMusic.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- org_lwjgl_fmod_FMusic.cpp 23 May 2004 14:03:07 -0000 1.1 +++ org_lwjgl_fmod_FMusic.cpp 23 May 2004 19:45:00 -0000 1.2 @@ -40,7 +40,7 @@ */ JNIEXPORT jlong JNICALL Java_org_lwjgl_fmod_FMusic_nFMUSIC_1LoadSong(JNIEnv *env, jclass clazz, jstring name) { const char* filename = (const char*) (env->GetStringUTFChars(name, 0)); - return (jlong) fmod->FMUSIC_LoadSong(filename); + return (jlong) fmod_instance->FMUSIC_LoadSong(filename); } /* @@ -56,7 +56,7 @@ sampleData = sampleListOffset + (int *) env->GetDirectBufferAddress(sampleList); } - return (jlong) fmod->FMUSIC_LoadSongEx(songData, offset, length, mode, sampleData, samplelistnum); + return (jlong) fmod_instance->FMUSIC_LoadSongEx(songData, offset, length, mode, sampleData, samplelistnum); } /* @@ -71,7 +71,7 @@ if(sampleList != NULL) { sampleData = sampleListOffset + (int *) env->GetDirectBufferAddress(sampleList); } - return (jlong) fmod->FMUSIC_LoadSongEx(filename, offset, length, mode, sampleData, samplelistnum); + return (jlong) fmod_instance->FMUSIC_LoadSongEx(filename, offset, length, mode, sampleData, samplelistnum); } @@ -82,7 +82,7 @@ */ JNIEXPORT jint JNICALL Java_org_lwjgl_fmod_FMusic_nFMUSIC_1GetOpenState (JNIEnv *env, jclass clazz, jlong module){ - return fmod->FMUSIC_GetOpenState((FMUSIC_MODULE *) module); + return fmod_instance->FMUSIC_GetOpenState((FMUSIC_MODULE *) module); } /* @@ -92,7 +92,7 @@ */ JNIEXPORT jboolean JNICALL Java_org_lwjgl_fmod_FMusic_nFMUSIC_1FreeSong (JNIEnv *env, jclass clazz, jlong module){ - return fmod->FMUSIC_FreeSong((FMUSIC_MODULE *) module); + return fmod_instance->FMUSIC_FreeSong((FMUSIC_MODULE *) module); } /* @@ -102,7 +102,7 @@ */ JNIEXPORT jboolean JNICALL Java_org_lwjgl_fmod_FMusic_nFMUSIC_1PlaySong (JNIEnv *env, jclass clazz, jlong module){ - return fmod->FMUSIC_PlaySong((FMUSIC_MODULE *) module); + return fmod_instance->FMUSIC_PlaySong((FMUSIC_MODULE *) module); } /* @@ -112,7 +112,7 @@ */ JNIEXPORT jboolean JNICALL Java_org_lwjgl_fmod_FMusic_nFMUSIC_1StopSong (JNIEnv *env, jclass clazz, jlong module){ - return fmod->FMUSIC_StopSong((FMUSIC_MODULE *) module); + return fmod_instance->FMUSIC_StopSong((FMUSIC_MODULE *) module); } /* @@ -122,13 +122,13 @@ */ JNIEXPORT void JNICALL Java_org_lwjgl_fmod_FMusic_FMUSIC_1StopAllSongs (JNIEnv *env, jclass clazz){ - return fmod->FMUSIC_StopAllSongs(); + return fmod_instance->FMUSIC_StopAllSongs(); } /* * Class: org_lwjgl_fmod_FMusic * Method: nFMUSIC_SetZxxCallback - * Signature: (JLorg/lwjgl/fmod/FMusicCallback;)Z + * Signature: (JLorg/lwjgl/fmod_instance/FMusicCallback;)Z */ JNIEXPORT jboolean JNICALL Java_org_lwjgl_fmod_FMusic_nFMUSIC_1SetZxxCallback (JNIEnv *env, jclass clazz, jlong, jobject){ @@ -139,7 +139,7 @@ /* * Class: org_lwjgl_fmod_FMusic * Method: nFMUSIC_SetRowCallback - * Signature: (JLorg/lwjgl/fmod/FMusicCallback;I)Z + * Signature: (JLorg/lwjgl/fmod_instance/FMusicCallback;I)Z */ JNIEXPORT jboolean JNICALL Java_org_lwjgl_fmod_FMusic_nFMUSIC_1SetRowCallback (JNIEnv *env, jclass clazz, jlong, jobject, jint){ @@ -150,7 +150,7 @@ /* * Class: org_lwjgl_fmod_FMusic * Method: nFMUSIC_SetOrderCallback - * Signature: (JLorg/lwjgl/fmod/FMusicCallback;I)Z + * Signature: (JLorg/lwjgl/fmod_instance/FMusicCallback;I)Z */ JNIEXPORT jboolean JNICALL Java_org_lwjgl_fmod_FMusic_nFMUSIC_1SetOrderCallback (JNIEnv *env, jclass clazz, jlong, jobject, jint){ @@ -161,7 +161,7 @@ /* * Class: org_lwjgl_fmod_FMusic * Method: nFMUSIC_SetInstCallback - * Signature: (JLorg/lwjgl/fmod/FMusicCallback;I)Z + * Signature: (JLorg/lwjgl/fmod_instance/FMusicCallback;I)Z */ JNIEXPORT jboolean JNICALL Java_org_lwjgl_fmod_FMusic_nFMUSIC_1SetInstCallback (JNIEnv *env, jclass clazz, jlong, jobject, jint){ @@ -176,7 +176,7 @@ */ JNIEXPORT jboolean JNICALL Java_org_lwjgl_fmod_FMusic_nFMUSIC_1SetSample (JNIEnv *env, jclass clazz, jlong module, jint sampno, jlong sample){ - return fmod->FMUSIC_SetSample((FMUSIC_MODULE *) module, sampno, (FSOUND_SAMPLE *) sample); + return fmod_instance->FMUSIC_SetSample((FMUSIC_MODULE *) module, sampno, (FSOUND_SAMPLE *) sample); } /* @@ -197,7 +197,7 @@ */ JNIEXPORT jboolean JNICALL Java_org_lwjgl_fmod_FMusic_nFMUSIC_1OptimizeChannels (JNIEnv *env, jclass clazz, jlong module, jint max, jint min){ - return fmod->FMUSIC_OptimizeChannels((FMUSIC_MODULE *) module, max, min); + return fmod_instance->FMUSIC_OptimizeChannels((FMUSIC_MODULE *) module, max, min); } /* @@ -207,7 +207,7 @@ */ JNIEXPORT jboolean JNICALL Java_org_lwjgl_fmod_FMusic_FMUSIC_1SetReverb (JNIEnv *env, jclass clazz, jboolean reverb){ - return fmod->FMUSIC_SetReverb(reverb); + return fmod_instance->FMUSIC_SetReverb(reverb); } /* @@ -217,7 +217,7 @@ */ JNIEXPORT jboolean JNICALL Java_org_lwjgl_fmod_FMusic_nFMUSIC_1SetLooping (JNIEnv *env, jclass clazz, jlong module, jboolean looping){ - return fmod->FMUSIC_SetLooping((FMUSIC_MODULE *) module, looping); + return fmod_instance->FMUSIC_SetLooping((FMUSIC_MODULE *) module, looping); } /* @@ -227,7 +227,7 @@ */ JNIEXPORT jboolean JNICALL Java_org_lwjgl_fmod_FMusic_nFMUSIC_1SetOrder (JNIEnv *env, jclass clazz, jlong module, jint order){ - return fmod->FMUSIC_SetOrder((FMUSIC_MODULE *) module, order); + return fmod_instance->FMUSIC_SetOrder((FMUSIC_MODULE *) module, order); } /* @@ -237,7 +237,7 @@ */ JNIEXPORT jboolean JNICALL Java_org_lwjgl_fmod_FMusic_nFMUSIC_1SetPaused (JNIEnv *env, jclass clazz, jlong module, jboolean paused){ - return fmod->FMUSIC_SetPaused((FMUSIC_MODULE *) module, paused); + return fmod_instance->FMUSIC_SetPaused((FMUSIC_MODULE *) module, paused); } /* @@ -247,7 +247,7 @@ */ JNIEXPORT jboolean JNICALL Java_org_lwjgl_fmod_FMusic_nFMUSIC_1SetMasterVolume (JNIEnv *env, jclass clazz, jlong module, jint volume){ - return fmod->FMUSIC_SetMasterVolume((FMUSIC_MODULE *) module, volume); + return fmod_instance->FMUSIC_SetMasterVolume((FMUSIC_MODULE *) module, volume); } /* @@ -257,7 +257,7 @@ */ JNIEXPORT jboolean JNICALL Java_org_lwjgl_fmod_FMusic_nFMUSIC_1SetMasterSpeed (JNIEnv *env, jclass clazz, jlong module, jfloat speed){ - return fmod->FMUSIC_SetMasterSpeed((FMUSIC_MODULE *) module, speed); + return fmod_instance->FMUSIC_SetMasterSpeed((FMUSIC_MODULE *) module, speed); } /* @@ -267,7 +267,7 @@ */ JNIEXPORT jboolean JNICALL Java_org_lwjgl_fmod_FMusic_nFMUSIC_1SetPanSeperation (JNIEnv *env, jclass clazz, jlong module, jfloat pan){ - return fmod->FMUSIC_SetPanSeperation((FMUSIC_MODULE *) module, pan); + return fmod_instance->FMUSIC_SetPanSeperation((FMUSIC_MODULE *) module, pan); } /* @@ -277,7 +277,7 @@ */ JNIEXPORT jstring JNICALL Java_org_lwjgl_fmod_FMusic_nFMUSIC_1GetName (JNIEnv *env, jclass clazz, jlong module) { - const char * name = fmod->FMUSIC_GetName((FMUSIC_MODULE *) module); + const char * name = fmod_instance->FMUSIC_GetName((FMUSIC_MODULE *) module); return env->NewStringUTF(name); } @@ -288,7 +288,7 @@ */ JNIEXPORT jint JNICALL Java_org_lwjgl_fmod_FMusic_nFMUSIC_1GetType (JNIEnv *env, jclass clazz, jlong module){ - return fmod->FMUSIC_GetType((FMUSIC_MODULE *) module); + return fmod_instance->FMUSIC_GetType((FMUSIC_MODULE *) module); } /* @@ -298,7 +298,7 @@ */ JNIEXPORT jint JNICALL Java_org_lwjgl_fmod_FMusic_nFMUSIC_1GetNumOrders (JNIEnv *env, jclass clazz, jlong module){ - return fmod->FMUSIC_GetNumOrders((FMUSIC_MODULE *) module); + return fmod_instance->FMUSIC_GetNumOrders((FMUSIC_MODULE *) module); } /* @@ -308,7 +308,7 @@ */ JNIEXPORT jint JNICALL Java_org_lwjgl_fmod_FMusic_nFMUSIC_1GetNumPatterns (JNIEnv *env, jclass clazz, jlong module){ - return fmod->FMUSIC_GetNumPatterns((FMUSIC_MODULE *) module); + return fmod_instance->FMUSIC_GetNumPatterns((FMUSIC_MODULE *) module); } /* @@ -318,7 +318,7 @@ */ JNIEXPORT jint JNICALL Java_org_lwjgl_fmod_FMusic_nFMUSIC_1GetNumInstruments (JNIEnv *env, jclass clazz, jlong module){ - return fmod->FMUSIC_GetNumInstruments((FMUSIC_MODULE *) module); + return fmod_instance->FMUSIC_GetNumInstruments((FMUSIC_MODULE *) module); } /* @@ -328,7 +328,7 @@ */ JNIEXPORT jint JNICALL Java_org_lwjgl_fmod_FMusic_nFMUSIC_1GetNumSamples (JNIEnv *env, jclass clazz, jlong module){ - return fmod->FMUSIC_GetNumSamples((FMUSIC_MODULE *) module); + return fmod_instance->FMUSIC_GetNumSamples((FMUSIC_MODULE *) module); } /* @@ -338,7 +338,7 @@ */ JNIEXPORT jint JNICALL Java_org_lwjgl_fmod_FMusic_nFMUSIC_1GetNumChannels (JNIEnv *env, jclass clazz, jlong module){ - return fmod->FMUSIC_GetNumChannels((FMUSIC_MODULE *) module); + return fmod_instance->FMUSIC_GetNumChannels((FMUSIC_MODULE *) module); } /* @@ -348,7 +348,7 @@ */ JNIEXPORT jlong JNICALL Java_org_lwjgl_fmod_FMusic_nFMUSIC_1GetSample (JNIEnv *env, jclass clazz, jlong module, jint sampleno){ - return (jlong) fmod->FMUSIC_GetSample((FMUSIC_MODULE *) module, sampleno); + return (jlong) fmod_instance->FMUSIC_GetSample((FMUSIC_MODULE *) module, sampleno); } /* @@ -358,7 +358,7 @@ */ JNIEXPORT jint JNICALL Java_org_lwjgl_fmod_FMusic_nFMUSIC_1GetPatternLength (JNIEnv *env, jclass clazz, jlong module, jint orderno){ - return fmod->FMUSIC_GetPatternLength((FMUSIC_MODULE *) module, orderno); + return fmod_instance->FMUSIC_GetPatternLength((FMUSIC_MODULE *) module, orderno); } /* @@ -368,7 +368,7 @@ */ JNIEXPORT jboolean JNICALL Java_org_lwjgl_fmod_FMusic_nFMUSIC_1IsFinished (JNIEnv *env, jclass clazz, jlong module){ - return fmod->FMUSIC_IsFinished((FMUSIC_MODULE *) module); + return fmod_instance->FMUSIC_IsFinished((FMUSIC_MODULE *) module); } /* @@ -378,7 +378,7 @@ */ JNIEXPORT jboolean JNICALL Java_org_lwjgl_fmod_FMusic_nFMUSIC_1IsPlaying (JNIEnv *env, jclass clazz, jlong module){ - return fmod->FMUSIC_IsPlaying((FMUSIC_MODULE *) module); + return fmod_instance->FMUSIC_IsPlaying((FMUSIC_MODULE *) module); } /* @@ -388,7 +388,7 @@ */ JNIEXPORT jint JNICALL Java_org_lwjgl_fmod_FMusic_nFMUSIC_1GetMasterVolume (JNIEnv *env, jclass clazz, jlong module){ - return fmod->FMUSIC_GetMasterVolume((FMUSIC_MODULE *) module); + return fmod_instance->FMUSIC_GetMasterVolume((FMUSIC_MODULE *) module); } /* @@ -398,7 +398,7 @@ */ JNIEXPORT jint JNICALL Java_org_lwjgl_fmod_FMusic_nFMUSIC_1GetGlobalVolume (JNIEnv *env, jclass clazz, jlong module){ - return fmod->FMUSIC_GetGlobalVolume((FMUSIC_MODULE *) module); + return fmod_instance->FMUSIC_GetGlobalVolume((FMUSIC_MODULE *) module); } /* @@ -408,7 +408,7 @@ */ JNIEXPORT jint JNICALL Java_org_lwjgl_fmod_FMusic_nFMUSIC_1GetOrder (JNIEnv *env, jclass clazz, jlong module){ - return fmod->FMUSIC_GetOrder((FMUSIC_MODULE *) module); + return fmod_instance->FMUSIC_GetOrder((FMUSIC_MODULE *) module); } /* @@ -418,7 +418,7 @@ */ JNIEXPORT jint JNICALL Java_org_lwjgl_fmod_FMusic_nFMUSIC_1GetPattern (JNIEnv *env, jclass clazz, jlong module){ - return fmod->FMUSIC_GetPattern((FMUSIC_MODULE *) module); + return fmod_instance->FMUSIC_GetPattern((FMUSIC_MODULE *) module); } /* @@ -428,7 +428,7 @@ */ JNIEXPORT jint JNICALL Java_org_lwjgl_fmod_FMusic_nFMUSIC_1GetSpeed (JNIEnv *env, jclass clazz, jlong module){ - return fmod->FMUSIC_GetSpeed((FMUSIC_MODULE *) module); + return fmod_instance->FMUSIC_GetSpeed((FMUSIC_MODULE *) module); } /* @@ -438,7 +438,7 @@ */ JNIEXPORT jint JNICALL Java_org_lwjgl_fmod_FMusic_nFMUSIC_1GetBPM (JNIEnv *env, jclass clazz, jlong module){ - return fmod->FMUSIC_GetBPM((FMUSIC_MODULE *) module); + return fmod_instance->FMUSIC_GetBPM((FMUSIC_MODULE *) module); } /* @@ -448,7 +448,7 @@ */ JNIEXPORT jint JNICALL Java_org_lwjgl_fmod_FMusic_nFMUSIC_1GetRow (JNIEnv *env, jclass clazz, jlong module){ - return fmod->FMUSIC_GetRow((FMUSIC_MODULE *) module); + return fmod_instance->FMUSIC_GetRow((FMUSIC_MODULE *) module); } /* @@ -458,7 +458,7 @@ */ JNIEXPORT jboolean JNICALL Java_org_lwjgl_fmod_FMusic_nFMUSIC_1GetPaused (JNIEnv *env, jclass clazz, jlong module){ - return fmod->FMUSIC_GetPaused((FMUSIC_MODULE *) module); + return fmod_instance->FMUSIC_GetPaused((FMUSIC_MODULE *) module); } /* @@ -468,7 +468,7 @@ */ JNIEXPORT jint JNICALL Java_org_lwjgl_fmod_FMusic_nFMUSIC_1GetTime (JNIEnv *env, jclass clazz, jlong module){ - return fmod->FMUSIC_GetTime((FMUSIC_MODULE *) module); + return fmod_instance->FMUSIC_GetTime((FMUSIC_MODULE *) module); } /* @@ -478,7 +478,7 @@ */ JNIEXPORT jint JNICALL Java_org_lwjgl_fmod_FMusic_nFMUSIC_1GetRealChannel (JNIEnv *env, jclass clazz, jlong module, jint modchannel){ - return fmod->FMUSIC_GetRealChannel((FMUSIC_MODULE *) module, modchannel); + return fmod_instance->FMUSIC_GetRealChannel((FMUSIC_MODULE *) module, modchannel); } /* |