Mercurial > hg > jvamp
changeset 3:7b1740a9020a
Add remaining PluginBase method stubs to Java class
| author | Chris Cannam |
|---|---|
| date | Mon, 23 Jan 2012 18:15:30 +0000 |
| parents | d0ecf12b9d7b |
| children | 56f6a97745cf |
| files | org/vamp_plugins/OutputDescriptor.java org/vamp_plugins/ParameterDescriptor.java org/vamp_plugins/Plugin.java src/Plugin.cpp src/org_vamp_plugins_Plugin.h src/org_vamp_plugins_Plugin_Feature.h src/org_vamp_plugins_Plugin_InputDomain.h |
| diffstat | 7 files changed, 146 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/org/vamp_plugins/OutputDescriptor.java Wed Jan 18 09:35:22 2012 +0000 +++ b/org/vamp_plugins/OutputDescriptor.java Mon Jan 23 18:15:30 2012 +0000 @@ -28,4 +28,4 @@ sampleType = SampleType.OneSamplePerStep; hasDuration = false; } -}; +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/org/vamp_plugins/ParameterDescriptor.java Mon Jan 23 18:15:30 2012 +0000 @@ -0,0 +1,23 @@ + +package org.vamp_plugins; + +public class ParameterDescriptor { + public String identifier; + public String name; + public String description; + public String unit; + public float minValue; + public float maxValue; + public float defaultValue; + public boolean isQuantized; + public float quantizeStep; + public String[] valueNames; + + ParameterDescriptor() { + minValue = 0; + maxValue = 0; + defaultValue = 0; + isQuantized = false; + } +} +
--- a/org/vamp_plugins/Plugin.java Wed Jan 18 09:35:22 2012 +0000 +++ b/org/vamp_plugins/Plugin.java Mon Jan 23 18:15:30 2012 +0000 @@ -9,11 +9,26 @@ private long nativeHandle; protected Plugin(long handle) { nativeHandle = handle; } + // PluginBase methods + + public native int getVampApiVersion(); public native String getIdentifier(); public native String getName(); public native String getDescription(); + public native String getMaker(); + public native String getCopyright(); public native int getPluginVersion(); + public native ParameterDescriptor[] getParameterDescriptors(); + public native float getParameter(String identifier); + public native void setParameter(String identifier, float value); + + public native String[] getPrograms(); + public native String getCurrentProgram(); + public native void selectProgram(String program); + + // Plugin methods + public native boolean initialise(int inputChannels, int stepSize, int blockSize);
--- a/src/Plugin.cpp Wed Jan 18 09:35:22 2012 +0000 +++ b/src/Plugin.cpp Mon Jan 23 18:15:30 2012 +0000 @@ -35,3 +35,12 @@ return p->getPluginVersion(); } +jboolean +Java_org_vamp_1plugins_Plugin_initialise(JNIEnv *env, jobject obj, + jint inputChannels, jint stepSize, + jint blockSize) +{ + Plugin *p = getHandle<Plugin>(env, obj); + return p->initialise(inputChannels, stepSize, blockSize); +} +
--- a/src/org_vamp_plugins_Plugin.h Wed Jan 18 09:35:22 2012 +0000 +++ b/src/org_vamp_plugins_Plugin.h Mon Jan 23 18:15:30 2012 +0000 @@ -9,6 +9,14 @@ #endif /* * Class: org_vamp_plugins_Plugin + * Method: getVampApiVersion + * Signature: ()I + */ +JNIEXPORT jint JNICALL Java_org_vamp_1plugins_Plugin_getVampApiVersion + (JNIEnv *, jobject); + +/* + * Class: org_vamp_plugins_Plugin * Method: getIdentifier * Signature: ()Ljava/lang/String; */ @@ -33,6 +41,22 @@ /* * Class: org_vamp_plugins_Plugin + * Method: getMaker + * Signature: ()Ljava/lang/String; + */ +JNIEXPORT jstring JNICALL Java_org_vamp_1plugins_Plugin_getMaker + (JNIEnv *, jobject); + +/* + * Class: org_vamp_plugins_Plugin + * Method: getCopyright + * Signature: ()Ljava/lang/String; + */ +JNIEXPORT jstring JNICALL Java_org_vamp_1plugins_Plugin_getCopyright + (JNIEnv *, jobject); + +/* + * Class: org_vamp_plugins_Plugin * Method: getPluginVersion * Signature: ()I */ @@ -41,6 +65,54 @@ /* * Class: org_vamp_plugins_Plugin + * Method: getParameterDescriptors + * Signature: ()[Lorg/vamp_plugins/ParameterDescriptor; + */ +JNIEXPORT jobjectArray JNICALL Java_org_vamp_1plugins_Plugin_getParameterDescriptors + (JNIEnv *, jobject); + +/* + * Class: org_vamp_plugins_Plugin + * Method: getParameter + * Signature: (Ljava/lang/String;)F + */ +JNIEXPORT jfloat JNICALL Java_org_vamp_1plugins_Plugin_getParameter + (JNIEnv *, jobject, jstring); + +/* + * Class: org_vamp_plugins_Plugin + * Method: setParameter + * Signature: (Ljava/lang/String;F)V + */ +JNIEXPORT void JNICALL Java_org_vamp_1plugins_Plugin_setParameter + (JNIEnv *, jobject, jstring, jfloat); + +/* + * Class: org_vamp_plugins_Plugin + * Method: getPrograms + * Signature: ()[Ljava/lang/String; + */ +JNIEXPORT jobjectArray JNICALL Java_org_vamp_1plugins_Plugin_getPrograms + (JNIEnv *, jobject); + +/* + * Class: org_vamp_plugins_Plugin + * Method: getCurrentProgram + * Signature: ()Ljava/lang/String; + */ +JNIEXPORT jstring JNICALL Java_org_vamp_1plugins_Plugin_getCurrentProgram + (JNIEnv *, jobject); + +/* + * Class: org_vamp_plugins_Plugin + * Method: selectProgram + * Signature: (Ljava/lang/String;)V + */ +JNIEXPORT void JNICALL Java_org_vamp_1plugins_Plugin_selectProgram + (JNIEnv *, jobject, jstring); + +/* + * Class: org_vamp_plugins_Plugin * Method: initialise * Signature: (III)Z */
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/org_vamp_plugins_Plugin_Feature.h Mon Jan 23 18:15:30 2012 +0000 @@ -0,0 +1,13 @@ +/* DO NOT EDIT THIS FILE - it is machine generated */ +#include <jni.h> +/* Header for class org_vamp_plugins_Plugin_Feature */ + +#ifndef _Included_org_vamp_plugins_Plugin_Feature +#define _Included_org_vamp_plugins_Plugin_Feature +#ifdef __cplusplus +extern "C" { +#endif +#ifdef __cplusplus +} +#endif +#endif
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/org_vamp_plugins_Plugin_InputDomain.h Mon Jan 23 18:15:30 2012 +0000 @@ -0,0 +1,13 @@ +/* DO NOT EDIT THIS FILE - it is machine generated */ +#include <jni.h> +/* Header for class org_vamp_plugins_Plugin_InputDomain */ + +#ifndef _Included_org_vamp_plugins_Plugin_InputDomain +#define _Included_org_vamp_plugins_Plugin_InputDomain +#ifdef __cplusplus +extern "C" { +#endif +#ifdef __cplusplus +} +#endif +#endif