From fe598c4e4d672dfb9e6a9e4be25015a8c39e39f1 Mon Sep 17 00:00:00 2001 From: minjaesong Date: Sun, 7 Jan 2024 17:56:42 +0900 Subject: [PATCH] musicplayer: album change --- .../torvald/terrarum/musicplayer/gui/MusicPlayer.kt | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/MusicPlayer/src/net/torvald/terrarum/musicplayer/gui/MusicPlayer.kt b/MusicPlayer/src/net/torvald/terrarum/musicplayer/gui/MusicPlayer.kt index 19d6c5630..7f0e47bb8 100644 --- a/MusicPlayer/src/net/torvald/terrarum/musicplayer/gui/MusicPlayer.kt +++ b/MusicPlayer/src/net/torvald/terrarum/musicplayer/gui/MusicPlayer.kt @@ -422,6 +422,17 @@ class MusicPlayer(private val ingame: TerrarumIngame) : UICanvas() { val index = albumlistScroll + mouseOnList!! val list = albumsList//.map { albumPropCache[it] } + if (index < list.size) { + // if selected album is not the same album currently playing, queue that album immediately + // (navigating into the selected album involves too much complication :p) + if (ingame.musicGovernor.playlistSource != albumsList[index].canonicalPath) { + // fade out + AudioMixer.requestFadeOut(AudioMixer.musicTrack, AudioMixer.DEFAULT_FADEOUT_LEN / 3f) { + loadNewAlbum(albumsList[index]) + ingame.musicGovernor.startMusic() // required for "intermittent" mode + } + } + } } // unlatch the click latch else if (!Terrarum.mouseDown) {