added start() play() for AudioIn

Author: wirsing

.gitignore

@@ -2,3 +2,5 @@
 *.o
 *.DS_Store
 *.class
+*./bin
+

examples/IO/AudioInput/AudioInput.pde

@@ -19,7 +19,7 @@ void setup() {
     input = new AudioIn(this, 0);
 
     // start the Audio Input
-    input.play();
+    input.start();
 
     // create a new Amplitude analyzer
     rms = new Amplitude(this);
@@ -44,3 +44,4 @@ void draw() {
     // We draw an ellispe coupled to the audio analysis
     ellipse(width/2, height/2, 1*scale, 1*scale);
 }
+

library/macosx/libMethClaInterface.jnilib

@@ -465,49 +465,59 @@ JNIEXPORT void JNICALL Java_processing_sound_MethClaInterface_pulseSet(JNIEnv *e
     env->ReleaseIntArrayElements(nodeId, m_nodeId, 0);
 };
 
-JNIEXPORT jintArray JNICALL Java_processing_sound_MethClaInterface_audioInPlay(JNIEnv *env, jobject object, jfloat amp, jfloat add, jfloat pos, jint in){
-
+JNIEXPORT jintArray JNICALL Java_processing_sound_MethClaInterface_audioInStart(JNIEnv *env , jobject object, jfloat amp, jfloat add, jfloat pos, jint in){
+    
     jintArray nodeId = env->NewIntArray(2);
     jint *m_nodeId = env->GetIntArrayElements(nodeId, NULL);
-
+    
     Methcla::AudioBusId bus = m_engine->audioBusId().alloc();
-
+    
     Methcla::Request request(engine());
     request.openBundle(Methcla::immediately);
 
     auto synth = request.synth(
-        METHCLA_PLUGINS_AUDIOIN_URI, 
-        engine().root(), 
-        {amp, add, pos}
-    );
-
+                               METHCLA_PLUGINS_AUDIOIN_URI,
+                               engine().root(),
+                               {amp, add, pos}
+                               );
+    
     auto pan = request.synth(
-            METHCLA_PLUGINS_PAN2_URI, 
-            engine().root(), 
-            {pos, 1.f},
-            {Methcla::Value(1.f)}
-    );
-
-    request.mapInput(synth.id(), 0, Methcla::AudioBusId(in), Methcla::kBusMappingExternal);
-    request.mapOutput(synth.id(), 0, bus); 
-    request.mapInput(pan.id(), 0, bus); 
+                             METHCLA_PLUGINS_PAN2_URI,
+                             engine().root(),
+                             {pos, 1.f},
+                             {Methcla::Value(1.f)}
+                             );
 
-    request.mapOutput(pan.id(), 0, Methcla::AudioBusId(0), Methcla::kBusMappingExternal);
-    request.mapOutput(pan.id(), 1, Methcla::AudioBusId(1), Methcla::kBusMappingExternal);
+    request.mapInput(synth.id(), 0, Methcla::AudioBusId(in), Methcla::kBusMappingExternal);
+    request.mapOutput(synth.id(), 0, bus);
+    request.mapInput(pan.id(), 0, bus);
 
-
     request.activate(synth.id());
     request.activate(pan.id());
-
+    
     request.closeBundle();
     request.send();
-            
+    
     m_nodeId[0]=synth.id();
     m_nodeId[1]= pan.id();
-
+    
     env->ReleaseIntArrayElements(nodeId, m_nodeId, 0);
-
+    
     return nodeId;
+
+};
+
+JNIEXPORT void JNICALL Java_processing_sound_MethClaInterface_audioInPlay(JNIEnv *env, jobject object, jint nodeId){
+
+    Methcla::Request request(engine());
+    request.openBundle(Methcla::immediately);
+    
+    request.mapOutput(nodeId, 0, Methcla::AudioBusId(0), Methcla::kBusMappingExternal);
+    request.mapOutput(nodeId, 1, Methcla::AudioBusId(1), Methcla::kBusMappingExternal);
+    
+    request.closeBundle();
+    request.send();
+
 };
 
 JNIEXPORT void JNICALL Java_processing_sound_MethClaInterface_audioInSet(JNIEnv *env, jobject object, jfloat amp, jfloat add, jfloat pos, jintArray nodeId){

src/cpp/include/processing_sound_MethClaInterface.h

@@ -20,23 +20,27 @@ public AudioIn (PApplet theParent, int in) {
     	m_in = in;
    	}
 
-	public void play(){
-		m_nodeId = m_engine.audioInPlay(m_amp, m_add, m_pos, m_in);
+   	public void start(){
+		m_nodeId = m_engine.audioInStart(m_amp, m_add, m_pos, m_in);
 	}
-
-	public void play(float amp, float add, float pos){
+	
+	public void start(float amp, float add, float pos){
 		m_amp=amp; m_add=add; m_pos=pos;
-		this.play();
+		this.start();
 	}
 
-	public void play(float amp, float add){
+	public void start(float amp, float add){
 		m_amp=amp; m_add=add;
-		this.play();
+		this.start();
 	}
 
-	public void play(float amp){
+	public void start(float amp){
 		m_amp=amp;
-		this.play();
+		this.start();
+	}
+
+	public void play(){
+		m_engine.audioInPlay(m_nodeId[1]);
 	}
 
 	private void set(){

src/cpp/processing_sound_MethClaInterface.cpp

@@ -105,8 +105,12 @@ public static void pulseSet(float freq, float width, float amp, float add, float
 
 	// AudioIn
 
-	public static int[] audioInPlay(float amp, float add, float pos, int in){
-		return methCla.audioInPlay(amp, add, pos, in);
+	public static int[] audioInStart(float amp, float add, float pos, int in){
+		return methCla.audioInStart(amp, add, pos, in);
+	};
+
+	public static void audioInPlay(int nodeId){
+		methCla.audioInPlay(nodeId);
 	};
 
   	public static void audioInSet(float amp, float add, float pos, int[] nodeId){

src/processing/sound/AudioIn.java

@@ -80,7 +80,9 @@ else if (osName.equals("Linux")){
 
   // Audio In
 
-  public native int[] audioInPlay(float amp, float add, float pos, int in);
+  public native int[] audioInStart(float amp, float add, float pos, int in);
+
+  public native void audioInPlay(int nodeId);
 
   public native void audioInSet(float amp, float add, float pos, int[] nodeId);