Cleanup (remove) _soundData, _musicData

appDodge/Main.hs

@@ -22,7 +22,6 @@ import Dodge.TestString
 import Dodge.Update
 --import qualified IntMapHelp as IM
 import Loop
-import Music
 --import Picture
 import Preload
 import Preload.Render
@@ -121,7 +120,7 @@ playSoundUnlessRewinding u = case w ^. timeFlow of
 doSideEffects :: Universe -> IO Universe
 doSideEffects u = do
     newPlayingSounds <- playSoundUnlessRewinding u
-    playSoundQueue (_loadedChunks . _soundData $ _preloadData u) (fmap _getSoundID $ u ^. uvSoundQueue)
+    playSoundQueue (_soundData $ _preloadData u) (fmap _getSoundID $ u ^. uvSoundQueue)
     u' <- _uvIOEffects u u
     endTicks <- SDL.ticks
     return $
@@ -146,7 +145,7 @@ doPreload = do
     return
         PreloadData
             { _renderData = rData
-            , _soundData = SoundData{_loadedChunks = lChunks}
+            , _soundData = lChunks
             --, _musicData = MusicData{_loadedMusic = lMusic}
-            , _musicData = MusicData{_loadedMusic = undefined}
+            , _musicData = mempty
             }