diff src/RealTime.cpp @ 30:02db37c2301b

Add JNIEXPORT/JNICALL to definitions
author Chris Cannam
date Thu, 22 Nov 2012 11:38:55 +0000
parents 0a91d898acc3
children c9515589be7d
line wrap: on
line diff
--- 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);