comparison src/Plugin.cpp @ 30:02db37c2301b

Add JNIEXPORT/JNICALL to definitions

 
 using Vamp::Plugin;
 using Vamp::PluginBase;
 using std::string;
 
-void
+JNIEXPORT void JNICALL
 Java_org_vamp_1plugins_Plugin_dispose(JNIEnv *env, jobject obj)
 {
     Plugin *p = getHandle<Plugin>(env, obj);
     setHandle<Plugin>(env, obj, 0);
     delete p;
 }
 
-jint
+JNIEXPORT jint JNICALL
 Java_org_vamp_1plugins_Plugin_getVampApiVersion(JNIEnv *env, jobject obj)
 {
     Plugin *p = getHandle<Plugin>(env, obj);
     return p->getVampApiVersion();
 }    
 
-jstring
+JNIEXPORT jstring JNICALL
 Java_org_vamp_1plugins_Plugin_getIdentifier(JNIEnv *env, jobject obj)
 {
     Plugin *p = getHandle<Plugin>(env, obj);
     return env->NewStringUTF(p->getIdentifier().c_str());
 }
 
-jstring
+JNIEXPORT jstring JNICALL
 Java_org_vamp_1plugins_Plugin_getName(JNIEnv *env, jobject obj)
 {
     Plugin *p = getHandle<Plugin>(env, obj);
     return env->NewStringUTF(p->getName().c_str());
 }
 
-jstring
+JNIEXPORT jstring JNICALL
 Java_org_vamp_1plugins_Plugin_getDescription(JNIEnv *env, jobject obj)
 {
     Plugin *p = getHandle<Plugin>(env, obj);
     return env->NewStringUTF(p->getDescription().c_str());
 }
 
-jstring
+JNIEXPORT jstring JNICALL
 Java_org_vamp_1plugins_Plugin_getMaker(JNIEnv *env, jobject obj)
 {
     Plugin *p = getHandle<Plugin>(env, obj);
     return env->NewStringUTF(p->getMaker().c_str());
 }
 
-jstring
+JNIEXPORT jstring JNICALL
 Java_org_vamp_1plugins_Plugin_getCopyright(JNIEnv *env, jobject obj)
 {
     Plugin *p = getHandle<Plugin>(env, obj);
     return env->NewStringUTF(p->getCopyright().c_str());
 }
 
-jint
+JNIEXPORT jint JNICALL
 Java_org_vamp_1plugins_Plugin_getPluginVersion(JNIEnv *env, jobject obj)
 {
     Plugin *p = getHandle<Plugin>(env, obj);
     return p->getPluginVersion();
 }
 
-jobjectArray
+JNIEXPORT jobjectArray JNICALL
 Java_org_vamp_1plugins_Plugin_getParameterDescriptors(JNIEnv *env, jobject obj)
 {
     Plugin *p = getHandle<Plugin>(env, obj);
     PluginBase::ParameterList params = p->getParameterDescriptors();
     jclass descClass = env->FindClass("org/vamp_plugins/ParameterDescriptor");

     }
 
     return result;
 }
 
-jfloat
+JNIEXPORT jfloat JNICALL
 Java_org_vamp_1plugins_Plugin_getParameter(JNIEnv *env, jobject obj,
 					   jstring param)
 {
     Plugin *p = getHandle<Plugin>(env, obj);
     const char *s = env->GetStringUTFChars(param, 0);
     jfloat f = p->getParameter(s);
     env->ReleaseStringUTFChars(param, s);
     return f;
 }
 
-void
+JNIEXPORT void JNICALL
 Java_org_vamp_1plugins_Plugin_setParameter(JNIEnv *env, jobject obj,
 					   jstring param, jfloat f)
 {
     Plugin *p = getHandle<Plugin>(env, obj);
     const char *s = env->GetStringUTFChars(param, 0);
     p->setParameter(s, f);
     env->ReleaseStringUTFChars(param, s);
 }
 
-jobjectArray
+JNIEXPORT jobjectArray JNICALL
 Java_org_vamp_1plugins_Plugin_getPrograms(JNIEnv *env, jobject obj)
 {
     Plugin *p = getHandle<Plugin>(env, obj);
     PluginBase::ProgramList programs = p->getPrograms();
     jobjectArray result = env->NewObjectArray

 				   env->NewStringUTF(programs[i].c_str()));
     }
     return result;
 }
 
-jstring
+JNIEXPORT jstring JNICALL
 Java_org_vamp_1plugins_Plugin_getCurrentProgram(JNIEnv *env, jobject obj)
 {
     Plugin *p = getHandle<Plugin>(env, obj);
     return env->NewStringUTF(p->getCurrentProgram().c_str());
 }
 
-void 
+JNIEXPORT void  JNICALL
 Java_org_vamp_1plugins_Plugin_selectProgram(JNIEnv *env, jobject obj,
 					    jstring program)
 {
     Plugin *p = getHandle<Plugin>(env, obj);
     const char *s = env->GetStringUTFChars(program, 0);
     p->selectProgram(s);
     env->ReleaseStringUTFChars(program, s);
 }
 
-jboolean
+JNIEXPORT jboolean JNICALL
 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);
 }
 
-void
+JNIEXPORT void JNICALL
 Java_org_vamp_1plugins_Plugin_reset(JNIEnv *env, jobject obj)
 {
     Plugin *p = getHandle<Plugin>(env, obj);
     p->reset();
 }
 
-jobject
+JNIEXPORT jobject JNICALL
 Java_org_vamp_1plugins_Plugin_getInputDomain(JNIEnv *env, jobject obj)
 {
     Plugin *p = getHandle<Plugin>(env, obj);
     Plugin::InputDomain d = p->getInputDomain();
 

 
     env->DeleteLocalRef(sn);
     return e;
 }
 
-jint
+JNIEXPORT jint JNICALL
 Java_org_vamp_1plugins_Plugin_getPreferredBlockSize(JNIEnv *env, jobject obj)
 {
     Plugin *p = getHandle<Plugin>(env, obj);
     return p->getPreferredBlockSize();
 }
 
-jint
+JNIEXPORT jint JNICALL
 Java_org_vamp_1plugins_Plugin_getPreferredStepSize(JNIEnv *env, jobject obj)
 {
     Plugin *p = getHandle<Plugin>(env, obj);
     return p->getPreferredStepSize();
 }
 
-jint
+JNIEXPORT jint JNICALL
 Java_org_vamp_1plugins_Plugin_getMinChannelCount(JNIEnv *env, jobject obj)
 {
     Plugin *p = getHandle<Plugin>(env, obj);
     return p->getMinChannelCount();
 }
 
-jint
+JNIEXPORT jint JNICALL
 Java_org_vamp_1plugins_Plugin_getMaxChannelCount(JNIEnv *env, jobject obj)
 {
     Plugin *p = getHandle<Plugin>(env, obj);
     return p->getMaxChannelCount();
 }
 
-jobjectArray
+JNIEXPORT jobjectArray JNICALL
 Java_org_vamp_1plugins_Plugin_getOutputDescriptors(JNIEnv *env, jobject obj)
 {
     Plugin *p = getHandle<Plugin>(env, obj);
     Plugin::OutputList outputs = p->getOutputDescriptors();
     jclass descClass = env->FindClass("org/vamp_plugins/OutputDescriptor");

     }
 
     return result;
 }
 
-static jobject
+JNIEXPORT static jobject
 convertFeature(JNIEnv *env, const Plugin::Feature &feature)
 {
     jclass featClass = env->FindClass("org/vamp_plugins/Feature");
     jmethodID ctor = env->GetMethodID(featClass, "<init>", "()V");
     jobject jfeature = env->NewObject(featClass, ctor);

     setStringField(env, jfeature, "label", feature.label);
 
     return jfeature;
 }
 
-static jobject
+JNIEXPORT static jobject
 convertFeatures(JNIEnv *env, const Plugin::FeatureSet &features)
 {
     jobject result;
     
     // FeatureSet is map<int, vector<Feature> > where Feature is a struct.

     }
 
     return result;
 }
 
-jobject
+JNIEXPORT jobject JNICALL
 Java_org_vamp_1plugins_Plugin_process(JNIEnv *env, jobject obj, jobjectArray data, jint offset, jobject timestamp)
 {
     Plugin *p = getHandle<Plugin>(env, obj);
 
     const Vamp::RealTime *const rt = getHandle<Vamp::RealTime>(env, timestamp);

     delete[] arr;
 
     return convertFeatures(env, features);
 }
 
-jobject
+JNIEXPORT jobject JNICALL
 Java_org_vamp_1plugins_Plugin_getRemainingFeatures(JNIEnv *env, jobject obj)
 {
     Plugin *p = getHandle<Plugin>(env, obj);
 
     Plugin::FeatureSet features = p->getRemainingFeatures();