hlint

1 files changed, 18 insertions, 20 deletions

diff --git a/midi-dump.hs b/midi-dump.hs
index 3d3f393..864bf96 100644
--- a/midi-dump.hs
+++ b/midi-dump.hs
@@ -2,10 +2,8 @@
 {-# LANGUAGE FlexibleContexts #-}
 
 import AlsaSeq
-import Control.Concurrent (threadDelay)
 import qualified Sound.ALSA.Exception as AlsaExc
 import qualified Data.Set as Set
-import qualified Haskore.Basic.Pitch as Pitch
 import qualified Sound.ALSA.Sequencer.Event as Event
 import Control.Monad.RWS.Strict
 import Data.Maybe
@@ -15,7 +13,7 @@ import System.Clock
 import           Control.Applicative
 import qualified Data.ByteString as BS
 import           Database.SQLite.Simple
-import           Database.SQLite.Simple.FromRow
+import           Database.SQLite.Simple.FromRow ()
 import Data.Int
 import Data.ByteString.Char8 (pack)
 
@@ -33,7 +31,7 @@ verbose = False
 
 main = main' `AlsaExc.catch` handler
   where
-  handler e = when (verbose) $ putStrLn $ "alsa_exception: " ++ AlsaExc.show e
+  handler e = when verbose $ putStrLn $ "alsa_exception: " ++ AlsaExc.show e
 
 data EVENT = MidiEvent TimeSpec Event.T | Silence TimeSpec
   deriving Show
@@ -62,11 +60,10 @@ data LoopEnv = LoopEnv {
   _publicAddr :: Sound.ALSA.Sequencer.Address.T,
   _privateAddr :: Sound.ALSA.Sequencer.Address.T,
   _doSave :: Bool,
-  _lineReader :: MVar (String)
+  _lineReader :: MVar String
 }
 
 getAbsTime = do
-  sqlite <- asks _sqlite
   startTime <- asks _startTime
   startTimeReal <- asks _startTimeReal
   now <- liftIO $ getTime Monotonic
@@ -106,7 +103,8 @@ loop = do
   let forwardNOW = forwardNoteEvent h q publicAddr
   (events, newKeys) <- liftIO $ parseAlsaEvents' h oldKeys forwardNOW
 
-  if (oldKeys == newKeys) then
+
+  if oldKeys == newKeys then
     liftIO $ threadDelay 15000 -- 15ms.  Seems like a lot, but it sounds OK.  Cuts CPU down to 2%.
   else do
     now <- getAbsTime
@@ -116,15 +114,15 @@ 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 }
-      -}
+      when False $ 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 }
 
       doSave <- asks _doSave
       when doSave $ gets inputHistory >>= saveMidi >> return ()
@@ -134,7 +132,7 @@ loop = do
 
 maybeReadLine = asks _lineReader >>= liftIO . tryTakeMVar
 startLineReader = do
-  mv <- liftIO $ newEmptyMVar
+  mv <- liftIO newEmptyMVar
   thread <- liftIO $ forkIO (forever $ getLine >>= putMVar mv)
   return mv
 
@@ -151,11 +149,11 @@ saveMidi chunk = do
   liftIO $ writeChan saver (s, ns, chunk)
 
 startSaver sqlite = do
-  chan <- liftIO $ newChan
-  thread <- liftIO $ forkIO (saver sqlite chan)
+  chan <- liftIO newChan
+  thread <- liftIO $ forkIO (saver chan)
   return chan
   where
-    saver sqlite chan = forever $ do
+    saver chan = forever $ do
       (s, ns, chunk) <- readChan chan
       let bytes = pack $ show chunk
       liftIO $ execute sqlite "INSERT INTO chunks (sec, nsec, midi) VALUES (?,?,?)" (Chunk s ns bytes)
@@ -169,7 +167,7 @@ getMidiDesc _ = Nothing
 
 tsDeltas :: [TimeSpec] -> [Integer]
 tsDeltas [] = []
-tsDeltas ls@(x:xs) = map (\(a,b) -> a - b) $ zip nsecs (0:nsecs)
+tsDeltas ls@(x:_) = zipWith (-) nsecs (0:nsecs)
   where
     nsecs = map timeSpecAsNanoSecs rel
     rel = map (\y -> y - x) ls