Mercurial > hg > jvamp

changeset 27:59b4150c69cb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Chris Cannam
date Fri, 16 Nov 2012 08:01:01 +0000
parents fd185c6a74d2 (current diff) b568b30c167f (diff)
children f2914a92b553
files src/Plugin.cpp
diffstat 2 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/org/vamp_plugins/Plugin.java	Wed Nov 14 21:47:31 2012 +0000
+++ b/org/vamp_plugins/Plugin.java	Fri Nov 16 08:01:01 2012 +0000
@@ -37,7 +37,7 @@
 
     public native void reset();
     
-    public static enum InputDomain { TimeDomain, FrequencyDomain };
+    public static enum InputDomain { TIME_DOMAIN, FREQUENCY_DOMAIN };
     public native InputDomain getInputDomain();
     
     public native int getPreferredBlockSize();
--- a/src/Plugin.cpp	Wed Nov 14 21:47:31 2012 +0000
+++ b/src/Plugin.cpp	Fri Nov 16 08:01:01 2012 +0000
@@ -173,8 +173,8 @@
 
     jclass ourEnumClass = env->FindClass("org/vamp_plugins/Plugin$InputDomain");
 
-    std::string dname = "TimeDomain";
-    if (d == Plugin::FrequencyDomain) dname = "FrequencyDomain";
+    std::string dname = "TIME_DOMAIN";
+    if (d == Plugin::FrequencyDomain) dname = "FREQUENCY_DOMAIN";
 
     jstring sn = env->NewStringUTF(dname.c_str());
     jobject e = env->CallStaticObjectMethod