add alsa initialization to axis.hs

3 files changed, 9 insertions, 8 deletions

diff --git a/AlsaSeq.hs b/AlsaSeq.hs
index a6920f0..7c831bd 100644
--- a/AlsaSeq.hs
+++ b/AlsaSeq.hs
@@ -1,4 +1,4 @@
-module AlsaSeq (alsaInit, parseAlsaEvents, forwardNoteEvent, cmdlineAlsaConnect, printChordLn) where
+module AlsaSeq (withAlsaInit, parseAlsaEvents, forwardNoteEvent, cmdlineAlsaConnect, printChordLn) where
 import qualified Sound.ALSA.Exception as AlsaExc
 import qualified Sound.ALSA.Sequencer.Address as Addr
 import qualified Sound.ALSA.Sequencer as SndSeq
@@ -69,7 +69,7 @@ alsaClientPorts h cinfo = do
       return p
   return ports
 
-alsaInit k = do
+withAlsaInit k = do
   SndSeq.withDefault SndSeq.Nonblock $ \h -> do
 
   Client.setName (h :: SndSeq.T SndSeq.DuplexMode) "Haskell Beats" -- In imperative language MIDI sequencer, you rock beat.  In Haskell language MIDI sequencer, rock beat you!
diff --git a/axis.hs b/axis.hs
index b59a6f6..7513163 100644
--- a/axis.hs
+++ b/axis.hs
@@ -5,6 +5,8 @@ import Control.Wire hiding (when)
 import Control.Wire.Session
 import Control.Monad
 import qualified Graphics.UI.SDL as SDL
+import AlsaSeq
+import qualified Data.Set as Set
 
 netwireIsCool :: (Monad m) => Wire (Timed NominalDiffTime ()) () m a String
 netwireIsCool =
@@ -19,17 +21,16 @@ netwireIsCool =
         holdFor 0.5 . periodic 1 . pure "Hoo..." <|>
         pure "...ray!"
 
---main :: IO ()
---main = testWire clockSession_ netwireIsCool
-
-main = SDL.withInit [SDL.InitVideo, SDL.InitTimer, SDL.InitJoystick] $ do
+main = SDL.withInit [SDL.InitVideo, SDL.InitTimer, SDL.InitJoystick] $
+  withAlsaInit $ \h public private q publicAddr privateAddr -> do
+  putStrLn "Initialized."
   loop clockSession_ netwireIsCool ""
   where
   loop s w x = do
     (ds, s') <- stepSession s
     (ex, w') <- stepWire w ds (Right x)
     let x' = either (const "") id ex
-    Control.Monad.when (x /= x' && x /= "") $ putStrLn x
+    Control.Monad.when (x /= x' && x' /= "") $ putStrLn x'
     let framerate = 30
     let delay = 1000 `div` framerate - 1000 * (floor $ dtime ds)
     SDL.delay (delay)
diff --git a/midi-dump.hs b/midi-dump.hs
index 3de065b..51ebc6b 100644
--- a/midi-dump.hs
+++ b/midi-dump.hs
@@ -5,7 +5,7 @@ import qualified Data.Set as Set
 
 main = (do
 
-  alsaInit $ \h public private q publicAddr privateAddr -> do
+  withAlsaInit $ \h public private q publicAddr privateAddr -> do
   cmdlineAlsaConnect h public
 
   let