EsdPlayerExample (only a skeleton for now)

diff --git a/EsounD.cabal b/EsounD.cabal
index d9218247d8a05b0d8bc18e548dc828eb8ebcdd0d..6add96a49ef48ab41f714eecd525b22112d5f5e7 100644 (file)
--- a/EsounD.cabal
+++ b/EsounD.cabal
@@ -20,14 +20,18 @@ Source-Repository head
     Type: git
     Location: git://git.cielonegro.org/EsounD.git
 
+Flag build-examples
+    Description: Build example programs.
+    Default: False
+
 Library
     Build-Depends:
-        base                      == 4.2.*,
+        base                      == 4.*,
         base-unicode-symbols      == 0.2.*,
         bindings-EsounD           == 0.1.*,
-        network                   == 2.2.*,
-        regions                   == 0.7.*,
-        safer-file-handles        == 0.8.*,
+        network                   == 2.3.*,
+        regions                   == 0.8.*,
+        safer-file-handles        == 0.9.*,
         storablevector            == 0.2.*,
         transformers              == 0.2.*,
         unix                      == 2.4.*
@@ -48,3 +52,24 @@ Library
 
     GHC-Options:
         -Wall
+
+Executable hs-esd-player-example
+   if flag(build-examples)
+       Buildable: True
+   else
+       Buildable: False
+
+   HS-Source-Dirs:
+        .,
+        examples
+
+   Main-Is: EsdPlayerExample.hs
+
+   Extensions:
+        EmptyDataDecls
+        KindSignatures
+        ScopedTypeVariables
+        UnicodeSyntax
+
+   GHC-Options:
+        -Wall

diff --git a/GNUmakefile b/GNUmakefile
index 15098cd82c0e5ec88a920bc9078bdc499ec3fe96..a245964f61f7748797fbb9d98bdf0f81db294eff 100644 (file)
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -1,5 +1,5 @@
-#RUN_COMMAND = $(MAKE) -C examples run
+RUN_COMMAND = ./dist/build/hs-esd-player-example/hs-esd-player-example
 
-CONFIGURE_ARGS = -O
+CONFIGURE_ARGS = -O -fbuild-examples
 
 include cabal-package.mk

diff --git a/Sound/EsounD/Player.hs b/Sound/EsounD/Player.hs
index 0d2b209c32b20fb9ba2ae72a2e518cac83ec8bf7..b60eda08a87213b3bd7f5be2c1ecadd4f8454194 100644 (file)
--- a/Sound/EsounD/Player.hs
+++ b/Sound/EsounD/Player.hs
@@ -25,9 +25,9 @@ data Player fr ch (r ∷ * → *)
         plRate   ∷ !Int
       -- THINKME: We really want to use RegionalFileHandle but we
       -- can't, because safer-file-handles currently provides no ways
-      -- to wrap ordinary handles.
+      -- to wrap ordinary handles into safer handles.
       , plHandle ∷ !Handle
-      , plCloseH ∷ !(CloseHandle r)
+      , plCloseH ∷ !(FinalizerHandle r)
       }
 
 instance Dup (Player fr ch) where

diff --git a/examples/EsdPlayerExample.hs b/examples/EsdPlayerExample.hs
new file mode 100644 (file)
index 0000000..7de9ba9
--- /dev/null
+++ b/examples/EsdPlayerExample.hs
@@ -0,0 +1,9 @@
+module Main where
+import Control.Monad.Trans.Region
+import Sound.EsounD.Player 
+
+main ∷ IO ()
+main = runRegionT $
+       do pl ← openPlayer 44100 "localhost" Nothing 
+          fail "FIXME"
+