diff --git a/app/build.gradle b/app/build.gradle index 5fd1f7b..33a0086 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -20,9 +20,10 @@ android { } dependencies { - compile fileTree(dir: 'libs', include: ['*.jar']) + compile fileTree(include: ['*.jar'], dir: 'libs') testCompile 'junit:junit:4.12' compile 'com.android.support:appcompat-v7:24.1.1' compile 'com.android.support:support-v4:24.1.1' compile 'com.android.support:design:24.1.1' + compile files('libs/TarsosDSP-Android-latest.jar') } diff --git a/app/libs/TarsosDSP-Android-latest.jar b/app/libs/TarsosDSP-Android-latest.jar new file mode 100644 index 0000000..6958bc3 Binary files /dev/null and b/app/libs/TarsosDSP-Android-latest.jar differ diff --git a/app/src/main/java/nonphatic/quoz/MainActivity.java b/app/src/main/java/nonphatic/quoz/MainActivity.java index a06832e..84c96b6 100644 --- a/app/src/main/java/nonphatic/quoz/MainActivity.java +++ b/app/src/main/java/nonphatic/quoz/MainActivity.java @@ -25,6 +25,11 @@ import android.view.View; import android.widget.TextView; import android.widget.Toast; +import be.tarsos.dsp.AudioDispatcher; +import be.tarsos.dsp.io.android.AudioDispatcherFactory; +import be.tarsos.dsp.onsets.ComplexOnsetDetector; +import be.tarsos.dsp.onsets.OnsetHandler; + import java.util.Random; import java.util.Timer; import java.util.TimerTask; @@ -300,7 +305,7 @@ public class MainActivity extends AppCompatActivity { }); } }; - timer.schedule(timerTask, 350, 555); + timer.schedule(timerTask, 300, 555); mediaPlayer = MediaPlayer.create(this, R.raw.ievan_polkka); mediaPlayer.setLooping(true); mediaPlayer.start(); @@ -317,13 +322,28 @@ public class MainActivity extends AppCompatActivity { }); } }; - timer.schedule(timerTask, 200, 425); + timer.schedule(timerTask, 180, 425); mediaPlayer = MediaPlayer.create(this, R.raw.nyan); mediaPlayer.setLooping(true); mediaPlayer.start(); + //testOnsets(); break; } } + + public void testOnsets() { + // needs ffmpeg??? + AudioDispatcher dispatcher = AudioDispatcherFactory.fromPipe("/res/raw/nyan.mp3", 44100,5000,2500); + ComplexOnsetDetector cod = new ComplexOnsetDetector(521, 0.3, 256.0/44100.0*4.0, -70); + dispatcher.addAudioProcessor(cod); + cod.setHandler(new OnsetHandler() { + @Override + public void handleOnset(double v, double v1) { + System.out.println(v); + } + }); + + } //endregion //region ACTIVITIES