Refactor sound

2021-04-06 14:53:40 +02:00
parent f7e0b40cd5
commit ebcac39069
5 changed files with 250 additions and 181 deletions
@@ -53,8 +53,8 @@ main = do
        ( \preData w -> do
            startTicks <- SDL.ticks
            void $ doDrawing (_renderData preData) w
-            playSoundQueue (_soundData preData) (_soundQueue w)
-            newSoundData <- playAndUpdate (_sounds w) (_soundData preData)
+            playSoundQueue (_loadedChunks $ _soundData preData) (_soundQueue w)
+            newPlayingSounds <- playAndUpdate (_soundData preData) (_sounds w)

            endTicks <- SDL.ticks
            let lastFrameTicks = _frameTimer preData
@@ -64,7 +64,7 @@ main = do
                    . translate (-0.5) (-0.8) . scale 0.0005 0.0005 
                    . text $ "ms/frame " ++ show (endTicks - lastFrameTicks)
                )
-            return $ preData & soundData  .~ newSoundData
+            return $ preData & soundData . playingSounds .~ newPlayingSounds
                             & frameTimer .~ endTicks
        )
        (flip $ menuEvents handleEvent)