diff options
Diffstat (limited to 'src')
7 files changed, 103 insertions, 88 deletions
diff --git a/src/java/com/jogamp/gluegen/JavaCallbackEmitter.java b/src/java/com/jogamp/gluegen/JavaCallbackEmitter.java index 1b6aa05..e4046ac 100644 --- a/src/java/com/jogamp/gluegen/JavaCallbackEmitter.java +++ b/src/java/com/jogamp/gluegen/JavaCallbackEmitter.java @@ -453,14 +453,10 @@ public final class JavaCallbackEmitter { if( mapNativePtrToCompound[0] ) { unit.emitln(" final "+origUserParamJType[0]+" "+info.cbFuncUserParamName+" = "+origUserParamJType[0]+".derefPointer(nativeUserParamPtr);"); } - if( useDataMap ) { - unit.emitln(" final "+DataClassName+" value;"); - } else { - unit.emitln(" final "+DataClassName+" value;"); - } + unit.emitln(" final "+DataClassName+" value;"); unit.emitln(" synchronized( "+lockInstanceName+" ) {"); if( useDataMap ) { - unit.emitln(" final "+KeyClassName+" key = new "+KeyClassName+"("+binding.getJavaCallSelectArguments(new StringBuilder(), info.setFuncKeyIndices, false).toString()+");"); + unit.emitln(" final "+KeyClassName+" key = new "+KeyClassName+"("+info.cbFuncBinding.getJavaCallSelectArguments(new StringBuilder(), info.cbFuncKeyIndices, false).toString()+");"); unit.emitln(" value = "+dataMapInstanceName+".get(key);"); } else { unit.emitln(" value = "+dataInstanceName+";"); diff --git a/src/java/com/jogamp/gluegen/JavaConfiguration.java b/src/java/com/jogamp/gluegen/JavaConfiguration.java index 5cea4c3..e530e0c 100644 --- a/src/java/com/jogamp/gluegen/JavaConfiguration.java +++ b/src/java/com/jogamp/gluegen/JavaConfiguration.java @@ -190,9 +190,10 @@ public class JavaConfiguration { final String cbFuncTypeName; final int cbFuncUserParamIdx; final String setFuncName; - final List<Integer> setFuncKeyIndices = new ArrayList<Integer>(); final int setFuncUserParamIdx; // optional + final List<Integer> cbFuncKeyIndices = new ArrayList<Integer>(); final String setFuncKeyClassName; // optional + final List<Integer> setFuncKeyIndices = new ArrayList<Integer>(); JavaCallbackDef(final String cbFuncTypeName, final int cbFuncUserParamIdx, final String setFuncName, final int setFuncUserParamIdx, final String setFuncKeyClassName) { this.cbFuncTypeName = cbFuncTypeName; this.cbFuncUserParamIdx = cbFuncUserParamIdx; @@ -202,8 +203,8 @@ public class JavaConfiguration { } @Override public String toString() { - return String.format("JavaCallbackDef[cbFunc[type %s, userParamIdx %d], set[%s, keys %s, userParamIdx %d, KeyClass %s]]", - cbFuncTypeName, cbFuncUserParamIdx, setFuncName, setFuncKeyIndices.toString(), setFuncUserParamIdx, setFuncKeyClassName); + return String.format("JavaCallbackDef[cbFunc[type %s, userParamIdx %d, keys %s], set[%s, keys %s, userParamIdx %d, KeyClass %s]]", + cbFuncTypeName, cbFuncUserParamIdx, cbFuncKeyIndices.toString(), setFuncName, setFuncKeyIndices.toString(), setFuncUserParamIdx, setFuncKeyClassName); } } private final List<JavaCallbackDef> javaCallbackList = new ArrayList<JavaCallbackDef>(); @@ -1692,26 +1693,9 @@ public class JavaConfiguration { protected void readJavaCallbackDef(final StringTokenizer tok, final String filename, final int lineNo) { try { final String setFuncName = tok.nextToken(); - final int setFuncUserParamIdx; - final String cbFuncTypeName; - { - final String stok = tok.nextToken(); - int ival = -1; - String sval = null; - try { - ival = Integer.valueOf(stok); - } catch(final NumberFormatException nfe) { - sval = stok; - } - if( null == sval ) { - setFuncUserParamIdx = ival; - cbFuncTypeName = tok.nextToken(); - } else { - setFuncUserParamIdx = -1; - cbFuncTypeName = sval; - } - } - final Integer cbFuncUserParamIdx = Integer.valueOf(tok.nextToken()); + final int setFuncUserParamIdx = Integer.parseInt(tok.nextToken()); + final String cbFuncTypeName = tok.nextToken(); + final int cbFuncUserParamIdx = Integer.parseInt(tok.nextToken()); final String cbFuncKeyClassName; if( tok.hasMoreTokens() ) { cbFuncKeyClassName = tok.nextToken(); @@ -1734,18 +1718,54 @@ public class JavaConfiguration { if( null == jcd ) { throw new IllegalArgumentException("JavaCallbackDef '"+setFuncName+"\' not (yet) defined."); } + + // Collect setFuncKeyIndices + String stok = null; while( tok.hasMoreTokens() ) { - final int idx = Integer.valueOf(tok.nextToken()); + stok = tok.nextToken(); + if( !isInteger(stok) ) { + break; + } + final int idx = Integer.parseInt(stok); if( 0 > idx ) { - throw new IllegalArgumentException("JavaCallbackKey '"+setFuncName+"\' index "+idx+" not in range [0..n]."); + throw new IllegalArgumentException("JavaCallbackKey '"+setFuncName+"\' SetCallback-ParamIndex "+idx+" not in range [0..n]."); } jcd.setFuncKeyIndices.add( idx ); } + + // Validate proper CallbackFuncType + if( null == stok ) { + throw new IllegalArgumentException("JavaCallbackKey '"+setFuncName+"\': CallbackFuncType missing."); + } + if( !stok.equals(jcd.cbFuncTypeName) ) { + throw new IllegalArgumentException("JavaCallbackKey '"+setFuncName+"\': CallbackFuncType '"+stok+"' not matching JavaCallbackDef: "+jcd); + } + + // Collect cbFuncKeyIndices + while( tok.hasMoreTokens() ) { + final int idx = Integer.parseInt(tok.nextToken()); + if( 0 > idx ) { + throw new IllegalArgumentException("JavaCallbackKey '"+setFuncName+"\' CallbackFunc-ParamIndex "+idx+" not in range [0..n]."); + } + jcd.cbFuncKeyIndices.add( idx ); + } + if( jcd.setFuncKeyIndices.size() != jcd.cbFuncKeyIndices.size() ) { + throw new IllegalArgumentException("JavaCallbackKey '"+setFuncName+"\' SetCallback-ParamIndex list count "+jcd.setFuncKeyIndices.toString()+ + " != CallbackFunc-ParamIndex count "+jcd.cbFuncKeyIndices.toString()); + } } catch (final NoSuchElementException e) { throw new RuntimeException("Error parsing \"JavaCallbackKey\" command at line " + lineNo + " in file \"" + filename + "\"", e); } } + private static boolean isInteger(final String s) { + try { + Integer.parseInt(s); + return true; + } catch(final Exception e) { + return false; + } + } protected void readExtendedIntfImplSymbols(final StringTokenizer tok, final String filename, final int lineNo, final boolean forInterface, final boolean forImplementation, final boolean onlyList) { File javaFile; @@ -2381,6 +2401,7 @@ public class JavaConfiguration { final String staticCBMethodSignature; final FunctionType cbFuncType; final MethodBinding cbFuncBinding; + final List<Integer> cbFuncKeyIndices; final int cbFuncUserParamIdx; final String cbFuncUserParamName; final Type cbFuncUserParamType; @@ -2388,13 +2409,13 @@ public class JavaConfiguration { final String setFuncName; final List<Integer> setFuncKeyIndices; final String setFuncKeyClassName; + final int setFuncUserParamIdx; boolean setFuncProcessed; int setFuncCBParamIdx; - int setFuncUserParamIdx; boolean keyClassEmitted; public JavaCallbackInfo(final String cbFuncTypeName, final String cbSimpleClazzName, final String cbFQClazzName, final String staticCBMethodSignature, - final FunctionType cbFuncType, final MethodBinding cbFuncBinding, final int cbFuncUserParamIdx, + final FunctionType cbFuncType, final MethodBinding cbFuncBinding, final int cbFuncUserParamIdx, final List<Integer> cbFuncKeyIndices, final String setFuncName, final int setFuncUserParamIdx, final List<Integer> setFuncKeyIndices, final String setFuncKeyClassName) { this.cbFuncTypeName = cbFuncTypeName; this.cbSimpleClazzName = cbSimpleClazzName; @@ -2416,42 +2437,51 @@ public class JavaConfiguration { } } this.cbFuncUserParamIdx = paramIdx; + this.cbFuncKeyIndices = cbFuncKeyIndices; this.cbFuncUserParamName = paramName; this.cbFuncUserParamType = paramType; } this.setFuncName = setFuncName; this.setFuncKeyIndices = setFuncKeyIndices; this.setFuncKeyClassName = setFuncKeyClassName; + this.setFuncUserParamIdx = setFuncUserParamIdx; this.setFuncProcessed = false; this.setFuncCBParamIdx = -1; - this.setFuncUserParamIdx = setFuncUserParamIdx; this.keyClassEmitted = false; } + private void validateKeyIndices(final FunctionType setFuncType) { + if( this.cbFuncKeyIndices.size() != this.setFuncKeyIndices.size() ) { + throw new IllegalArgumentException("JavaCallback "+setFuncName+": Key count mismatch: setFunc "+setFuncKeyIndices.toString()+ + " != cbFunc "+cbFuncKeyIndices.toString()); + } + for(int i=0; i< this.cbFuncKeyIndices.size(); ++i) { + final int cbFuncIdx = this.cbFuncKeyIndices.get(i); + final Type t1 = this.cbFuncType.getArgumentType(cbFuncIdx); + final int setFuncIdx = this.setFuncKeyIndices.get(i); + final Type t2 = setFuncType.getArgumentType(setFuncIdx); + if( !t1.equals(t2) ) { + throw new IllegalArgumentException("JavaCallback "+setFuncName+": Key Type mismatch: setFunc#"+setFuncIdx+" with "+t2.toString()+", cbFunc#"+cbFuncIdx+" with "+t1.toString()); + } + } + } - public void setFuncProcessed(final int cbParamIdx, final int userParamIdx) { + public void setFuncProcessed(final FunctionType setFuncType, final int cbParamIdx) { if( !setFuncProcessed ) { - if( 0 <= cbParamIdx && 0 <= userParamIdx ) { + if( 0 <= cbParamIdx ) { setFuncProcessed = true; setFuncCBParamIdx = cbParamIdx; - if( 0 <= setFuncUserParamIdx ) { - if( setFuncUserParamIdx != userParamIdx ) { - throw new IllegalArgumentException("Mismatch pre-set setFuncUserParamIdx "+setFuncUserParamIdx+", given "+userParamIdx+": "+toString()); - } - } else { - setFuncUserParamIdx = userParamIdx; - } + validateKeyIndices(setFuncType); } else { setFuncCBParamIdx = -1; - setFuncUserParamIdx = -1; } } } @Override public String toString() { - return String.format("JavaCallbackInfo[cbFunc[%s%s, userParam[idx %d, '%s', %s], set[%s(ok %b, cbIdx %d, upIdx %d, keys %s, KeyClass '%s'], %s]", + return String.format("JavaCallbackInfo[cbFunc[%s%s, userParam[idx %d, '%s', %s, keys %s], set[%s(ok %b, cbIdx %d, upIdx %d, keys %s, KeyClass '%s'], %s]", cbFuncTypeName, staticCBMethodSignature, - cbFuncUserParamIdx, cbFuncUserParamName, cbFuncUserParamType.getSignature(null).toString(), + cbFuncUserParamIdx, cbFuncUserParamName, cbFuncUserParamType.getSignature(null).toString(), cbFuncKeyIndices.toString(), setFuncName, setFuncProcessed, setFuncCBParamIdx, setFuncUserParamIdx, setFuncKeyIndices.toString(), setFuncKeyClassName, cbFuncType.toString(cbFuncTypeName, false, true)); diff --git a/src/java/com/jogamp/gluegen/JavaEmitter.java b/src/java/com/jogamp/gluegen/JavaEmitter.java index 8af79e4..07bd55d 100644 --- a/src/java/com/jogamp/gluegen/JavaEmitter.java +++ b/src/java/com/jogamp/gluegen/JavaEmitter.java @@ -1473,7 +1473,7 @@ public class JavaEmitter implements GlueEmitter { funcType.toString(jcbd.cbFuncTypeName, false, true)); } final JavaCallbackInfo jcbi1 = new JavaCallbackInfo(jcbd.cbFuncTypeName, cbSimpleClazzName, cbFQClazzName, jcbi0.staticCBMethodSignature, - funcType, jcbi0.cbFuncBinding, jcbi0.cbFuncUserParamIdx, + funcType, jcbi0.cbFuncBinding, jcbi0.cbFuncUserParamIdx, jcbi0.cbFuncKeyIndices, jcbd.setFuncName, jcbd.setFuncUserParamIdx, jcbd.setFuncKeyIndices, jcbd.setFuncKeyClassName); cfg.setFuncToJavaCallbackMap.put(jcbd.setFuncName, jcbi1); LOG.log(INFO, "JavaCallbackInfo: Reusing {0} -> {1}", jcbd.setFuncName, jcbi0); @@ -1493,7 +1493,7 @@ public class JavaEmitter implements GlueEmitter { cbFuncBinding.getJavaReturnType()+", func "+funcType.toString(jcbd.cbFuncTypeName, false, true)); } final JavaCallbackInfo jcbi1 = new JavaCallbackInfo(jcbd.cbFuncTypeName, cbSimpleClazzName, cbFQClazzName, cbMethodSignature.toString(), - funcType, cbFuncBinding, jcbd.cbFuncUserParamIdx, + funcType, cbFuncBinding, jcbd.cbFuncUserParamIdx, jcbd.cbFuncKeyIndices, jcbd.setFuncName, jcbd.setFuncUserParamIdx, jcbd.setFuncKeyIndices, jcbd.setFuncKeyClassName); cfg.setFuncToJavaCallbackMap.put(jcbd.setFuncName, jcbi1); javaCallbackInterfaceMap.put(cbFQClazzName, jcbi1); @@ -3104,7 +3104,7 @@ public class JavaEmitter implements GlueEmitter { stringArgIndices = PascalStringIdx.pushValueIndex(pascalStringArgs, stringArgIndices); } final JavaCallbackInfo jcbi = cfg.setFuncToJavaCallbackMap.get( sym.getName() ); - int jcbiSetFuncCBParamIdx=-1, jcbiSetFuncUserParamIdx=-1; + int jcbiSetFuncCBParamIdx=-1; for (int i = 0; i < sym.getNumArguments(); i++) { final Type cArgType = sym.getArgumentType(i); @@ -3121,20 +3121,6 @@ public class JavaEmitter implements GlueEmitter { mappedType = JavaType.createForNamedClass( jcbi.cbFQClazzName ); } else if( null != jcbi && i == jcbi.setFuncUserParamIdx && cArgType.isPointer() ) { // Replace userParam argument '<userParamType>*' if 'void*' with Object - jcbiSetFuncUserParamIdx=i; - if( cArgType.getTargetType().isVoid() ) { - if( jcbi.cbFuncUserParamType.isCompound() ) { - mappedType = JavaType.createForClass(long.class); - } else { - mappedType = JavaType.forObjectClass(); - } - } - } else if( null != jcbi && jcbi.cbFuncUserParamName.equals( cArgName ) && - ( !jcbi.setFuncProcessed || i == jcbi.setFuncUserParamIdx ) && - cArgType.isPointer() && jcbi.cbFuncUserParamType.equals( cArgType.getTargetType() ) ) - { - // Replace userParam argument '<userParamType>*' if 'void*' with Object - jcbiSetFuncUserParamIdx=i; if( cArgType.getTargetType().isVoid() ) { if( jcbi.cbFuncUserParamType.isCompound() ) { mappedType = JavaType.createForClass(long.class); @@ -3174,9 +3160,9 @@ public class JavaEmitter implements GlueEmitter { //System.out.println("During binding of [" + sym + "], added mapping from C type: " + cArgType + " to Java type: " + mappedType); } if( null != jcbi ) { - jcbi.setFuncProcessed(jcbiSetFuncCBParamIdx, jcbiSetFuncUserParamIdx); - LOG.log(INFO, "BindFunc.JavaCallback: {0}: set[cbParamIdx {1}, userParamIdx {2}], {3}, {4}", - sym.getName(), jcbiSetFuncCBParamIdx, jcbiSetFuncUserParamIdx, sym.getType().toString(sym.getName(), false, true), jcbi); + jcbi.setFuncProcessed(sym.getType(), jcbiSetFuncCBParamIdx); + LOG.log(INFO, "BindFunc.JavaCallback: {0}: set[cbParamIdx {1}], {3}, {4}", + sym.getName(), jcbiSetFuncCBParamIdx, sym.getType().toString(sym.getName(), false, true), jcbi); } final MethodBinding mb = new MethodBinding(sym, delegationImplName, javaReturnType, javaArgumentTypes, diff --git a/src/junit/com/jogamp/gluegen/test/junit/generation/Test4JavaCallback.java b/src/junit/com/jogamp/gluegen/test/junit/generation/Test4JavaCallback.java index 8c1d726..bc04977 100644 --- a/src/junit/com/jogamp/gluegen/test/junit/generation/Test4JavaCallback.java +++ b/src/junit/com/jogamp/gluegen/test/junit/generation/Test4JavaCallback.java @@ -446,7 +446,7 @@ public class Test4JavaCallback extends BaseClass { Assert.assertEquals(0, bt2.getAlBufferCallback1Keys().size()); // 1st mapping: buffer1 -> myCallback01, myUserParam01 - bt2.alBufferCallback1(buffer1, 0, 0, myCallback01, myUserParam01); + bt2.alBufferCallback1(myUserParam01, buffer1, 0, 0, myCallback01); Assert.assertEquals(true, bt2.isAlBufferCallback1Mapped(buffer1Key)); Assert.assertEquals(false, bt2.isAlBufferCallback1Mapped(buffer2Key)); Assert.assertEquals(false, bt2.isAlBufferCallback1Mapped(buffer3Key)); @@ -465,7 +465,7 @@ public class Test4JavaCallback extends BaseClass { } // 2nd mapping: buffer2 -> myCallback02, myUserParam02 - bt2.alBufferCallback1(buffer2, 0, 0, myCallback02, myUserParam02); + bt2.alBufferCallback1(myUserParam02, buffer2, 0, 0, myCallback02); Assert.assertEquals(true, bt2.isAlBufferCallback1Mapped(buffer1Key)); Assert.assertEquals(true, bt2.isAlBufferCallback1Mapped(buffer2Key)); Assert.assertEquals(false, bt2.isAlBufferCallback1Mapped(buffer3Key)); @@ -512,7 +512,7 @@ public class Test4JavaCallback extends BaseClass { } // Switch the callback function for buffer2 -> myCallback01, myUserParam02 - bt2.alBufferCallback1(buffer2, 0, 0, myCallback01, myUserParam02); + bt2.alBufferCallback1(myUserParam02, buffer2, 0, 0, myCallback01); Assert.assertEquals(true, bt2.isAlBufferCallback1Mapped(buffer1Key)); Assert.assertEquals(true, bt2.isAlBufferCallback1Mapped(buffer2Key)); Assert.assertEquals(false, bt2.isAlBufferCallback1Mapped(buffer3Key)); @@ -552,7 +552,7 @@ public class Test4JavaCallback extends BaseClass { } // Just release the buffer2 callback and mapped resources - bt2.alBufferCallback1(buffer2, 0, 0, null, myUserParam02); // usrptr is not key, only buffer is key! + bt2.alBufferCallback1(myUserParam02, buffer2, 0, 0, null); // usrptr is not key, only buffer is key! Assert.assertEquals(true, bt2.isAlBufferCallback1Mapped(buffer1Key)); Assert.assertEquals(false, bt2.isAlBufferCallback1Mapped(buffer2Key)); Assert.assertEquals(false, bt2.isAlBufferCallback1Mapped(buffer3Key)); @@ -571,7 +571,7 @@ public class Test4JavaCallback extends BaseClass { } // Just release the buffer1 callback and mapped resources - bt2.alBufferCallback1(buffer1, 0, 0, null, null); // usrptr is not key, only buffer is key! + bt2.alBufferCallback1(null, buffer1, 0, 0, null); // usrptr is not key, only buffer is key! Assert.assertEquals(false, bt2.isAlBufferCallback1Mapped(buffer1Key)); Assert.assertEquals(false, bt2.isAlBufferCallback1Mapped(buffer2Key)); Assert.assertEquals(false, bt2.isAlBufferCallback1Mapped(buffer3Key)); diff --git a/src/junit/com/jogamp/gluegen/test/junit/generation/test2.c b/src/junit/com/jogamp/gluegen/test/junit/generation/test2.c index 28fb3aa..dafad7c 100644 --- a/src/junit/com/jogamp/gluegen/test/junit/generation/test2.c +++ b/src/junit/com/jogamp/gluegen/test/junit/generation/test2.c @@ -165,7 +165,7 @@ void alBufferCallback0Inject(int buffer, int sampledata, int numbytes) { static ALBUFFERCALLBACKTYPESOFT alBufferCallback1_callback[] = { NULL, NULL, NULL, NULL, NULL }; static void* alBufferCallback1_userptr[] = { NULL, NULL, NULL, NULL, NULL }; -void alBufferCallback1(int buffer /* key */, int format, int freq, ALBUFFERCALLBACKTYPESOFT callback, void *userptr) { +void alBufferCallback1(void* userptr, int buffer /* key */, int format, int freq, ALBUFFERCALLBACKTYPESOFT callback) { if( buffer < 0 || MAX_AL_BUFFER <= buffer ) { fprintf(stderr, "Error: alBufferCallback1: buffer not in range [0..%d), is %d\n", MAX_AL_BUFFER, buffer); } else { diff --git a/src/junit/com/jogamp/gluegen/test/junit/generation/test2.cfg b/src/junit/com/jogamp/gluegen/test/junit/generation/test2.cfg index 08194e6..d4ea72d 100644 --- a/src/junit/com/jogamp/gluegen/test/junit/generation/test2.cfg +++ b/src/junit/com/jogamp/gluegen/test/junit/generation/test2.cfg @@ -67,14 +67,14 @@ ArgumentIsString InjectMessageCallback01 1 # - `T2_CallbackFunc01 getMessageCallback01()` returns the global T2_CallbackFunc01, null if not mapped # - `Object getMessageCallback01UserParam()` returns the global `usrParam` object, null if not mapped # - `void releaseMessageCallback01()` releases callback data skipping toolkit API. Favor passing `null` callback ref to `MessageCallback01(..)` -JavaCallbackDef MessageCallback01 T2_CallbackFunc01 2 +JavaCallbackDef MessageCallback01 1 T2_CallbackFunc01 2 # # End JavaCallback # Begin JavaCallback. # # typedef void ( * ALEVENTPROCSOFT)(int eventType, int object, int param, int length, const char *message, void *userParam); -# void alEventCallback(ALEVENTPROCSOFT callback, void *userParam /* identity-key */); +# void alEventCallback(ALEVENTPROCSOFT callback, void *userParam); # void alEventCallbackInject(int eventType, int object, int param, const char* msg); ArgumentIsPascalString ALEVENTPROCSOFT 3 4 ArgumentIsString alEventCallbackInject 3 @@ -93,17 +93,17 @@ ArgumentIsString alEventCallbackInject 3 # - `ALEVENTPROCSOFT getAlEventCallback()` returns the global ALEVENTPROCSOFT, null if not mapped # - `Object getAlEventCallbackUserParam()` returns the global `userParam` object, null if not mapped # - `void releaseAlEventCallback()` releases callback data skipping toolkit API. Favor passing `null` callback ref to `alEventCallback(..)` -JavaCallbackDef alEventCallback ALEVENTPROCSOFT 5 -JavaCallbackKey alEventCallback +JavaCallbackDef alEventCallback 1 ALEVENTPROCSOFT 5 +# JavaCallbackKey alEventCallback 1 ALEVENTPROCSOFT 5 # # End JavaCallback # Begin JavaCallback (OpanAL AL_SOFT_callback_buffer) # -# // typedef void ( * ALBUFFERCALLBACKTYPESOFT)(int buffer, void *userptr, void *sampledata, int numbytes); -# typedef void ( * ALBUFFERCALLBACKTYPESOFT)(int buffer, void *userptr, int sampledata, int numbytes); +# // typedef void ( * ALBUFFERCALLBACKTYPESOFT)(int buffer /* key */, void *userptr, void *sampledata, int numbytes); +# typedef void ( * ALBUFFERCALLBACKTYPESOFT)(int buffer /* key */, void *userptr, int sampledata, int numbytes); # -# void alBufferCallback0(int buffer /* key */, int format, int freq, ALBUFFERCALLBACKTYPESOFT callback, void *userptr /* identity-key */); +# void alBufferCallback0(int buffer /* key */, int format, int freq, ALBUFFERCALLBACKTYPESOFT callback, void *userptr); # # // void alBufferCallback0Inject(int buffer, void *sampledata, int numbytes); # void alBufferCallback0Inject(int buffer, int sampledata, int numbytes); @@ -124,8 +124,8 @@ JavaCallbackKey alEventCallback # - `Object getAlBufferCallback0UserParam(AlBufferCallback0Key)` returns the `buffer` mapped `userptr` object, null if not mapped # - `void releaseAllAlBufferCallback0()` releases all callback data mapped via Key { int buffer } skipping toolkit API. Favor passing `null` callback ref to `alBufferCallback0(..)` # - `void releaseAlBufferCallback0(AlBufferCallback0Key)` releases callback data mapped to Key { int buffer } skipping toolkit API. Favor passing `null` callback ref to `alBufferCallback0(..)` -JavaCallbackDef alBufferCallback0 ALBUFFERCALLBACKTYPESOFT 1 -JavaCallbackKey alBufferCallback0 0 +JavaCallbackDef alBufferCallback0 4 ALBUFFERCALLBACKTYPESOFT 1 +JavaCallbackKey alBufferCallback0 0 ALBUFFERCALLBACKTYPESOFT 0 # # End JavaCallback @@ -133,7 +133,10 @@ JavaCallbackKey alBufferCallback0 0 # # Reuses: ALBUFFERCALLBACKTYPESOFT, see above. # -# void alBufferCallback1(int buffer /* key */, int format, int freq, ALBUFFERCALLBACKTYPESOFT callback, void *userptr /* identity-key */); +# // typedef void ( * ALBUFFERCALLBACKTYPESOFT)(int buffer /* key */, void *userptr, void *sampledata, int numbytes); +# typedef void ( * ALBUFFERCALLBACKTYPESOFT)(int buffer /* key */, void *userptr, int sampledata, int numbytes); +# +# void alBufferCallback1(void* user_ptr, int buffer_key /* key */, int format, int freq, ALBUFFERCALLBACKTYPESOFT callback); # # // void alBufferCallback1Inject(int buffer, void *sampledata, int numbytes); # void alBufferCallback1Inject(int buffer, int sampledata, int numbytes); @@ -151,8 +154,8 @@ JavaCallbackKey alBufferCallback0 0 # - `boolean isAlBufferCallback1Mapped(int buffer)` queries whether `alBufferCallback1` is mapped to `buffer`. # - `ALBUFFERCALLBACKTYPESOFT getAlBufferCallback1(int buffer)` returns the `buffer` mapped ALEVENTPROCSOFT, null if not mapped # - `Object getAlBufferCallback1UserParam(int buffer)` returns the `buffer` mapped `userptr` object, null if not mapped -JavaCallbackDef alBufferCallback1 ALBUFFERCALLBACKTYPESOFT 1 com.jogamp.gluegen.test.junit.generation.Test4JavaCallback.CustomAlBufferCallback1Key -JavaCallbackKey alBufferCallback1 0 +JavaCallbackDef alBufferCallback1 0 ALBUFFERCALLBACKTYPESOFT 1 com.jogamp.gluegen.test.junit.generation.Test4JavaCallback.CustomAlBufferCallback1Key +JavaCallbackKey alBufferCallback1 1 ALBUFFERCALLBACKTYPESOFT 0 # # End JavaCallback @@ -162,15 +165,15 @@ JavaCallbackKey alBufferCallback1 0 # void MessageCallback11a(size_t id /* key */, T2_CallbackFunc11 cbFunc, const T2_Callback11UserType* usrParam); # void MessageCallback11aInject(size_t id); #JavaCallbackDef MessageCallback11a T2_CallbackFunc11 1 com.jogamp.gluegen.test.junit.generation.Test4JavaCallback.CustomMessageCallback11Key -JavaCallbackDef MessageCallback11a T2_CallbackFunc11 1 -JavaCallbackKey MessageCallback11a 0 +JavaCallbackDef MessageCallback11a 2 T2_CallbackFunc11 1 +JavaCallbackKey MessageCallback11a 0 T2_CallbackFunc11 0 # # End JavaCallback # void MessageCallback11b(size_t id /* key */, T2_CallbackFunc11 cbFunc, void* Data); # void MessageCallback11bInject(size_t id); JavaCallbackDef MessageCallback11b 2 T2_CallbackFunc11 1 -JavaCallbackKey MessageCallback11b 0 +JavaCallbackKey MessageCallback11b 0 T2_CallbackFunc11 0 CustomCCode #include "test2.h" diff --git a/src/junit/com/jogamp/gluegen/test/junit/generation/test2.h b/src/junit/com/jogamp/gluegen/test/junit/generation/test2.h index 183f905..dea6d72 100644 --- a/src/junit/com/jogamp/gluegen/test/junit/generation/test2.h +++ b/src/junit/com/jogamp/gluegen/test/junit/generation/test2.h @@ -84,7 +84,7 @@ void alBufferCallback0(int buffer /* key */, int format, int freq, ALBUFFERCALLB // void alBufferCallback0Inject(int buffer, void *sampledata, int numbytes); void alBufferCallback0Inject(int buffer, int sampledata, int numbytes); -void alBufferCallback1(int buffer /* key */, int format, int freq, ALBUFFERCALLBACKTYPESOFT callback, void *userptr); +void alBufferCallback1(void* user_ptr, int buffer_key /* key */, int format, int freq, ALBUFFERCALLBACKTYPESOFT callback); // void alBufferCallback1Inject(int buffer, void *sampledata, int numbytes); void alBufferCallback1Inject(int buffer, int sampledata, int numbytes); |