Undo excision of streaming
This commit is contained in:
+1
-1
@@ -58,7 +58,7 @@ dependencies:
|
||||
- directory
|
||||
- extra
|
||||
- primitive
|
||||
#- streaming
|
||||
- streaming
|
||||
#- repa
|
||||
- monad-parallel
|
||||
- parallel
|
||||
|
||||
+2
-2
@@ -12,7 +12,7 @@ import Control.Lens
|
||||
import Data.Aeson
|
||||
import Data.Aeson.TH
|
||||
import Geometry.Data
|
||||
import Streaming
|
||||
--import Streaming
|
||||
|
||||
|
||||
{-# INLINE shVfromList #-}
|
||||
@@ -45,7 +45,7 @@ pairToSV = uncurry ShapeV
|
||||
|
||||
makeLenses ''ShapeV
|
||||
makeLenses ''ShapeObj
|
||||
type Shape' = Stream (Of ShapeObj) IO ()
|
||||
--type Shape' = Stream (Of ShapeObj) IO ()
|
||||
|
||||
type Shape = [ShapeObj]
|
||||
|
||||
|
||||
+2
-3
@@ -26,7 +26,7 @@ import qualified SDL.Mixer as Mix
|
||||
import Data.Maybe
|
||||
import qualified IntMapHelp as IM
|
||||
import qualified Data.Map as M
|
||||
import qualified Streaming.Prelude as S
|
||||
--import qualified Streaming.Prelude as S
|
||||
import Control.Monad
|
||||
import Control.Monad.Trans
|
||||
import Control.Monad.Trans.Maybe
|
||||
@@ -140,9 +140,8 @@ playIfFree c times = do
|
||||
As for 'playSoundQueue', but with positional information in the form of an Int16. -}
|
||||
playPositionalSoundQueue :: IM.IntMap Mix.Chunk -> [(Int,Int16)] -> IO ()
|
||||
playPositionalSoundQueue chunkMap
|
||||
= S.mapM_ ( \(n,a) ->
|
||||
= mapM_ ( \(n,a) ->
|
||||
runMaybeT $ playIfFree (chunkMap IM.! n) Mix.Once >>= setChannelPos a )
|
||||
. S.each
|
||||
|
||||
setChannelPos :: Int16 -> Mix.Channel -> MaybeT IO Mix.Channel
|
||||
setChannelPos a i = do
|
||||
|
||||
Reference in New Issue
Block a user