diff --git a/PlayWallNative/libNativeAudio.dylib b/PlayWallNative/libNativeAudio.dylib index fc1f2851992daee95ab3d3a81e050014735ddc5c..14afa4716652379483939e006f1d32ba3adde6bb 100644 Binary files a/PlayWallNative/libNativeAudio.dylib and b/PlayWallNative/libNativeAudio.dylib differ diff --git a/PlayWallNative/src/de/tobias/playpad/view/WaveformView.java b/PlayWallNative/src/de/tobias/playpad/view/WaveformView.java index 2e77bdd1b3f213d7ee02a6da62248558ae02d4aa..25029d49df5806ebd6ac9bbeba23d7941aeb091c 100644 --- a/PlayWallNative/src/de/tobias/playpad/view/WaveformView.java +++ b/PlayWallNative/src/de/tobias/playpad/view/WaveformView.java @@ -10,21 +10,24 @@ public class WaveformView extends Path { public WaveformView(float[] data) { getElements().add(new MoveTo(0, 0)); - double width = data.length / 1200.0; - + double width2 = data.length / 1200.0; + int width = data.length / 10000; + System.out.println(data.length); + System.out.println(width); + int i = 0; - for (i = 0; i < data.length; i+=1000) { + for (i = 0; i < data.length; i += width) { if (i < data.length) { - LineTo lineTo = new LineTo(i/width, data[i] * 50.0); - MoveTo moveTo = new MoveTo(i/width, data[i] * 50.0); + LineTo lineTo = new LineTo(i / width2, data[i] * 50.0); + MoveTo moveTo = new MoveTo(i / width2, data[i] * 50.0); getElements().addAll(lineTo, moveTo); } } - for (; i >= 0; i-=1000) { + for (; i >= 0; i -= width) { if (i >= 0 && i < data.length) { - LineTo lineTo = new LineTo(i/width, -data[i] * 50.0); - MoveTo moveTo = new MoveTo(i/width, -data[i] * 50.0); + LineTo lineTo = new LineTo(i / width2, -data[i] * 50.0); + MoveTo moveTo = new MoveTo(i / width2, -data[i] * 50.0); getElements().addAll(lineTo, moveTo); } diff --git a/PlayWallNative/test/de/tobias/playpad/WaveformTest.java b/PlayWallNative/test/de/tobias/playpad/WaveformTest.java index 20944d3ba1d5232527e26a0c1b1fe07ef073c9ff..704d8b6eb7971ccaf75343790d49ffb86f45199f 100644 --- a/PlayWallNative/test/de/tobias/playpad/WaveformTest.java +++ b/PlayWallNative/test/de/tobias/playpad/WaveformTest.java @@ -18,16 +18,19 @@ public class WaveformTest extends Application { @Override public void start(Stage primaryStage) throws Exception { -// float[] data = Waveform.createWaveform("/Users/tobias/Music/iTunes/iTunes Media/Music/Coldplay/Mylo Xyloto/04 Charlie Brown.mp3"); - float[] data = Waveform.createWaveform("/Users/tobias/Downloads/TNT-Loop.wav"); + float[] data = Waveform.createWaveform("/Users/tobias/Music/iTunes/iTunes Media/Music/Coldplay/Mylo Xyloto/04 Charlie Brown.mp3"); + float[] data2 = Waveform.createWaveform("/Users/tobias/Downloads/TNT-Loop.wav"); WaveformView view = new WaveformView(data); - + WaveformView view2 = new WaveformView(data2); + WritableImage image = new WritableImage(1200, 150); - view.snapshot(null, image ); - - VBox root = new VBox(new ImageView(image)); + view.snapshot(null, image); + WritableImage image2 = new WritableImage(1200, 150); + view2.snapshot(null, image2); + + VBox root = new VBox(new ImageView(image), new ImageView(image2)); Scene scene = new Scene(root); - + primaryStage.setScene(scene); primaryStage.show(); }