reader has its own data type, LoopEnv, instead of a giant tuple

1 files changed, 31 insertions, 5 deletions

diff --git a/midi-dump.hs b/midi-dump.hs
index c4e319a..0ed7ecb 100644
--- a/midi-dump.hs
+++ b/midi-dump.hs
@@ -44,12 +44,26 @@ data LoopState = LoopState {
   lastTick :: TimeSpec
 }
 
+data LoopEnv = LoopEnv {
+  saver :: _,
+  sqlite :: _,
+  startTime :: TimeSpec,
+  startTimeReal :: TimeSpec,
+  h :: _,
+  public :: _,
+  private :: _,
+  q :: _,
+  publicAddr :: _,
+  privateAddr :: _
+}
+
 getAbsTime = do
-  (_, sqlite, startTime, startTimeReal, _, _, _, _, _, _) <- ask
+  sqlite <- asks sqlite
+  startTime <- asks startTime
+  startTimeReal <- asks startTimeReal
   now <- liftIO $ getTime Monotonic
   return $ now - startTime + startTimeReal
 
-
 emptyLoopState = LoopState Set.empty []
 
 main' = withAlsaInit $ \h public private q publicAddr privateAddr -> do
@@ -63,11 +77,17 @@ main' = withAlsaInit $ \h public private q publicAddr privateAddr -> do
   execute_ sqlite "CREATE TABLE IF NOT EXISTS chunks (id INTEGER PRIMARY KEY, sec INTEGER, nsec INTEGER, midi BLOB)"
   saver <- startSaver sqlite
 
-  (_, ()) <- execRWST loop (saver, sqlite, startTime, startTimeReal, h, public, private, q, publicAddr, privateAddr) (emptyLoopState startTime)
+  let env = LoopEnv saver sqlite startTime startTimeReal h public private q publicAddr privateAddr
+
+  (_, ()) <- execRWST loop env (emptyLoopState startTime)
   return ()
 
 loop = do
-  (_, _, startTime, startTimeReal, h, _, _, q, publicAddr, _) <- ask
+  startTime <- asks startTime
+  startTimeReal <- asks startTimeReal
+  h <- asks h
+  q <- asks q
+  publicAddr <- asks publicAddr
 
   oldKeys <- gets keysDown
   let forwardNOW = forwardNoteEvent h q publicAddr
@@ -83,12 +103,18 @@ loop = do
     modify $ \s -> s { keysDown = newKeys, inputHistory = newEvents ++ inputHistory s, lastTick = now }
 
     when (Set.null newKeys) $ do
+      {-
       chunk <- gets $ takeWhile (not . isSilence) . inputHistory
       saveMidi chunk
+
       hist <- gets $ filter (not . isSilence) . inputHistory
       liftIO $ print $ map (`div` 1000000) $ tsDeltas $ map getTS $ reverse hist
       liftIO $ print $ mapMaybe getMidiDesc $ reverse hist
       modify $ \s -> s { inputHistory = Silence now:inputHistory s }
+      -}
+
+      gets inputHistory >>= saveMidi >> return ()
+      modify $ \s -> s { inputHistory = [] }
 
   loop
 
@@ -99,7 +125,7 @@ instance ToRow Chunk where
   toRow (Chunk s ns b) = toRow (s, ns, b)
 
 saveMidi chunk = do
-  (saver, _, _, _, _, _, _, _, _, _) <- ask
+  saver <- asks saver
   (TimeSpec s ns) <- gets lastTick
   liftIO $ writeChan saver (s, ns, chunk)