fixed alcGetString functionpointer mapping (gluegen does not handle method renames correctly).

ALCImpl is now ALCAbstractImpl. "Custom code" is now in ALCImpl which extends ALCAbstractImpl.

2 files changed, 2 insertions, 54 deletions

diff --git a/make/joal-alc-impl-CustomJavaCode.java b/make/joal-alc-impl-CustomJavaCode.java
deleted file mode 100755
index c6f8e92..0000000
--- a/make/joal-alc-impl-CustomJavaCode.java
+++ /dev/null
@@ -1,52 +0,0 @@
-public java.lang.String alcGetString(ALCdevice device, int param) {
-  if (device == null && param == ALC_DEVICE_SPECIFIER) {
-    throw new ALException("Call alcGetDeviceSpecifiers to fetch all available device names");
-  }
-
-  java.nio.ByteBuffer buf = alcGetStringImpl(device, param);
-  if (buf == null) {
-    return null;
-  }
-  byte[] res = new byte[buf.capacity()];
-  buf.get(res);
-  try {
-    return new String(res, "US-ASCII");
-  } catch (UnsupportedEncodingException e) {
-    throw new ALException(e);
-  }
-}
-
-/** Fetches the names of the available ALC device specifiers.
-    Equivalent to the C call alcGetString(NULL, ALC_DEVICE_SPECIFIER). */
-public java.lang.String[] alcGetDeviceSpecifiers() {
-  return getDoubleNullTerminatedString(ALC_DEVICE_SPECIFIER);
-}
-
-/** Fetches the names of the available ALC capture device specifiers.
-    Equivalent to the C call alcGetString(NULL, ALC_CAPTURE_DEVICE_SPECIFIER). */
-public java.lang.String[] alcGetCaptureDeviceSpecifiers() {
-  return getDoubleNullTerminatedString(ALC_CAPTURE_DEVICE_SPECIFIER);
-}
-
-private java.lang.String[] getDoubleNullTerminatedString(int which) {
-  java.nio.ByteBuffer buf = alcGetStringImpl(null, which);
-  if (buf == null) {
-    return null;
-  }
-  byte[] bytes = new byte[buf.capacity()];
-  buf.get(bytes);
-  try {
-    ArrayList/*<String>*/ res = new ArrayList/*<String>*/();
-    int i = 0;
-    while (i < bytes.length) {
-      int startIndex = i;
-      while ((i < bytes.length) && (bytes[i] != 0))
-        i++;
-      res.add(new String(bytes, startIndex, i - startIndex, "US-ASCII"));
-      i++;
-    }
-    return (String[]) res.toArray(new String[0]);
-  } catch (UnsupportedEncodingException e) {
-    throw new ALException(e);
-  }
-}
diff --git a/make/joal-alc.cfg b/make/joal-alc.cfg
index 8626e43..3134a06 100755
--- a/make/joal-alc.cfg
+++ b/make/joal-alc.cfg
@@ -4,7 +4,8 @@ Include joal-common.cfg
 Style InterfaceAndImpl
 JavaClass ALC
 ImplPackage com.jogamp.openal.impl
-ImplJavaClass ALCImpl
+ImplJavaClass ALCAbstractImpl
+AccessControl ALCAbstractImpl PUBLIC_ABSTRACT
 Extends ALC ALCConstants
 
 EmitProcAddressTable true
@@ -35,7 +36,6 @@ ReturnValueCapacity alcGetStringImpl strlen_alc(_device_ptr, {1}, _res)
 # Note that we don't declare this as "ReturnsString" because we're
 # going to wrap it in another method
 IncludeAs CustomJavaCode ALC     joal-alc-CustomJavaCode.java
-IncludeAs CustomJavaCode ALCImpl joal-alc-impl-CustomJavaCode.java
 
 # These routines use strings
 ArgumentIsString alcIsExtensionPresent 1