Mercurial > hg > jvamp

changeset 30:02db37c2301b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add JNIEXPORT/JNICALL to definitions
author Chris Cannam
date Thu, 22 Nov 2012 11:38:55 +0000
parents 7d1118b3860d
children d8ff8c5ad52a
files src/Plugin.cpp src/PluginLoader.cpp src/RealTime.cpp
diffstat 3 files changed, 46 insertions(+), 42 deletions(-) [+]
line wrap: on
line diff
--- a/src/Plugin.cpp	Thu Nov 22 11:35:17 2012 +0000
+++ b/src/Plugin.cpp	Thu Nov 22 11:38:55 2012 +0000
@@ -11,7 +11,7 @@
 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);
@@ -19,56 +19,56 @@
     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);
@@ -97,7 +97,7 @@
     return result;
 }
 
-jfloat
+JNIEXPORT jfloat JNICALL
 Java_org_vamp_1plugins_Plugin_getParameter(JNIEnv *env, jobject obj,
 					   jstring param)
 {
@@ -108,7 +108,7 @@
     return f;
 }
 
-void
+JNIEXPORT void JNICALL
 Java_org_vamp_1plugins_Plugin_setParameter(JNIEnv *env, jobject obj,
 					   jstring param, jfloat f)
 {
@@ -118,7 +118,7 @@
     env->ReleaseStringUTFChars(param, s);
 }
 
-jobjectArray
+JNIEXPORT jobjectArray JNICALL
 Java_org_vamp_1plugins_Plugin_getPrograms(JNIEnv *env, jobject obj)
 {
     Plugin *p = getHandle<Plugin>(env, obj);
@@ -132,14 +132,14 @@
     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)
 {
@@ -149,7 +149,7 @@
     env->ReleaseStringUTFChars(program, s);
 }
 
-jboolean
+JNIEXPORT jboolean JNICALL
 Java_org_vamp_1plugins_Plugin_initialise(JNIEnv *env, jobject obj,
 					 jint inputChannels, jint stepSize,
 					 jint blockSize)
@@ -158,14 +158,14 @@
     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);
@@ -184,35 +184,35 @@
     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);
@@ -270,7 +270,7 @@
     return result;
 }
 
-static jobject
+JNIEXPORT static jobject
 convertFeature(JNIEnv *env, const Plugin::Feature &feature)
 {
     jclass featClass = env->FindClass("org/vamp_plugins/Feature");
@@ -287,7 +287,7 @@
     return jfeature;
 }
 
-static jobject
+JNIEXPORT static jobject
 convertFeatures(JNIEnv *env, const Plugin::FeatureSet &features)
 {
     jobject result;
@@ -333,7 +333,7 @@
     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);
@@ -362,7 +362,7 @@
     return convertFeatures(env, features);
 }
 
-jobject
+JNIEXPORT jobject JNICALL
 Java_org_vamp_1plugins_Plugin_getRemainingFeatures(JNIEnv *env, jobject obj)
 {
     Plugin *p = getHandle<Plugin>(env, obj);
--- a/src/PluginLoader.cpp	Thu Nov 22 11:35:17 2012 +0000
+++ b/src/PluginLoader.cpp	Thu Nov 22 11:38:55 2012 +0000
@@ -7,14 +7,14 @@
 using Vamp::Plugin;
 using Vamp::HostExt::PluginLoader;
 
-void
+JNIEXPORT void JNICALL
 Java_org_vamp_1plugins_PluginLoader_initialise(JNIEnv *env, jobject obj)
 {
     PluginLoader *inst = PluginLoader::getInstance();
     setHandle(env, obj, inst);
 }
 
-jobjectArray
+JNIEXPORT jobjectArray JNICALL
 Java_org_vamp_1plugins_PluginLoader_listPlugins(JNIEnv *env, jobject obj)
 {
     PluginLoader *inst = getHandle<PluginLoader>(env, obj);
@@ -28,7 +28,7 @@
     return result;
 }    
 
-jlong
+JNIEXPORT jlong JNICALL
 Java_org_vamp_1plugins_PluginLoader_loadPluginNative(JNIEnv *env, jobject obj,
 						     jstring key, jfloat rate,
 						     jint flags)
@@ -40,7 +40,7 @@
     return (jlong)p;
 }
 
-jobjectArray
+JNIEXPORT jobjectArray JNICALL
 Java_org_vamp_1plugins_PluginLoader_getPluginCategory(JNIEnv *env, jobject obj,
 						      jstring key)
 {
--- a/src/RealTime.cpp	Thu Nov 22 11:35:17 2012 +0000
+++ b/src/RealTime.cpp	Thu Nov 22 11:38:55 2012 +0000
@@ -7,7 +7,7 @@
 using Vamp::RealTime;
 using std::string;
 
-void
+JNIEXPORT void JNICALL
 Java_org_vamp_1plugins_RealTime_dispose(JNIEnv *env, jobject obj)
 {
     RealTime *rt = getHandle<RealTime>(env, obj);
@@ -15,49 +15,49 @@
     delete rt;
 }
 
-jint
+JNIEXPORT jint JNICALL
 Java_org_vamp_1plugins_RealTime_sec(JNIEnv *env, jobject obj)
 {
     RealTime *rt = getHandle<RealTime>(env, obj);
     return rt->sec;
 }
 
-jint
+JNIEXPORT jint JNICALL
 Java_org_vamp_1plugins_RealTime_nsec(JNIEnv *env, jobject obj)
 {
     RealTime *rt = getHandle<RealTime>(env, obj);
     return rt->nsec;
 }    
 
-jint
+JNIEXPORT jint JNICALL
 Java_org_vamp_1plugins_RealTime_usec(JNIEnv *env, jobject obj)
 {
     RealTime *rt = getHandle<RealTime>(env, obj);
     return rt->usec();
 }
 
-jint
+JNIEXPORT jint JNICALL
 Java_org_vamp_1plugins_RealTime_msec(JNIEnv *env, jobject obj)
 {
     RealTime *rt = getHandle<RealTime>(env, obj);
     return rt->msec();
 }
 
-jstring
+JNIEXPORT jstring JNICALL
 Java_org_vamp_1plugins_RealTime_toString(JNIEnv *env, jobject obj)
 {
     RealTime *rt = getHandle<RealTime>(env, obj);
     return env->NewStringUTF(rt->toString().c_str());
 }
 
-jstring
+JNIEXPORT jstring JNICALL
 Java_org_vamp_1plugins_RealTime_toText(JNIEnv *env, jobject obj)
 {
     RealTime *rt = getHandle<RealTime>(env, obj);
     return env->NewStringUTF(rt->toText().c_str());
 }    
 
-jobject
+JNIEXPORT jobject JNICALL
 Java_org_vamp_1plugins_RealTime_fromSeconds(JNIEnv *env, jclass cls, jdouble s)
 {
     jclass rtClass = env->FindClass("org/vamp_plugins/RealTime");
@@ -66,7 +66,8 @@
     return env->NewObject(rtClass, rtCtor, rt.sec, rt.nsec);
 }
 
-jobject Java_org_vamp_1plugins_RealTime_fromMilliseconds(JNIEnv *env, jclass cls, jint ms)
+JNIEXPORT jobject JNICALL
+Java_org_vamp_1plugins_RealTime_fromMilliseconds(JNIEnv *env, jclass cls, jint ms)
 {
     jclass rtClass = env->FindClass("org/vamp_plugins/RealTime");
     jmethodID rtCtor = env->GetMethodID(rtClass, "<init>", "(II)V");
@@ -74,7 +75,8 @@
     return env->NewObject(rtClass, rtCtor, rt.sec, rt.nsec);
 }
 
-jobject Java_org_vamp_1plugins_RealTime_frame2RealTime(JNIEnv *env, jclass cls, jlong frame, jint sampleRate)
+JNIEXPORT jobject JNICALL
+Java_org_vamp_1plugins_RealTime_frame2RealTime(JNIEnv *env, jclass cls, jlong frame, jint sampleRate)
 {
     jclass rtClass = env->FindClass("org/vamp_plugins/RealTime");
     jmethodID rtCtor = env->GetMethodID(rtClass, "<init>", "(II)V");
@@ -82,13 +84,15 @@
     return env->NewObject(rtClass, rtCtor, rt.sec, rt.nsec);
 }
 
-jlong Java_org_vamp_1plugins_RealTime_realTime2Frame(JNIEnv *env, jclass cls, jobject obj, jint sampleRate)
+JNIEXPORT jlong JNICALL
+Java_org_vamp_1plugins_RealTime_realTime2Frame(JNIEnv *env, jclass cls, jobject obj, jint sampleRate)
 {
     RealTime *rt = getHandle<RealTime>(env, obj);
     return RealTime::realTime2Frame(*rt, sampleRate);
 }
 
-void Java_org_vamp_1plugins_RealTime_initialise(JNIEnv *env, jobject obj, jint sec, jint nsec)
+JNIEXPORT void JNICALL
+Java_org_vamp_1plugins_RealTime_initialise(JNIEnv *env, jobject obj, jint sec, jint nsec)
 {
     RealTime *rt = new RealTime(sec, nsec);
     setHandle(env, obj, rt);