Merge branch 'master' of [email protected]:mhroth/jvsthost

Conflicts:

	JVstHost.jar
	build.properties
	src/com/synthbot/minihost/GuiMiniHost.java
	src/com/synthbot/minihost/PluginStringGui.java
	src/com/synthbot/minihost/PluginStringGuiListener.java
	src/com/synthbot/minihost/RandomMiniHost.java

Author: yeeking

build.properties

@@ -1,6 +1,11 @@
 jar.name=JVstHost.jar
+<<<<<<< HEAD:build.properties
 jar.main-class=com.synthbot.minihost.RandomMiniHost
 #jar.main-class=com.synthbot.minihost.GuiMiniHost
+=======
+#jar.main-class=com.synthbot.minihost.RandomMiniHost
+jar.main-class=com.synthbot.minihost.GuiMiniHost
+>>>>>>> 38d4e38f121fc5dfbecfaa62bf906c7c7ca8072d:build.properties
 jar.version=0.1
 args=/home/matthew/Documents/Research/TestVsts/jvstwrapper-0.9g.so
 #args=./mdaDX10.so

jvsthost.dll

@@ -261,6 +261,10 @@ void opcode2string(VstInt32 opcode, VstIntPtr value, JNIEnv *env) {
       message = env->NewStringUTF("audioMasterWantMidi: DEPRECATED in VST 2.4");
       break;
     }
+    case 14: { // audioMasterNeedIdle
+      message = env->NewStringUTF("audioMasterNeedIdle: DEPRECATED in VST 2.4");
+      break;
+    }
     default: {
       char *str = (char *) malloc(sizeof(char) * 100);
       sprintf(str, "Opcode not recognized: %i", opcode);

src/com/synthbot/audioplugin/vst/JVstHost.cpp

@@ -1,4 +1,4 @@
-gcc -mno-cygwin -D__int64="long long" -o jvsthost.dll -shared -O3 -w  -Wl,--add-stdcall-alias \
+gcc -mno-cygwin -D__int64="long long" -o jvsthost.dll -shared -O3 -w -Wl,--add-stdcall-alias \
 -I. \
 -I/cygdrive/c/Java/jdk1.6.0_10/include \
 -I/cygdrive/c/Java/jdk1.6.0_10/include/win32 \
@@ -11,3 +11,4 @@ JVstHost.cpp \
 ls -l jvsthost.dll
 echo copying jvsthost.dll to C:/WINDOWS/system32
 cp jvsthost.dll /cygdrive/c/WINDOWS/system32
+mv jvsthost.dll ../../../../../