diff options
| author | Gregor Kleen <gkleen@yggdrasil.li> | 2017-01-26 17:04:17 +0100 |
|---|---|---|
| committer | Gregor Kleen <gkleen@yggdrasil.li> | 2017-01-26 17:04:17 +0100 |
| commit | 304e7615ddee7a8b1d8f7d7690c8da57f8a2704e (patch) | |
| tree | d1fa6caef394cfc6b896071c9139e942205c4da0 | |
| parent | 649796f438107a0229a57cbbb6248c5801270ac8 (diff) | |
| download | trivmix-304e7615ddee7a8b1d8f7d7690c8da57f8a2704e.tar trivmix-304e7615ddee7a8b1d8f7d7690c8da57f8a2704e.tar.gz trivmix-304e7615ddee7a8b1d8f7d7690c8da57f8a2704e.tar.bz2 trivmix-304e7615ddee7a8b1d8f7d7690c8da57f8a2704e.tar.xz trivmix-304e7615ddee7a8b1d8f7d7690c8da57f8a2704e.zip | |
Fix type error
| -rw-r--r-- | trivmix.cabal | 2 | ||||
| -rw-r--r-- | trivmix.nix | 2 | ||||
| -rw-r--r-- | 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 @@ | |||
| 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.4 | 5 | version: 2.6.5 |
| 6 | -- synopsis: | 6 | -- synopsis: |
| 7 | -- description: | 7 | -- description: |
| 8 | license: PublicDomain | 8 | license: PublicDomain |
diff --git a/trivmix.nix b/trivmix.nix index 6b6c7df..4faa518 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.4"; | 7 | version = "2.6.5"; |
| 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 68fb8bf..b437abc 100644 --- a/trivmix/Trivmix.hs +++ b/trivmix/Trivmix.hs | |||
| @@ -139,7 +139,7 @@ trivmix Options{..} = do | |||
| 139 | (_, _, _, ph) <- createProcess $ (proc run' [client ++ ":" ++ input, client ++ ":" ++ output]) { delegate_ctlc = True } | 139 | (_, _, _, ph) <- createProcess $ (proc run' [client ++ ":" ++ input, client ++ ":" ++ output]) { delegate_ctlc = True } |
| 140 | return () | 140 | return () |
| 141 | Audio.withProcessMono client' input' (mix level') output' $ | 141 | Audio.withProcessMono client' input' (mix level') output' $ |
| 142 | Jack.withActivation client' . forever $ threadDelay 10e6 | 142 | Jack.withActivation client' . forever . Trans.lift $ threadDelay 1000000 |
| 143 | 143 | ||
| 144 | mix :: MVar Level -> CFloat -> IO CFloat | 144 | mix :: MVar Level -> CFloat -> IO CFloat |
| 145 | mix level input = do | 145 | mix level input = do |