renames to avoid shadowing

1 files changed, 23 insertions, 23 deletions

diff --git a/midi-dump.hs b/midi-dump.hs
index dd97d69..3d3f393 100644
--- a/midi-dump.hs
+++ b/midi-dump.hs
@@ -51,24 +51,24 @@ data LoopState = LoopState {
 }
 
 data LoopEnv = LoopEnv {
-  saver :: Chan (Int64, Int64, [EVENT]),
-  sqlite :: Connection,
-  startTime :: TimeSpec,
-  startTimeReal :: TimeSpec,
-  h :: Sound.ALSA.Sequencer.T Sound.ALSA.Sequencer.DuplexMode,
-  public :: Sound.ALSA.Sequencer.Port.T,
-  private :: Sound.ALSA.Sequencer.Port.T,
-  q :: Sound.ALSA.Sequencer.Queue.T,
-  publicAddr :: Sound.ALSA.Sequencer.Address.T,
-  privateAddr :: Sound.ALSA.Sequencer.Address.T,
-  doSave :: Bool,
-  lineReader :: MVar (String)
+  _saver :: Chan (Int64, Int64, [EVENT]),
+  _sqlite :: Connection,
+  _startTime :: TimeSpec,
+  _startTimeReal :: TimeSpec,
+  _h :: Sound.ALSA.Sequencer.T Sound.ALSA.Sequencer.DuplexMode,
+  _public :: Sound.ALSA.Sequencer.Port.T,
+  _private :: Sound.ALSA.Sequencer.Port.T,
+  _q :: Sound.ALSA.Sequencer.Queue.T,
+  _publicAddr :: Sound.ALSA.Sequencer.Address.T,
+  _privateAddr :: Sound.ALSA.Sequencer.Address.T,
+  _doSave :: Bool,
+  _lineReader :: MVar (String)
 }
 
 getAbsTime = do
-  sqlite <- asks sqlite
-  startTime <- asks startTime
-  startTimeReal <- asks startTimeReal
+  sqlite <- asks _sqlite
+  startTime <- asks _startTime
+  startTimeReal <- asks _startTimeReal
   now <- liftIO $ getTime Monotonic
   return $ now - startTime + startTimeReal
 
@@ -94,11 +94,11 @@ main' = withAlsaInit $ \h public private q publicAddr privateAddr -> do
   return ()
 
 loop = do
-  startTime <- asks startTime
-  startTimeReal <- asks startTimeReal
-  h <- asks h
-  q <- asks q
-  publicAddr <- asks publicAddr
+  startTime <- asks _startTime
+  startTimeReal <- asks _startTimeReal
+  h <- asks _h
+  q <- asks _q
+  publicAddr <- asks _publicAddr
 
   mapM_ (liftIO . putStrLn . ("got line: " ++)) =<< maybeReadLine
 
@@ -126,13 +126,13 @@ loop = do
       modify $ \s -> s { inputHistory = Silence now:inputHistory s }
       -}
 
-      doSave <- asks doSave
+      doSave <- asks _doSave
       when doSave $ gets inputHistory >>= saveMidi >> return ()
       modify $ \s -> s { inputHistory = [] }
 
   loop
 
-maybeReadLine = asks lineReader >>= liftIO . tryTakeMVar
+maybeReadLine = asks _lineReader >>= liftIO . tryTakeMVar
 startLineReader = do
   mv <- liftIO $ newEmptyMVar
   thread <- liftIO $ forkIO (forever $ getLine >>= putMVar mv)
@@ -146,7 +146,7 @@ instance ToRow Chunk where
   toRow (Chunk s ns b) = toRow (s, ns, b)
 
 saveMidi chunk = do
-  saver <- asks saver
+  saver <- asks _saver
   (TimeSpec s ns) <- gets lastTick
   liftIO $ writeChan saver (s, ns, chunk)