Mercurial > hg > jvamp
comparison 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 |
comparison
equal
deleted
inserted
replaced
45:5cb76aa45ee5 | 46:91259f3449ae |
---|---|
107 { | 107 { |
108 Plugin *p = getHandle<Plugin>(env, obj); | 108 Plugin *p = getHandle<Plugin>(env, obj); |
109 PluginBase::ParameterList params = p->getParameterDescriptors(); | 109 PluginBase::ParameterList params = p->getParameterDescriptors(); |
110 jclass descClass = env->FindClass("org/vamp_plugins/ParameterDescriptor"); | 110 jclass descClass = env->FindClass("org/vamp_plugins/ParameterDescriptor"); |
111 jobjectArray result = env->NewObjectArray(params.size(), descClass, 0); | 111 jobjectArray result = env->NewObjectArray(params.size(), descClass, 0); |
112 for (int i = 0; i < params.size(); ++i) { | 112 for (int i = 0; i < (int)params.size(); ++i) { |
113 | 113 |
114 jmethodID ctor = env->GetMethodID(descClass, "<init>", "()V"); | 114 jmethodID ctor = env->GetMethodID(descClass, "<init>", "()V"); |
115 jobject desc = env->NewObject(descClass, ctor); | 115 jobject desc = env->NewObject(descClass, ctor); |
116 | 116 |
117 setStringField(env, desc, "identifier", params[i].identifier); | 117 setStringField(env, desc, "identifier", params[i].identifier); |
157 { | 157 { |
158 Plugin *p = getHandle<Plugin>(env, obj); | 158 Plugin *p = getHandle<Plugin>(env, obj); |
159 PluginBase::ProgramList programs = p->getPrograms(); | 159 PluginBase::ProgramList programs = p->getPrograms(); |
160 jobjectArray result = env->NewObjectArray | 160 jobjectArray result = env->NewObjectArray |
161 (programs.size(), env->FindClass("java/lang/String"), 0); | 161 (programs.size(), env->FindClass("java/lang/String"), 0); |
162 for (int i = 0; i < programs.size(); ++i) { | 162 for (int i = 0; i < (int)programs.size(); ++i) { |
163 env->SetObjectArrayElement(result, i, | 163 env->SetObjectArrayElement(result, i, |
164 env->NewStringUTF(programs[i].c_str())); | 164 env->NewStringUTF(programs[i].c_str())); |
165 } | 165 } |
166 return result; | 166 return result; |
167 } | 167 } |
251 { | 251 { |
252 Plugin *p = getHandle<Plugin>(env, obj); | 252 Plugin *p = getHandle<Plugin>(env, obj); |
253 Plugin::OutputList outputs = p->getOutputDescriptors(); | 253 Plugin::OutputList outputs = p->getOutputDescriptors(); |
254 jclass descClass = env->FindClass("org/vamp_plugins/OutputDescriptor"); | 254 jclass descClass = env->FindClass("org/vamp_plugins/OutputDescriptor"); |
255 jobjectArray result = env->NewObjectArray(outputs.size(), descClass, 0); | 255 jobjectArray result = env->NewObjectArray(outputs.size(), descClass, 0); |
256 for (int i = 0; i < outputs.size(); ++i) { | 256 for (int i = 0; i < (int)outputs.size(); ++i) { |
257 | 257 |
258 jmethodID ctor = env->GetMethodID(descClass, "<init>", "()V"); | 258 jmethodID ctor = env->GetMethodID(descClass, "<init>", "()V"); |
259 jobject desc = env->NewObject(descClass, ctor); | 259 jobject desc = env->NewObject(descClass, ctor); |
260 | 260 |
261 setStringField(env, desc, "identifier", outputs[i].identifier); | 261 setStringField(env, desc, "identifier", outputs[i].identifier); |
302 } | 302 } |
303 | 303 |
304 return result; | 304 return result; |
305 } | 305 } |
306 | 306 |
307 JNIEXPORT static jobject | 307 static jobject |
308 convertFeature(JNIEnv *env, const Plugin::Feature &feature) | 308 convertFeature(JNIEnv *env, const Plugin::Feature &feature) |
309 { | 309 { |
310 jclass featClass = env->FindClass("org/vamp_plugins/Feature"); | 310 jclass featClass = env->FindClass("org/vamp_plugins/Feature"); |
311 jmethodID ctor = env->GetMethodID(featClass, "<init>", "()V"); | 311 jmethodID ctor = env->GetMethodID(featClass, "<init>", "()V"); |
312 jobject jfeature = env->NewObject(featClass, ctor); | 312 jobject jfeature = env->NewObject(featClass, ctor); |
319 setStringField(env, jfeature, "label", feature.label); | 319 setStringField(env, jfeature, "label", feature.label); |
320 | 320 |
321 return jfeature; | 321 return jfeature; |
322 } | 322 } |
323 | 323 |
324 JNIEXPORT static jobject | 324 static jobject |
325 convertFeatures(JNIEnv *env, const Plugin::FeatureSet &features) | 325 convertFeatures(JNIEnv *env, const Plugin::FeatureSet &features) |
326 { | 326 { |
327 jobject result; | 327 jobject result; |
328 | 328 |
329 // FeatureSet is map<int, vector<Feature> > where Feature is a struct. | 329 // FeatureSet is map<int, vector<Feature> > where Feature is a struct. |