Fixed loop jump() issue

wirsing · wirsing · commit 1be7d980309f · 2014-07-06T17:47:04.000-07:00
diff --git a/java/libraries/sound/library/sound.jar b/java/libraries/sound/library/sound.jar
diff --git a/java/libraries/sound/src/processing/sound/Env.java b/java/libraries/sound/src/processing/sound/Env.java
@@ -17,6 +17,10 @@ public Env (PApplet theParent) {
 	public void play(SoundObject input, float attackTime, float sustainTime, float sustainLevel, float releaseTime){
 		m_nodeId = m_engine.envelopePlay(input.returnId(), attackTime, sustainTime, sustainLevel, releaseTime);
 	}
+
+	public int returnId(){
+		return m_nodeId;
+	}
 	
 	public void dispose(){
 		//m_engine.synthStop(m_nodeId);
diff --git a/java/libraries/sound/src/processing/sound/SoundFile.java b/java/libraries/sound/src/processing/sound/SoundFile.java
@@ -14,6 +14,7 @@ public class SoundFile implements SoundObject {
 	float m_add=0; 
 	int m_cue=0;
 	float m_pos=0; 
+	boolean m_loop;
 	
 	
 	public SoundFile(PApplet theParent, String path) {
@@ -43,6 +44,7 @@ public float duration(){
 	}
 	
 	public void play(){
+		m_loop=false;
 		if(this.channels() == 1){
 			m_nodeId = methCla.soundFilePlayMono(m_rate, m_pos, m_amp, m_add, false, m_filePath, this.duration()*(1/m_rate), m_cue);
 		}
@@ -77,6 +79,7 @@ public void play(float rate){
 	}
 	
 	public void loop(){
+		m_loop=true;
 		if(this.channels() < 2){
 			m_nodeId = methCla.soundFilePlayMono(m_rate, m_pos, m_amp, m_add, true, m_filePath, this.duration()*(1/m_rate), m_cue);
 		}
@@ -118,12 +121,24 @@ public void jump(float time){
         
         m_cue = (int)time * m_info[1];
         
-		if(this.channels() < 2){
-			m_nodeId = methCla.soundFilePlayMono(m_rate, m_pos, m_amp, m_add, false, m_filePath, this.duration()*(1/m_rate), m_cue);
-		}
-		else if(this.channels() == 2){
-			m_nodeId = methCla.soundFilePlayMulti(m_rate, m_amp, m_add, false, m_filePath, this.duration()*(1/m_rate), m_cue);
-		}
+        if(m_loop == true) {
+        	if(this.channels() < 2){
+				m_nodeId = methCla.soundFilePlayMono(m_rate, m_pos, m_amp, m_add, true, m_filePath, this.duration()*(1/m_rate), m_cue);
+			}
+			else if(this.channels() == 2){
+				m_nodeId = methCla.soundFilePlayMulti(m_rate, m_amp, m_add, true, m_filePath, this.duration()*(1/m_rate), m_cue);
+			}
+        }
+        else {
+  			if(this.channels() < 2){
+				m_nodeId = methCla.soundFilePlayMono(m_rate, m_pos, m_amp, m_add, false, m_filePath, this.duration()*(1/m_rate), m_cue);
+			}
+			else if(this.channels() == 2){
+				m_nodeId = methCla.soundFilePlayMulti(m_rate, m_amp, m_add, false, m_filePath, this.duration()*(1/m_rate), m_cue);
+			}	
+        }
+
+        m_cue = 0;
 	}
 	
 	public void cue(float time){
