From 0f60a59df71fc2a7ff3d9a552b9de9d7a8eb15e9 Mon Sep 17 00:00:00 2001
From: Brendan Robert <brendan.robert@gmail.com>
Date: Mon, 2 Feb 2015 00:51:42 -0600
Subject: [PATCH] Small minor changes that have been sitting around collecting
 dust

---
 src/main/java/jace/core/Motherboard.java               |  3 +--
 .../jace/hardware/mockingboard/EnvelopeGenerator.java  |  2 ++
 .../jace/hardware/mockingboard/NoiseGenerator.java     |  1 +
 src/main/java/jace/hardware/mockingboard/PSG.java      | 10 +++++-----
 .../jace/hardware/mockingboard/SoundGenerator.java     |  1 +
 5 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/main/java/jace/core/Motherboard.java b/src/main/java/jace/core/Motherboard.java
index 258d955..8943c58 100644
--- a/src/main/java/jace/core/Motherboard.java
+++ b/src/main/java/jace/core/Motherboard.java
@@ -86,9 +86,8 @@ public class Motherboard extends TimedDevice {
             }
             clockCounter = cpuPerClock;
             computer.getVideo().doTick();
-            // Unrolled loop since this happens so often
             for (Optional<Card> card : cards) {
-                card.ifPresent(Card::doTick);
+                card.ifPresent(c -> c.doTick());
             }
             miscDevices.stream().forEach((m) -> {
                 m.doTick();
diff --git a/src/main/java/jace/hardware/mockingboard/EnvelopeGenerator.java b/src/main/java/jace/hardware/mockingboard/EnvelopeGenerator.java
index 02f3db5..10783ea 100644
--- a/src/main/java/jace/hardware/mockingboard/EnvelopeGenerator.java
+++ b/src/main/java/jace/hardware/mockingboard/EnvelopeGenerator.java
@@ -36,6 +36,7 @@ public class EnvelopeGenerator extends TimedGenerator {
         super(_clock, _sampleRate);
     }
 
+    @Override
     public int stepsPerCycle() {
         return 8;
     }
@@ -104,6 +105,7 @@ public class EnvelopeGenerator extends TimedGenerator {
         return amplitude;
     }
 
+    @Override
     public void reset() {
         super.reset();
         setShape(0);
diff --git a/src/main/java/jace/hardware/mockingboard/NoiseGenerator.java b/src/main/java/jace/hardware/mockingboard/NoiseGenerator.java
index 4444164..27ec51d 100644
--- a/src/main/java/jace/hardware/mockingboard/NoiseGenerator.java
+++ b/src/main/java/jace/hardware/mockingboard/NoiseGenerator.java
@@ -28,6 +28,7 @@ public class NoiseGenerator extends TimedGenerator {
     public NoiseGenerator(int _clock,int _sampleRate) {
         super(_clock, _sampleRate);
     }
+    @Override
     public int stepsPerCycle() {
         return 8;
     }
diff --git a/src/main/java/jace/hardware/mockingboard/PSG.java b/src/main/java/jace/hardware/mockingboard/PSG.java
index d8c7bc2..4911266 100644
--- a/src/main/java/jace/hardware/mockingboard/PSG.java
+++ b/src/main/java/jace/hardware/mockingboard/PSG.java
@@ -110,7 +110,7 @@ public class PSG {
     public PSG(int base, int clock, int sample_rate, String name) {
         this.name = name;
         baseReg = base;
-        channels = new ArrayList<SoundGenerator>();
+        channels = new ArrayList<>();
         for (int i = 0; i < 3; i++) {
             channels.add(new SoundGenerator(clock, sample_rate));
         }
@@ -155,9 +155,9 @@ public class PSG {
     public void setRate(int clock, int sample_rate) {
         CLOCK = clock;
         SAMPLE_RATE = sample_rate;
-        for (SoundGenerator c : channels) {
+        channels.stream().forEach((c) -> {
             c.setRate(clock, sample_rate);
-        }
+        });
         envelopeGenerator.setRate(clock, sample_rate);
         noiseGenerator.setRate(clock, sample_rate);
         reset();
@@ -170,9 +170,9 @@ public class PSG {
         }
         envelopeGenerator.reset();
         noiseGenerator.reset();
-        for (SoundGenerator c : channels) {
+        channels.parallelStream().forEach((c) -> {
             c.reset();
-        }
+        });
     }
 
     public void setReg(Reg r, int value) {
diff --git a/src/main/java/jace/hardware/mockingboard/SoundGenerator.java b/src/main/java/jace/hardware/mockingboard/SoundGenerator.java
index 3a06080..85d8963 100644
--- a/src/main/java/jace/hardware/mockingboard/SoundGenerator.java
+++ b/src/main/java/jace/hardware/mockingboard/SoundGenerator.java
@@ -70,6 +70,7 @@ public class SoundGenerator extends TimedGenerator {
         return invert ? -CardMockingboard.VolTable[vol] : CardMockingboard.VolTable[vol];
     }
     
+    @Override
     public void reset() {
         super.reset();
         amplitude = 0;