diff options
author | Gregor Kleen <gkleen@yggdrasil.li> | 2017-01-26 16:48:59 +0100 |
---|---|---|
committer | Gregor Kleen <gkleen@yggdrasil.li> | 2017-01-26 16:48:59 +0100 |
commit | 5c7d5b333b02779ae1484d46ecfddc1e7bfbe581 (patch) | |
tree | e6854f5d671c3202bb35f85147ab2859d43f962b | |
parent | 72467d55a7b6e3afcafc2cd1527da10574cf6366 (diff) | |
download | trivmix-5c7d5b333b02779ae1484d46ecfddc1e7bfbe581.tar trivmix-5c7d5b333b02779ae1484d46ecfddc1e7bfbe581.tar.gz trivmix-5c7d5b333b02779ae1484d46ecfddc1e7bfbe581.tar.bz2 trivmix-5c7d5b333b02779ae1484d46ecfddc1e7bfbe581.tar.xz trivmix-5c7d5b333b02779ae1484d46ecfddc1e7bfbe581.zip |
Fix dependence on stdin
-rw-r--r-- | trivmix.cabal | 2 | ||||
-rw-r--r-- | trivmix.nix | 2 | ||||
-rw-r--r-- | 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 @@ | |||
2 | -- documentation, see http://haskell.org/cabal/users-guide/ | 2 | -- documentation, see http://haskell.org/cabal/users-guide/ |
3 | 3 | ||
4 | name: trivmix | 4 | name: trivmix |
5 | version: 2.6.3 | 5 | version: 2.6.4 |
6 | -- synopsis: | 6 | -- synopsis: |
7 | -- description: | 7 | -- description: |
8 | license: PublicDomain | 8 | license: PublicDomain |
diff --git a/trivmix.nix b/trivmix.nix index 8d1535a..6b6c7df 100644 --- a/trivmix.nix +++ b/trivmix.nix | |||
@@ -4,7 +4,7 @@ | |||
4 | }: | 4 | }: |
5 | mkDerivation { | 5 | mkDerivation { |
6 | pname = "trivmix"; | 6 | pname = "trivmix"; |
7 | version = "2.6.3"; | 7 | version = "2.6.4"; |
8 | src = ./.; | 8 | src = ./.; |
9 | isLibrary = true; | 9 | isLibrary = true; |
10 | isExecutable = true; | 10 | 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 | |||
97 | 97 | ||
98 | defDirectoryMode :: FileMode | 98 | defDirectoryMode :: FileMode |
99 | defDirectoryMode = foldl unionFileModes nullFileMode [ ownerModes | 99 | defDirectoryMode = foldl unionFileModes nullFileMode [ ownerModes |
100 | , groupModes | 100 | , groupReadMode |
101 | , groupExecuteMode | ||
101 | , otherReadMode | 102 | , otherReadMode |
102 | , otherExecuteMode | 103 | , otherExecuteMode |
103 | ] | 104 | ] |
@@ -138,7 +139,7 @@ trivmix Options{..} = do | |||
138 | (_, _, _, ph) <- createProcess $ (proc run' [client ++ ":" ++ input, client ++ ":" ++ output]) { delegate_ctlc = True } | 139 | (_, _, _, ph) <- createProcess $ (proc run' [client ++ ":" ++ input, client ++ ":" ++ output]) { delegate_ctlc = True } |
139 | return () | 140 | return () |
140 | Audio.withProcessMono client' input' (mix level') output' $ | 141 | Audio.withProcessMono client' input' (mix level') output' $ |
141 | Jack.withActivation client' $ Trans.lift Jack.waitForBreak | 142 | Jack.withActivation client' . forever $ threadDelay 10e6 |
142 | 143 | ||
143 | mix :: MVar Level -> CFloat -> IO CFloat | 144 | mix :: MVar Level -> CFloat -> IO CFloat |
144 | mix level input = do | 145 | mix level input = do |