From dc3451f0fd120fd47dc362aa16c30234262be972 Mon Sep 17 00:00:00 2001 From: Matthias Date: Sun, 28 Jul 2024 20:59:04 +0200 Subject: [PATCH] Revert breaking changes for now (will be re-added in a later version) Signed-off-by: Matthias --- core/build.gradle.kts | 2 +- .../de/pottgames/tuningfork/jukebox/JukeBox.java | 14 -------------- .../pottgames/tuningfork/jukebox/JukeBoxEvent.java | 2 +- 3 files changed, 2 insertions(+), 16 deletions(-) diff --git a/core/build.gradle.kts b/core/build.gradle.kts index 3051100..ad68815 100644 --- a/core/build.gradle.kts +++ b/core/build.gradle.kts @@ -6,7 +6,7 @@ val junitJupiterPlatformLauncherVersion: String by project val flacLibraryJavaVersion: String by project buildscript { - project.version = "5.0.0" + project.version = "4.4.0" project.group = "de.pottgames" } diff --git a/core/src/main/java/de/pottgames/tuningfork/jukebox/JukeBox.java b/core/src/main/java/de/pottgames/tuningfork/jukebox/JukeBox.java index 8c04954..1eed178 100644 --- a/core/src/main/java/de/pottgames/tuningfork/jukebox/JukeBox.java +++ b/core/src/main/java/de/pottgames/tuningfork/jukebox/JukeBox.java @@ -163,9 +163,7 @@ protected float fadeOut(SongSource source, SongSettings settings, float playback * @param volume */ public void setVolume(float volume) { - final float oldVolume = this.volume; this.volume = MathUtils.clamp(volume, 0f, 1f); - this.pushVolumeEvent(oldVolume, this.volume); } @@ -409,15 +407,6 @@ public void removeObserver(JukeBoxObserver observer) { } - protected void pushVolumeEvent(float oldVolume, float newVolume) { - final JukeBoxEvent event = this.eventPool.obtain(); - event.setType(JukeBoxEventType.MASTER_VOLUME_CHANGE); - event.setOldVolume(oldVolume); - event.setNewVolume(newVolume); - this.eventHistory.add(event); - } - - protected void pushEvent(JukeBoxEventType type) { final JukeBoxEvent event = this.eventPool.obtain(); event.setType(type); @@ -470,9 +459,6 @@ protected void handleEvents() { break; case NONE: break; - case MASTER_VOLUME_CHANGE: - this.notifyVolumeChange(event.getOldVolume(), event.getNewVolume()); - break; } this.eventPool.free(event); } diff --git a/core/src/main/java/de/pottgames/tuningfork/jukebox/JukeBoxEvent.java b/core/src/main/java/de/pottgames/tuningfork/jukebox/JukeBoxEvent.java index 94c2b2f..b22833c 100644 --- a/core/src/main/java/de/pottgames/tuningfork/jukebox/JukeBoxEvent.java +++ b/core/src/main/java/de/pottgames/tuningfork/jukebox/JukeBoxEvent.java @@ -77,7 +77,7 @@ public void setNewVolume(float newVolume) { public enum JukeBoxEventType { - SONG_START, SONG_END, PLAYLIST_START, PLAYLIST_END, JUKEBOX_START, JUKEBOX_END, JUKEBOX_PAUSE, MASTER_VOLUME_CHANGE, NONE + SONG_START, SONG_END, PLAYLIST_START, PLAYLIST_END, JUKEBOX_START, JUKEBOX_END, JUKEBOX_PAUSE, NONE } }