From 46c93bf04a5a6a2ad24be9bcf47581dd75a9232e Mon Sep 17 00:00:00 2001 From: RubbaBoy Date: Tue, 7 Jul 2020 01:13:11 -0400 Subject: Downgraded to Java 8 Includes a minor logging fix --- src/main/resources/log4j.xml | 15 --------------- src/test/java/com/jsyn/engine/TestWaveFileReadWrite.java | 2 +- src/test/java/com/jsyn/ports/TestSequentialData.java | 4 ++-- .../java/com/jsyn/unitgen/TestEnvelopeAttackDecay.java | 8 ++++---- src/test/resources/log4j.xml | 15 +++++++++++++++ 5 files changed, 22 insertions(+), 22 deletions(-) delete mode 100644 src/main/resources/log4j.xml create mode 100644 src/test/resources/log4j.xml (limited to 'src') diff --git a/src/main/resources/log4j.xml b/src/main/resources/log4j.xml deleted file mode 100644 index cc107b1..0000000 --- a/src/main/resources/log4j.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/src/test/java/com/jsyn/engine/TestWaveFileReadWrite.java b/src/test/java/com/jsyn/engine/TestWaveFileReadWrite.java index b5051e6..a027d0b 100644 --- a/src/test/java/com/jsyn/engine/TestWaveFileReadWrite.java +++ b/src/test/java/com/jsyn/engine/TestWaveFileReadWrite.java @@ -43,7 +43,7 @@ public class TestWaveFileReadWrite { writer.setSamplesPerFrame(numChannels); writer.setBitsPerSample(16); - for (var datum : data) { + for (float datum : data) { writer.write(datum); } writer.close(); diff --git a/src/test/java/com/jsyn/ports/TestSequentialData.java b/src/test/java/com/jsyn/ports/TestSequentialData.java index 2f27ec2..f95ebcb 100644 --- a/src/test/java/com/jsyn/ports/TestSequentialData.java +++ b/src/test/java/com/jsyn/ports/TestSequentialData.java @@ -37,8 +37,8 @@ public class TestSequentialData { @Test public void testCrossfade() { - var sample1 = new FloatSample(data1); - var sample2 = new FloatSample(data2); + FloatSample sample1 = new FloatSample(data1); + FloatSample sample2 = new FloatSample(data2); SequentialDataCrossfade xfade = new SequentialDataCrossfade(); xfade.setup(sample1, 4, 3, sample2, 1, 6); diff --git a/src/test/java/com/jsyn/unitgen/TestEnvelopeAttackDecay.java b/src/test/java/com/jsyn/unitgen/TestEnvelopeAttackDecay.java index 8328bb7..b30d9f1 100644 --- a/src/test/java/com/jsyn/unitgen/TestEnvelopeAttackDecay.java +++ b/src/test/java/com/jsyn/unitgen/TestEnvelopeAttackDecay.java @@ -43,7 +43,7 @@ public class TestEnvelopeAttackDecay extends TestUnitGate { @Test public void testOnOff() throws InterruptedException { - var envelope = new EnvelopeAttackDecay(); + EnvelopeAttackDecay envelope = new EnvelopeAttackDecay(); synthesisEngine.add(envelope); envelope.attack.set(0.1); @@ -81,7 +81,7 @@ public class TestEnvelopeAttackDecay extends TestUnitGate { @Test public void testRetrigger() throws InterruptedException { - var envelope = new EnvelopeAttackDecay(); + EnvelopeAttackDecay envelope = new EnvelopeAttackDecay(); synthesisEngine.add(envelope); envelope.attack.set(0.1); @@ -117,9 +117,9 @@ public class TestEnvelopeAttackDecay extends TestUnitGate { @Test public void testAutoDisable() throws InterruptedException { - var ramp = new LinearRamp(); + LinearRamp ramp = new LinearRamp(); synthesisEngine.add(ramp); - var envelope = new EnvelopeAttackDecay(); + EnvelopeAttackDecay envelope = new EnvelopeAttackDecay(); envelope.attack.set(0.1); envelope.decay.set(0.1); synthesisEngine.add(envelope); diff --git a/src/test/resources/log4j.xml b/src/test/resources/log4j.xml new file mode 100644 index 0000000..43fb2e0 --- /dev/null +++ b/src/test/resources/log4j.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + -- cgit v1.2.3