Skip to content

Commit 96c6bf8

Browse files
wirsingwirsing
committed
added library folder + changed win build file for jnilib
1 parent 5fa16c2 commit 96c6bf8

File tree

8 files changed

+16
-7
lines changed

8 files changed

+16
-7
lines changed

java/libraries/sound/library/linux/libMethClaInterface.so renamed to java/libraries/sound/library/linux64/libMethClaInterface.so

File renamed without changes.

java/libraries/sound/library/linux/libmethcla.so renamed to java/libraries/sound/library/linux64/libmethcla.so

File renamed without changes.

‎java/libraries/sound/library/macosx/libMethClaInterface.jnilib‎

0 Bytes
Binary file not shown.

‎java/libraries/sound/src/cpp/.gitignore‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
*.DS_Store
2+
*.o
3+
*.jnilib

‎java/libraries/sound/src/cpp/MakeFile_Win‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
all:
22

3-
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;
4-
g++ -dynamiclib -lmethcla -L../../library/macosx/ -o libMethClaInterface.jnilib *.o;
3+
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;
4+
g++ -dynamiclib -lmethcla -L../../library/windows32/ -o libMethClaInterface.dll *.o;
55

66
clean:
77
rm *.o
8-
rm *.jnilib
8+
rm *.dll
99

1010
install:
11-
cp libMethClaInterface.jnilib ../../lib/macosx
11+
cp libMethClaInterface.dll ../../lib/windows32

‎java/libraries/sound/src/cpp/libMethClaInterface.jnilib‎

-331 KB
Binary file not shown.

‎java/libraries/sound/src/cpp/processing_sound_MethClaInterface.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -562,7 +562,7 @@ JNIEXPORT jintArray JNICALL Java_processing_sound_MethClaInterface_soundFilePlay
562562
{ amp, rate },
563563
{ Methcla::Value(str),
564564
Methcla::Value(loop),
565-
Methcla::Value(cue) }
565+
Methcla::Value(int(cue)) }
566566
);
567567

568568
auto pan = request.synth(
@@ -627,7 +627,7 @@ JNIEXPORT jintArray JNICALL Java_processing_sound_MethClaInterface_soundFilePlay
627627
{ amp, rate },
628628
{ Methcla::Value(str),
629629
Methcla::Value(loop),
630-
Methcla::Value(cue) }
630+
Methcla::Value(int(cue)) }
631631
);
632632

633633
auto after = request.synth(
@@ -1228,7 +1228,7 @@ JNIEXPORT jlong JNICALL Java_processing_sound_MethClaInterface_fft(JNIEnv *env,
12281228
METHCLA_PLUGINS_FFT_URI,
12291229
Methcla::NodePlacement::after(m_nodeId[0]),
12301230
{},
1231-
{Methcla::Value(fftSize)}
1231+
{Methcla::Value(int(fftSize))}
12321232
);
12331233

12341234
request.mapOutput(m_nodeId[0], 0, in_bus);

‎java/libraries/sound/src/processing/sound/Engine.java‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -217,6 +217,12 @@ public static void reverbSet(float room, float damp, float wet, int nodeId){
217217
methCla.reverbSet(room, damp, wet, nodeId);
218218
};
219219

220+
// Mix
221+
222+
public static int[] mixPlay(int[] input, float[] amp){
223+
return methCla.mixPlay(input, amp);
224+
};
225+
220226
// Amplitude Follower
221227

222228
public static long amplitude(int[] nodeId){

0 commit comments

Comments
 (0)