diff --git a/CHANGELOG.md b/CHANGELOG.md index 3965e14..49ba7d7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +- 1.24.5 + - Bug fix: MIDI CC signals can now be used to change frequency slider + + - 1.24.4 - Fix various bugs with MIDI synthesis - Attack and decay now applied to sine waves in background diff --git a/pom.xml b/pom.xml index d7b484e..9ec7e23 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ sh.ball osci-render - 1.24.4 + 1.24.5 osci-render diff --git a/src/main/java/sh/ball/gui/components/EffectComponentGroupController.java b/src/main/java/sh/ball/gui/components/EffectComponentGroupController.java index 94c9354..d2af15f 100644 --- a/src/main/java/sh/ball/gui/components/EffectComponentGroupController.java +++ b/src/main/java/sh/ball/gui/components/EffectComponentGroupController.java @@ -144,7 +144,7 @@ public class EffectComponentGroupController implements Initializable, SubControl } @Override - public void micSignalReceived() {} + public void slidersUpdated() {} public void setType(EffectType type) { this.type = type; diff --git a/src/main/java/sh/ball/gui/controller/EffectsController.java b/src/main/java/sh/ball/gui/controller/EffectsController.java index c81bba1..70480b6 100644 --- a/src/main/java/sh/ball/gui/controller/EffectsController.java +++ b/src/main/java/sh/ball/gui/controller/EffectsController.java @@ -178,5 +178,5 @@ public class EffectsController implements Initializable, SubController { } @Override - public void micSignalReceived() {} + public void slidersUpdated() {} } diff --git a/src/main/java/sh/ball/gui/controller/GeneralController.java b/src/main/java/sh/ball/gui/controller/GeneralController.java index c6943d7..9177a89 100644 --- a/src/main/java/sh/ball/gui/controller/GeneralController.java +++ b/src/main/java/sh/ball/gui/controller/GeneralController.java @@ -275,7 +275,7 @@ public class GeneralController implements Initializable, SubController { } @Override - public void micSignalReceived() {} + public void slidersUpdated() {} public void setFrameSourceName(String name) { this.frameSourceName = name; diff --git a/src/main/java/sh/ball/gui/controller/ImageController.java b/src/main/java/sh/ball/gui/controller/ImageController.java index 2cfe7aa..4813db6 100644 --- a/src/main/java/sh/ball/gui/controller/ImageController.java +++ b/src/main/java/sh/ball/gui/controller/ImageController.java @@ -247,7 +247,7 @@ public class ImageController implements Initializable, SubController { } @Override - public void micSignalReceived() { + public void slidersUpdated() { frequency.set(Math.pow(MAX_FREQUENCY, frequencySlider.getValue())); } } diff --git a/src/main/java/sh/ball/gui/controller/MainController.java b/src/main/java/sh/ball/gui/controller/MainController.java index da51658..e457043 100644 --- a/src/main/java/sh/ball/gui/controller/MainController.java +++ b/src/main/java/sh/ball/gui/controller/MainController.java @@ -792,6 +792,7 @@ public class MainController implements Initializable, FrequencyListener, MidiLis double scale = MidiNote.MAX_VELOCITY / (double) actualChannels; double zeroPoint = closestToZero / (double) MidiNote.MAX_VELOCITY; slider.setValue(getValueInSliderRange(slider, scale * ((correctedValue / (double) MidiNote.MAX_VELOCITY) - zeroPoint) + zeroPoint)); + subControllers().forEach(SubController::slidersUpdated); } }); } else if (cc == MidiNote.ALL_NOTES_OFF) { @@ -1140,7 +1141,7 @@ public class MainController implements Initializable, FrequencyListener, MidiLis } else if (sliderValue < slider.getMin()) { sliderValue = slider.getMin(); } - subControllers().forEach(SubController::micSignalReceived); + subControllers().forEach(SubController::slidersUpdated); sliders.get(i).setValue(sliderValue); } } diff --git a/src/main/java/sh/ball/gui/controller/ObjController.java b/src/main/java/sh/ball/gui/controller/ObjController.java index 723fdee..9a3e382 100644 --- a/src/main/java/sh/ball/gui/controller/ObjController.java +++ b/src/main/java/sh/ball/gui/controller/ObjController.java @@ -185,5 +185,5 @@ public class ObjController implements Initializable, SubController { } @Override - public void micSignalReceived() {} + public void slidersUpdated() {} } diff --git a/src/main/java/sh/ball/gui/controller/SubController.java b/src/main/java/sh/ball/gui/controller/SubController.java index 8b8d59d..70d8e9e 100644 --- a/src/main/java/sh/ball/gui/controller/SubController.java +++ b/src/main/java/sh/ball/gui/controller/SubController.java @@ -24,5 +24,5 @@ public interface SubController { void load(Element root); - void micSignalReceived(); + void slidersUpdated(); }