Merge branch 'master' of ssh://git.xkjq.uk:30001/justin/loop

app/Main.hs

@@ -19,30 +19,37 @@ import Picture.Render
 import Picture.Preload
 import Sound
 import Preload
-import Sound.Preload
+import Sound.Data
+import Music
 
 import           Control.Concurrent
 import           Control.Lens
 import           Foreign                   (Word32)
 
 import Control.Monad (when,void)
- 
-import System.Random
-
-import           System.Random
 
 import qualified Data.Map                  as M
 import           Graphics.Rendering.OpenGL hiding (color, rotate, scale,
                                             translate)
+import qualified Data.Map as M
+import qualified Data.IntMap as IM
 import qualified SDL
 import qualified SDL.Mixer                 as Mix
 
 doPreload' :: IO (PreloadData a)
 doPreload' = do
     lChunks <- loadSounds
+    lMusic  <- loadMusic
     let sData = SoundData {_loadedChunks = lChunks, _playingSounds = M.empty}
+        mData = MusicData {_loadedMusic = lMusic}
+    Mix.playMusic Mix.Forever (lMusic IM.! 0)
     rData <- preloadRender
-    return $ PreloadData rData sData 0
+    return $ PreloadData 
+        { _renderData   = rData 
+        , _soundData    = sData 
+        , _musicData    = mData
+        , _frameTimer   = 0
+        }
 
 main :: IO ()
 main = do
@@ -56,7 +63,7 @@ main = do
         ( \preData w -> do
             startTicks <- SDL.ticks
             void $ doDrawing (_renderData preData) w
-            playSoundQueue (_loadedChunks $ _soundData preData) (_soundQueue w)
+            playPositionalSoundQueue (_loadedChunks $ _soundData preData) (_soundQueue w)
             newPlayingSounds <- playAndUpdate (_soundData preData) (_sounds w)
 
             endTicks <- SDL.ticks