diff src/Plugin.cpp @ 46:91259f3449ae

Win32/VC++ build fixes and project
author Chris Cannam <chris.cannam@eecs.qmul.ac.uk>
date Wed, 06 Mar 2013 13:38:05 +0000
parents c9515589be7d
children 2db3640905ef
line wrap: on
line diff
--- a/src/Plugin.cpp	Mon Feb 25 21:47:00 2013 +0000
+++ b/src/Plugin.cpp	Wed Mar 06 13:38:05 2013 +0000
@@ -109,7 +109,7 @@
     PluginBase::ParameterList params = p->getParameterDescriptors();
     jclass descClass = env->FindClass("org/vamp_plugins/ParameterDescriptor");
     jobjectArray result = env->NewObjectArray(params.size(), descClass, 0);
-    for (int i = 0; i < params.size(); ++i) {
+    for (int i = 0; i < (int)params.size(); ++i) {
 
 	jmethodID ctor = env->GetMethodID(descClass, "<init>", "()V");
 	jobject desc = env->NewObject(descClass, ctor);
@@ -159,7 +159,7 @@
     PluginBase::ProgramList programs = p->getPrograms();
     jobjectArray result = env->NewObjectArray
 	(programs.size(), env->FindClass("java/lang/String"), 0);
-    for (int i = 0; i < programs.size(); ++i) {
+    for (int i = 0; i < (int)programs.size(); ++i) {
 	env->SetObjectArrayElement(result, i,
 				   env->NewStringUTF(programs[i].c_str()));
     }
@@ -253,7 +253,7 @@
     Plugin::OutputList outputs = p->getOutputDescriptors();
     jclass descClass = env->FindClass("org/vamp_plugins/OutputDescriptor");
     jobjectArray result = env->NewObjectArray(outputs.size(), descClass, 0);
-    for (int i = 0; i < outputs.size(); ++i) {
+    for (int i = 0; i < (int)outputs.size(); ++i) {
 
 	jmethodID ctor = env->GetMethodID(descClass, "<init>", "()V");
 	jobject desc = env->NewObject(descClass, ctor);
@@ -304,7 +304,7 @@
     return result;
 }
 
-JNIEXPORT static jobject
+static jobject
 convertFeature(JNIEnv *env, const Plugin::Feature &feature)
 {
     jclass featClass = env->FindClass("org/vamp_plugins/Feature");
@@ -321,7 +321,7 @@
     return jfeature;
 }
 
-JNIEXPORT static jobject
+static jobject
 convertFeatures(JNIEnv *env, const Plugin::FeatureSet &features)
 {
     jobject result;