X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;f=Sound%2FEsounD%2FInternals.hs;h=735ce6324762dd14672a688df383b65515e6e727;hb=080d77f8aece1d14f71f6fd337f0cda9cdf7d740;hp=4c450361571e15fd54e7c14ce562f056c0d84b08;hpb=8af725c0cc839ad2493fa17d29ca6becaeb9f600;p=EsounD.git

diff --git a/Sound/EsounD/Internals.hs b/Sound/EsounD/Internals.hs
index 4c45036..735ce63 100644
--- a/Sound/EsounD/Internals.hs
+++ b/Sound/EsounD/Internals.hs
@@ -2,7 +2,6 @@
     EmptyDataDecls
   , FlexibleInstances
   , MultiParamTypeClasses
-  , TypeFamilies
   , UnicodeSyntax
   #-}
 module Sound.EsounD.Internals
@@ -11,16 +10,19 @@ module Sound.EsounD.Internals
     , Channels(..)
     , Mono
     , Stereo
+    , interleave
+    , deinterleave
 
-    , Mux(..)
-
+    , toLSV
     , wrapSocket
     , closeSocket
     , withCStrOrNull
+    , failOnError
     )
     where
 import Bindings.EsounD
 import Data.Int
+import Data.StorableVector      as S
 import Data.StorableVector.Lazy as L
 import Foreign.C.String
 import Foreign.C.Types
@@ -42,39 +44,47 @@ instance Frame Int16 where
 class Channels ch where
     channelFmt ∷ ch → C'esd_format_t
 
-class (Frame fr, Channels ch) ⇒ Mux (vec ∷ ★ → ★) fr ch where
-    type DemuxedVec vec fr ch
-    mux ∷ DemuxedVec vec fr ch → vec fr
-
 -- Mono
 data Mono
 
 instance Channels Mono where
     channelFmt _ = c'ESD_MONO
 
-instance Frame fr ⇒ Mux vec fr Mono where
-    type DemuxedVec vec fr Mono = vec fr
-    mux = id
-
 -- Stereo
 data Stereo
 
 instance Channels Stereo where
     channelFmt _ = c'ESD_STEREO
 
-instance Frame fr ⇒ Mux L.Vector fr Stereo where
-    type DemuxedVec L.Vector fr Stereo = (L.Vector fr, L.Vector fr)
-    mux (left, right) = loop left right
-        where
-          -- THINKME: consider using storablevector-streamfusion
-          loop l r
-              = let Just (lFr, l') = L.viewL l
-                    Just (rFr, r') = L.viewL r
-                    lr' = loop l' r'
-                in
-                  L.cons lFr (L.cons rFr lr')
+{-# INLINE interleave #-}
+interleave ∷ Storable α ⇒ L.Vector α → L.Vector α → L.Vector α
+interleave l r
+    -- THINKME: consider using storablevector-streamfusion
+    = let Just (lFr, l') = L.viewL l
+          Just (rFr, r') = L.viewL r
+          lr' = interleave l' r'
+      in
+        L.cons lFr (L.cons rFr lr')
+
+{-# INLINE deinterleave #-}
+deinterleave ∷ Storable α ⇒ L.Vector α → (L.Vector α, L.Vector α)
+deinterleave v
+    -- THINKME: consider using storablevector-streamfusion
+    = let (lr, v') = L.splitAt 2 v
+      in
+        if L.null lr then
+            (L.empty, L.empty)
+        else
+            let Just (lFr, r) = L.viewL lr
+                Just (rFr, _) = L.viewL r
+                (l', r') = deinterleave v'
+            in
+              (L.cons lFr l', L.cons rFr r')
 
 -- Utility functions
+toLSV ∷ Storable α ⇒ S.Vector α → L.Vector α
+toLSV v = L.fromChunks [v]
+
 wrapSocket ∷ String → CInt → IO Handle
 wrapSocket e (-1) = fail e
 wrapSocket _ fd   = fdToHandle (Fd fd)
@@ -87,3 +97,8 @@ closeSocket h = do (Fd fd) ← handleToFd h
 withCStrOrNull ∷ Maybe String → (CString → IO a) → IO a
 withCStrOrNull Nothing  f = f nullPtr
 withCStrOrNull (Just s) f = withCString s f
+
+failOnError ∷ Monad m ⇒ String → (CInt → Bool) → CInt → m CInt
+failOnError msg isErr rv
+    | isErr rv  = fail msg
+    | otherwise = return rv