diff --git a/java/libraries/sound/src/cpp/.gitignore b/java/libraries/sound/src/cpp/.gitignore new file mode 100644 index 000000000..09ffb6757 --- /dev/null +++ b/java/libraries/sound/src/cpp/.gitignore @@ -0,0 +1,3 @@ +*.DS_Store +*.o +*.jnilib diff --git a/java/libraries/sound/src/cpp/MakeFile_Win b/java/libraries/sound/src/cpp/MakeFile_Win index f4816d288..4aad7b2c9 100644 --- a/java/libraries/sound/src/cpp/MakeFile_Win +++ b/java/libraries/sound/src/cpp/MakeFile_Win @@ -1,11 +1,11 @@ all: - g++ -Ic:/Java/jdk1.7.0_60/include -Ic:/Java/jdk1.7.0_60/include/win32 -I./include -std=c++11 -g -c processing_sound_MethClaInterface.cpp; - g++ -dynamiclib -lmethcla -L../../library/macosx/ -o libMethClaInterface.jnilib *.o; + g++ -Ic:/Java/jdk1.8.0_11/include -Ic:/Java/jdk1.8.0_11/include/win32 -I./include -std=c++11 -g -c processing_sound_MethClaInterface.cpp; + g++ -dynamiclib -lmethcla -L../../library/windows32/ -o libMethClaInterface.dll *.o; clean: rm *.o - rm *.jnilib + rm *.dll install: - cp libMethClaInterface.jnilib ../../lib/macosx + cp libMethClaInterface.dll ../../lib/windows32 diff --git a/java/libraries/sound/src/cpp/processing_sound_MethClaInterface.cpp b/java/libraries/sound/src/cpp/processing_sound_MethClaInterface.cpp index 796bb8593..ed3fb21ac 100644 --- a/java/libraries/sound/src/cpp/processing_sound_MethClaInterface.cpp +++ b/java/libraries/sound/src/cpp/processing_sound_MethClaInterface.cpp @@ -562,7 +562,7 @@ JNIEXPORT jintArray JNICALL Java_processing_sound_MethClaInterface_soundFilePlay { amp, rate }, { Methcla::Value(str), Methcla::Value(loop), - Methcla::Value(cue) } + Methcla::Value(int(cue)) } ); auto pan = request.synth( @@ -627,7 +627,7 @@ JNIEXPORT jintArray JNICALL Java_processing_sound_MethClaInterface_soundFilePlay { amp, rate }, { Methcla::Value(str), Methcla::Value(loop), - Methcla::Value(cue) } + Methcla::Value(int(cue)) } ); auto after = request.synth( @@ -1228,7 +1228,7 @@ JNIEXPORT jlong JNICALL Java_processing_sound_MethClaInterface_fft(JNIEnv *env, METHCLA_PLUGINS_FFT_URI, Methcla::NodePlacement::after(m_nodeId[0]), {}, - {Methcla::Value(fftSize)} + {Methcla::Value(int(fftSize))} ); request.mapOutput(m_nodeId[0], 0, in_bus); diff --git a/java/libraries/sound/src/processing/sound/Engine.java b/java/libraries/sound/src/processing/sound/Engine.java index 9d03657b9..c03ca63e0 100644 --- a/java/libraries/sound/src/processing/sound/Engine.java +++ b/java/libraries/sound/src/processing/sound/Engine.java @@ -217,6 +217,12 @@ public class Engine { methCla.reverbSet(room, damp, wet, nodeId); }; + // Mix + + public static int[] mixPlay(int[] input, float[] amp){ + return methCla.mixPlay(input, amp); + }; + // Amplitude Follower public static long amplitude(int[] nodeId){