eessppeelllloo/processing4
1
0
Fork 0
mirror of https://github.com/processing/processing4.git synced 2026-06-16 04:26:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

merge additions

Browse Source
This commit is contained in:
Ben Fry
2014-10-22 19:04:25 -04:00
parent 5051189c2d 53e348b597
commit deec670eee
25 changed files with 106 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/libraries/dxf/build.xml
+2 -2
View File
@@ -13,8 +13,8 @@
<fail unless="core-built" message="Please build the core library first and make sure it sits in ../../../core/library/core.jar" />
<mkdir dir="bin" />
<javac source="1.6"
target="1.6"
<javac source="1.7"
target="1.7"
srcdir="src" destdir="bin"
encoding="UTF-8"
includeAntRuntime="false"
java/libraries/glw/build.xml
+2 -2
View File
@@ -13,8 +13,8 @@
<fail unless="core-built" message="Please build the core library first and make sure it sits in ../../../core/library/core.jar" />
<mkdir dir="bin" />
<javac source="1.6"
target="1.6"
<javac source="1.7"
target="1.7"
srcdir="src" destdir="bin"
encoding="UTF-8"
includeAntRuntime="false"
java/libraries/lwjgl/build.xml
+2 -2
View File
@@ -13,8 +13,8 @@
<fail unless="core-built" message="Please build the core library first and make sure it sits in ../../../core/library/core.jar" />
<mkdir dir="bin" />
<javac source="1.6"
target="1.6"
<javac source="1.7"
target="1.7"
srcdir="src" destdir="bin"
encoding="UTF-8"
includeAntRuntime="false"
java/libraries/net/build.xml
+2 -2
View File
@@ -13,8 +13,8 @@
<fail unless="core-built" message="Please build the core library first and make sure it sits in ../../../core/library/core.jar" />
<mkdir dir="bin" />
<javac source="1.6"
target="1.6"
<javac source="1.7"
target="1.7"
srcdir="src" destdir="bin"
encoding="UTF-8"
includeAntRuntime="false"
java/libraries/pdf/build.xml
+2 -2
View File
@@ -13,8 +13,8 @@
<fail unless="core-built" message="Please build the core library first and make sure it sits in ../../../core/library/core.jar" />
<mkdir dir="bin" />
<javac source="1.6"
target="1.6"
<javac source="1.7"
target="1.7"
srcdir="src" destdir="bin"
encoding="UTF-8"
includeAntRuntime="false"
java/libraries/serial/build.xml
+2 -2
View File
@@ -13,8 +13,8 @@
<fail unless="core-built" message="Please build the core library first and make sure it sits in ../../../core/library/core.jar" />
<mkdir dir="bin" />
<javac source="1.6"
target="1.6"
<javac source="1.7"
target="1.7"
srcdir="src" destdir="bin"
encoding="UTF-8"
includeAntRuntime="false"
java/libraries/sound/build.xml
+2 -2
View File
@@ -13,8 +13,8 @@
<fail unless="core-built" message="Please build the core library first and make sure it sits in ../../../core/library/core.jar" />
<mkdir dir="bin" />
<javac source="1.6"
target="1.6"
<javac source="1.7"
target="1.7"
srcdir="src" destdir="bin"
encoding="UTF-8"
includeAntRuntime="false"
java/libraries/sound/src/cpp/processing_sound_MethClaInterface.cpp
+1
View File
@@ -81,6 +81,7 @@ JNIEXPORT jint JNICALL Java_processing_sound_MethClaInterface_engineNew (JNIEnv
.addLibrary(methcla_plugins_tri)
.addLibrary(methcla_plugins_pulse)
.addLibrary(methcla_soundfile_api_libsndfile)
.addLibrary(methcla_soundfile_api_mpg123)
.addLibrary(methcla_plugins_patch_cable)
.addLibrary(methcla_plugins_sampler)
.addLibrary(methcla_plugins_white_noise)
java/libraries/sound/src/processing/sound/Engine.java
+1 -1
View File
@@ -120,7 +120,7 @@ public class Engine {
};
public static int[] soundFilePlayMono(float rate, float pos, float amp, float add, boolean loop, String path, float dur, int cue){
return soundFilePlayMono(rate, pos, amp, add, loop, path, dur, cue);
return methCla.soundFilePlayMono(rate, pos, amp, add, loop, path, dur, cue);
};
public static int[] soundFilePlayMulti(float rate, float amp, float add, boolean loop, String path, float dur, int cue){
java/libraries/sound/src/processing/sound/SoundFile.java
+9 -3
View File
@@ -1,5 +1,6 @@
package processing.sound;
import processing.core.*;
import java.io.File;
public class SoundFile implements SoundObject {
@@ -14,8 +15,7 @@ public class SoundFile implements SoundObject {
float m_add=0;
int m_cue=0;
float m_pos=0;
boolean m_loop;
boolean m_loop;
public SoundFile(PApplet theParent, String path) {
this.parent = theParent;
@@ -24,7 +24,13 @@ public class SoundFile implements SoundObject {
m_engine.start();
methCla = new MethClaInterface();
m_filePath=theParent.dataPath(path);
m_info = m_engine.soundFileInfo(m_filePath);
File sample = new File(m_filePath);
if(sample.isFile() == true){
m_info = m_engine.soundFileInfo(m_filePath);
}
else {
System.out.println("Error: Soundfile doesn't exist. Pleae check path");
}
}
public int frames(){
java/libraries/sound/todo.txt
+1
View File
@@ -13,6 +13,7 @@
+ Fix problem of passing effects to Analyzers
+ Make audio input work
- Use Patch Cables for signal splitting for effects
+ Fix MP3 thing
Features:
+ Compile Windows Version