# HG changeset patch
# User Chris Cannam
# Date 1353052861 0
# Node ID 59b4150c69cba83e0b3918e6770261403f8521ea
# Parent  fd185c6a74d215fbed2b2a14d67f80de5d3a65ac# Parent  b568b30c167f4894ce61f75223a9e0ce358303bb
Merge

diff -r fd185c6a74d2 -r 59b4150c69cb org/vamp_plugins/Plugin.java
--- 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();
diff -r fd185c6a74d2 -r 59b4150c69cb src/Plugin.cpp
--- 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