From 5c7d5b333b02779ae1484d46ecfddc1e7bfbe581 Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Thu, 26 Jan 2017 16:48:59 +0100 Subject: Fix dependence on stdin --- trivmix.cabal | 2 +- trivmix.nix | 2 +- trivmix/Trivmix.hs | 5 +++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/trivmix.cabal b/trivmix.cabal index 1841de6..35660eb 100644 --- a/trivmix.cabal +++ b/trivmix.cabal @@ -2,7 +2,7 @@ -- documentation, see http://haskell.org/cabal/users-guide/ name: trivmix -version: 2.6.3 +version: 2.6.4 -- synopsis: -- description: license: PublicDomain diff --git a/trivmix.nix b/trivmix.nix index 8d1535a..6b6c7df 100644 --- a/trivmix.nix +++ b/trivmix.nix @@ -4,7 +4,7 @@ }: mkDerivation { pname = "trivmix"; - version = "2.6.3"; + version = "2.6.4"; src = ./.; isLibrary = true; isExecutable = true; diff --git a/trivmix/Trivmix.hs b/trivmix/Trivmix.hs index a0c974c..68fb8bf 100644 --- a/trivmix/Trivmix.hs +++ b/trivmix/Trivmix.hs @@ -97,7 +97,8 @@ defFileMode = foldl unionFileModes nullFileMode [ ownerReadMode defDirectoryMode :: FileMode defDirectoryMode = foldl unionFileModes nullFileMode [ ownerModes - , groupModes + , groupReadMode + , groupExecuteMode , otherReadMode , otherExecuteMode ] @@ -138,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' $ Trans.lift Jack.waitForBreak + Jack.withActivation client' . forever $ threadDelay 10e6 mix :: MVar Level -> CFloat -> IO CFloat mix level input = do -- cgit v1.2.3