eessppeelllloo/processing4
1
0
Fork 0
mirror of https://github.com/processing/processing4.git synced 2026-01-28 10:51:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

added library folder + changed win build file for jnilib

Browse Source
This commit is contained in:
wirsing
2014-08-14 17:00:46 -07:00
parent 6b545888e0
commit 46e47ed994
4 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
java/libraries/sound/src/cpp/.gitignore vendored Normal file
View File

@@ -0,0 +1,3 @@
*.DS_Store
*.o
*.jnilib

8
java/libraries/sound/src/cpp/MakeFile_Win
View File

@@ -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

6
java/libraries/sound/src/cpp/processing_sound_MethClaInterface.cpp
View File

@@ -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);

6
java/libraries/sound/src/processing/sound/Engine.java
View File

@@ -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){