From 304e7615ddee7a8b1d8f7d7690c8da57f8a2704e Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Thu, 26 Jan 2017 17:04:17 +0100 Subject: Fix type error --- trivmix.cabal | 2 +- trivmix.nix | 2 +- trivmix/Trivmix.hs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/trivmix.cabal b/trivmix.cabal index 35660eb..c7676dd 100644 --- a/trivmix.cabal +++ b/trivmix.cabal @@ -2,7 +2,7 @@ -- documentation, see http://haskell.org/cabal/users-guide/ name: trivmix -version: 2.6.4 +version: 2.6.5 -- synopsis: -- description: license: PublicDomain diff --git a/trivmix.nix b/trivmix.nix index 6b6c7df..4faa518 100644 --- a/trivmix.nix +++ b/trivmix.nix @@ -4,7 +4,7 @@ }: mkDerivation { pname = "trivmix"; - version = "2.6.4"; + version = "2.6.5"; src = ./.; isLibrary = true; isExecutable = true; diff --git a/trivmix/Trivmix.hs b/trivmix/Trivmix.hs index 68fb8bf..b437abc 100644 --- a/trivmix/Trivmix.hs +++ b/trivmix/Trivmix.hs @@ -139,7 +139,7 @@ trivmix Options{..} = do (_, _, _, ph) <- createProcess $ (proc run' [client ++ ":" ++ input, client ++ ":" ++ output]) { delegate_ctlc = True } return () Audio.withProcessMono client' input' (mix level') output' $ - Jack.withActivation client' . forever $ threadDelay 10e6 + Jack.withActivation client' . forever . Trans.lift $ threadDelay 1000000 mix :: MVar Level -> CFloat -> IO CFloat mix level input = do -- cgit v1.2.3