1 files changed, 16 insertions, 11 deletions

diff --git a/trivmix/Trivmix.hs b/trivmix/Trivmix.hs
index b2d87ec..5cddf6f 100644
--- a/trivmix/Trivmix.hs
+++ b/trivmix/Trivmix.hs
@@ -43,8 +43,9 @@ import Control.Monad
 
 import Text.Heredoc (str)
 
-import Refined (refine)
+import Refined
   
+import Data.Scientific
 import Trivmix.Types
 
 data Options = Options
@@ -53,7 +54,7 @@ data Options = Options
                , client :: String
                , initialLevel :: Level
                , initialBalance :: Balance
-               , fps, interval :: Float
+               , fps, interval, watchdogInterval :: Scientific
                , run :: [FilePath]
                , balanceFiles :: [FilePath]
                , levelFiles :: [FilePath]
@@ -101,6 +102,12 @@ optionParser = Options
                               <> value 0.2
                               <> showDefault
                                )
+               <*> option auto ( long "watchdog"
+                              <> metavar "NUMBER"
+                              <> help "Signal watchdog every ’NUMBER’ seconds"
+                              <> value 1
+                              <> showDefault
+                               )
                <*> many ( strOption ( long "run"
                                    <> metavar "FILE"
                                    <> help [str|Execute a file once setup of jacks is done (use this to autoconnect)
@@ -183,18 +190,16 @@ trivmix Options{..} = do
               frames = interval * fps
               delay = round $ recip fps * 1e6
               linInt x a b = a * (1 - x) + b * x
-              linInt' x a b = either error id $ asFloat (linInt x) a b
-              mulBalance (bToFloat -> b) x = either error id $ asFloat (*) (Lin . either error id $ refine b) x
+              linInt' x a b = either error id $ asScientific (linInt x) a b
+              mulBalance (bToScientific -> b) x = either error id $ asScientific (*) (Lin . either error id $ refine b) x
             newLevel <- mulBalance <$> readMVar balance <*> readMVar level
-            currentLevel <- readMVar level'
-            mapM_ (\x -> swapMVar level' (linInt' x currentLevel newLevel) >> threadDelay delay) [0,recip frames..1]
+            currentLevel <- (\(CFloat f) -> Lin . either error id . refine $ realToFrac f) <$> readMVar level'
+            mapM_ (\x -> (swapMVar level' $! toRealFloat . unrefine . toLin $ linInt' x currentLevel newLevel) >> threadDelay delay) (takeWhile (<= 1) $ iterate (+ recip frames) 0)
           notifyReady
-          forever $ threadDelay 1000000 >> notifyWatchdog
+          forever $ threadDelay (round $ watchdogInterval * 1e6) >> notifyWatchdog
 
-mix :: MVar Level -> CFloat -> IO CFloat
-mix level input = do
-  level' <- readMVar level
-  return $ (CFloat $ toFloat level') * input
+mix :: MVar CFloat -> CFloat -> IO CFloat
+mix level input = (input *) <$> readMVar level
 
 handleFiles :: (Read l, Show l, Eq l) => INotify -> MVar l -> [FilePath] -> IO ()
 handleFiles inotify level files = do