X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;f=Sound%2FEsounD%2FInternals.hs;h=f4b067f0903cf30fc9a23b62ccb13dee41c5e4fe;hb=808cc2f4700bc0b2f77cee443dd237d415b4d5d7;hp=8d28ed8e346bf2aefcaf54d4459e6ef085f7da9c;hpb=d6ea0404a5d1fc5356a5b121b45f277d735359ad;p=EsounD.git

diff --git a/Sound/EsounD/Internals.hs b/Sound/EsounD/Internals.hs
index 8d28ed8..f4b067f 100644
--- a/Sound/EsounD/Internals.hs
+++ b/Sound/EsounD/Internals.hs
@@ -11,19 +11,24 @@ module Sound.EsounD.Internals
     , Mono
     , Stereo
     , interleave
+    , deinterleave
 
+    , 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
 import Foreign.Ptr
 import Foreign.Storable
+import Prelude.Unicode
 import System.IO
 import System.Posix.IO
 import System.Posix.Types
@@ -53,7 +58,7 @@ instance Channels Stereo where
     channelFmt _ = c'ESD_STEREO
 
 {-# INLINE interleave #-}
-interleave ∷ Frame fr ⇒ L.Vector fr → L.Vector fr → L.Vector fr
+interleave ∷ Storable α ⇒ L.Vector α → L.Vector α → L.Vector α
 interleave l r
     -- THINKME: consider using storablevector-streamfusion
     = let Just (lFr, l') = L.viewL l
@@ -62,7 +67,25 @@ 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)
@@ -75,3 +98,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 → m ()
+failOnError msg rv
+    | rv ≤ 0   = fail msg
+    | otherwise = return ()