Reverse dependency of Sound and Sound.Preload on Dodge.Data

src/Dodge/Data.hs

@@ -5,6 +5,8 @@
 module Dodge.Data 
     ( module Dodge.Data
     , Point2 (..)
+    , Sound (..)
+    , soundTime
     )
     where
 -- imports {{{
@@ -13,6 +15,8 @@ import Picture.Data
 
 import Geometry.Data
 
+import Sound.Preload
+
 import Control.Lens
 import Control.Monad.State
 import System.Random
@@ -243,15 +247,6 @@ data MenuState
     | InGame
     deriving (Eq,Ord)
 
-data Sound = Sound { _soundTime :: Int
-                   , _soundFadeTime :: Int
-                   --, _soundChannel :: Maybe Int
-                   , _soundChannel :: Maybe Mix.Channel
-                   , _soundPos :: Maybe Point2
-                   , _soundType :: Int
-                   }
-    deriving (Eq,Ord,Show)
-
 data Button = Button 
                 { _btPict :: Drawing
                 , _btPos :: Point2
@@ -696,7 +691,6 @@ makeLenses ''Button
 makeLenses ''PSType
 makeLenses ''PlacementSpot
 makeLenses ''Room
-makeLenses ''Sound
 --
 -- }}}