Kotlin 2.0 migration

src/net/torvald/terrarum/modulebasegame/BuildingMaker.kt

@@ -62,7 +62,7 @@ class BuildingMaker(batch: FlippingSpriteBatch) : IngameInstance(batch) {
 
     lateinit var gameWorld: GameWorld
 
-    override val backgroundMusicPlayer = TerrarumBackgroundMusicPlayer()
+    override val musicStreamer = TerrarumMusicStreamer()
 
     init {
         gameUpdateGovernor = ConsistentUpdateRate
@@ -396,7 +396,7 @@ class BuildingMaker(batch: FlippingSpriteBatch) : IngameInstance(batch) {
         }
 
 
-        backgroundMusicPlayer.update(this, delta)
+        musicStreamer.update(this, delta)
     }
 
 
@@ -495,7 +495,7 @@ class BuildingMaker(batch: FlippingSpriteBatch) : IngameInstance(batch) {
 //        blockMarkings.dispose()
         uiPenMenu.dispose()
         uiGetPoiName.dispose()
-        backgroundMusicPlayer.dispose()
+        musicStreamer.dispose()
     }
 
     fun getPoiNameForExport(w: Int, h: Int, callback: (String) -> Unit) {

src/net/torvald/terrarum/modulebasegame/TerrarumIngame.kt

@@ -262,7 +262,7 @@ open class TerrarumIngame(batch: FlippingSpriteBatch) : IngameInstance(batch) {
     override var gameFullyLoaded = false
         internal set
 
-    override val backgroundMusicPlayer = TerrarumBackgroundMusicPlayer()
+    override val musicStreamer = TerrarumMusicStreamer()
 
 
     //////////////
@@ -1006,7 +1006,7 @@ open class TerrarumIngame(batch: FlippingSpriteBatch) : IngameInstance(batch) {
             oldSelectedWireRenderClass = selectedWireRenderClass
         }
 
-        backgroundMusicPlayer.update(this, delta)
+        musicStreamer.update(this, delta)
 
         ////////////////////////
         // ui-related updates //
@@ -1795,7 +1795,7 @@ open class TerrarumIngame(batch: FlippingSpriteBatch) : IngameInstance(batch) {
             catch (e: IllegalArgumentException) {}
         }
 
-        backgroundMusicPlayer.dispose()
+        musicStreamer.dispose()
         super.dispose()
     }
 }

src/net/torvald/terrarum/modulebasegame/TerrarumMusicStreamer.kt

@@ -11,7 +11,7 @@ import net.torvald.terrarum.audio.audiobank.MusicContainer
 import net.torvald.terrarum.gameworld.WorldTime.Companion.DAY_LENGTH
 import java.io.File
 
-class TerrarumBackgroundMusicPlayer : BackgroundMusicPlayer() {
+class TerrarumMusicStreamer : MusicStreamer() {
     private val STATE_INIT = 0
     private val STATE_FIREPLAY = 1
     private val STATE_PLAYING = 2
@@ -30,41 +30,7 @@ class TerrarumBackgroundMusicPlayer : BackgroundMusicPlayer() {
     private var shuffled = true
     private var diskJockeyingMode = "intermittent" // intermittent, continuous
 
-    private fun registerSongsFromDir(musicDir: String, fileToName: ((String) -> String)?) {
-        val musicDir = musicDir.replace('\\', '/')
-        playlistSource = musicDir
-        printdbg(this, "registerSongsFromDir $musicDir")
 
-        val fileToName = if (fileToName == null) {
-            { name: String -> name.substringBeforeLast('.').replace('_', ' ').split(" ").map { it.capitalize() }.joinToString(" ") }
-        }
-        else fileToName
-
-        playlistName = musicDir.substringAfterLast('/')
-
-        playlist = File(musicDir).listFiles()?.sortedBy { it.name }?.mapNotNull {
-            printdbg(this, "Music: ${it.absolutePath}")
-            try {
-                MusicContainer(
-                    fileToName(it.name),
-                    it
-                ).also { muscon ->
-
-                    printdbg(this, "MusicTitle: ${muscon.name}")
-
-                    muscon.songFinishedHook =  {
-                        if (App.audioMixer.musicTrack.currentTrack == it) {
-                            stopMusic(this, true, getRandomMusicInterval())
-                        }
-                    }
-                }
-            }
-            catch (e: GdxRuntimeException) {
-                e.printStackTrace()
-                null
-            }
-        } ?: emptyList() // TODO test code
-    }
 
     private fun restockMusicBin() {
         musicBin = ArrayList(if (shuffled) playlist.shuffled() else playlist.slice(playlist.indices))
@@ -232,7 +198,7 @@ class TerrarumBackgroundMusicPlayer : BackgroundMusicPlayer() {
         val timeNow = System.currentTimeMillis()
         val trackThis = App.audioMixer.musicTrack.currentTrack
 
-        if (caller is TerrarumBackgroundMusicPlayer) {
+        if (caller is TerrarumMusicStreamer) {
             if (stopCaller == null) {
 //                printdbg(this, "Caller: this, prev caller: $stopCaller, len: $pauseLen, obliging stop request")
                 stopMusic0(trackThis, callStopMusicHook, pauseLen)

src/net/torvald/terrarum/modulebasegame/gameactors/FixtureJukebox.kt

@@ -19,7 +19,7 @@ import net.torvald.terrarum.gameactors.Hitbox
 import net.torvald.terrarum.gameactors.Lightbox
 import net.torvald.terrarum.gameitems.ItemID
 import net.torvald.terrarum.langpack.Lang
-import net.torvald.terrarum.modulebasegame.TerrarumBackgroundMusicPlayer
+import net.torvald.terrarum.modulebasegame.TerrarumMusicStreamer
 import net.torvald.terrarum.modulebasegame.gameitems.FixtureItemBase
 import net.torvald.terrarum.modulebasegame.gameitems.ItemFileRef
 import net.torvald.terrarum.modulebasegame.gameitems.MusicDiscHelper
@@ -106,7 +106,7 @@ class FixtureJukebox : Electric, PlaysMusic {
 
         // supress the normal background music playback
         if (musicIsPlaying && !flagDespawn) {
-            (INGAME.backgroundMusicPlayer as TerrarumBackgroundMusicPlayer).stopMusic(this, true)
+            (INGAME.musicStreamer as TerrarumMusicStreamer).stopMusic(this, true)
         }
     }
 
@@ -138,7 +138,7 @@ class FixtureJukebox : Electric, PlaysMusic {
                 printdbg(this, "Stop music $title - $artist")
 
                 // can't call stopDiscPlayback() because of the recursion
-                (INGAME.backgroundMusicPlayer as TerrarumBackgroundMusicPlayer).stopMusic(this, pauseLen = (INGAME.backgroundMusicPlayer as TerrarumBackgroundMusicPlayer).getRandomMusicInterval())
+                (INGAME.musicStreamer as TerrarumMusicStreamer).stopMusic(this, pauseLen = (INGAME.musicStreamer as TerrarumMusicStreamer).getRandomMusicInterval())
             }
 
             discCurrentlyPlaying = index
@@ -185,7 +185,7 @@ class FixtureJukebox : Electric, PlaysMusic {
      */
     fun stopGracefully() {
         stopDiscPlayback()
-        (INGAME.backgroundMusicPlayer as TerrarumBackgroundMusicPlayer).stopMusic(this, pauseLen = (INGAME.backgroundMusicPlayer as TerrarumBackgroundMusicPlayer).getRandomMusicInterval())
+        (INGAME.musicStreamer as TerrarumMusicStreamer).stopMusic(this, pauseLen = (INGAME.musicStreamer as TerrarumMusicStreamer).getRandomMusicInterval())
 
     }
 

src/net/torvald/terrarum/modulebasegame/gameactors/FixtureMusicalTurntable.kt

@@ -3,14 +3,13 @@ package net.torvald.terrarum.modulebasegame.gameactors
 import net.torvald.spriteanimation.SheetSpriteAnimation
 import net.torvald.terrarum.*
 import net.torvald.terrarum.TerrarumAppConfiguration.TILE_SIZE
-import net.torvald.terrarum.audio.AudioMixer
 import net.torvald.terrarum.audio.audiobank.MusicContainer
 import net.torvald.terrarum.audio.TerrarumAudioMixerTrack
 import net.torvald.terrarum.gameactors.AVKey
 import net.torvald.terrarum.gameitems.GameItem
 import net.torvald.terrarum.gameitems.ItemID
 import net.torvald.terrarum.langpack.Lang
-import net.torvald.terrarum.modulebasegame.TerrarumBackgroundMusicPlayer
+import net.torvald.terrarum.modulebasegame.TerrarumMusicStreamer
 import net.torvald.terrarum.modulebasegame.gameitems.FixtureItemBase
 import net.torvald.terrarum.modulebasegame.gameitems.ItemFileRef
 import net.torvald.terrarum.modulebasegame.gameitems.MusicDiscHelper
@@ -96,7 +95,7 @@ class FixtureMusicalTurntable : Electric, PlaysMusic {
 
         // supress the normal background music playback
         if (musicIsPlaying && !flagDespawn) {
-            (INGAME.backgroundMusicPlayer as TerrarumBackgroundMusicPlayer).stopMusic(this, true)
+            (INGAME.musicStreamer as TerrarumMusicStreamer).stopMusic(this, true)
         }
     }
 
@@ -122,7 +121,7 @@ class FixtureMusicalTurntable : Electric, PlaysMusic {
                 App.printdbg(this, "Stop music $title - $artist")
 
                 // can't call stopDiscPlayback() because of the recursion
-                (INGAME.backgroundMusicPlayer as TerrarumBackgroundMusicPlayer).stopMusic(this, pauseLen = (INGAME.backgroundMusicPlayer as TerrarumBackgroundMusicPlayer).getRandomMusicInterval())
+                (INGAME.musicStreamer as TerrarumMusicStreamer).stopMusic(this, pauseLen = (INGAME.musicStreamer as TerrarumMusicStreamer).getRandomMusicInterval())
             }
 
 
@@ -163,7 +162,7 @@ class FixtureMusicalTurntable : Electric, PlaysMusic {
      */
     fun stopGracefully() {
         stopDiscPlayback()
-        (INGAME.backgroundMusicPlayer as TerrarumBackgroundMusicPlayer).stopMusic(this, pauseLen = (INGAME.backgroundMusicPlayer as TerrarumBackgroundMusicPlayer).getRandomMusicInterval())
+        (INGAME.musicStreamer as TerrarumMusicStreamer).stopMusic(this, pauseLen = (INGAME.musicStreamer as TerrarumMusicStreamer).getRandomMusicInterval())
 
     }