summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAntonKholomiov <>2019-03-26 20:16:00 (GMT)
committerhdiff <hdiff@hdiff.luite.com>2019-03-26 20:16:00 (GMT)
commitf3968b5726bc84127d35cf0797e3ccbc8789477f (patch)
tree6bdfe387a9dd3a4722306e8a9985d5abd534681f
parent3fb70eae38ab957618a1b756ee12f1aa9bf3e94c (diff)
version 0.7.3HEAD0.7.3master
-rw-r--r--csound-catalog.cabal2
-rw-r--r--src/Csound/Catalog/Wave/Ac.hs4
-rw-r--r--src/Csound/Catalog/Wave/WoodwindAlg.hs4
3 files changed, 5 insertions, 5 deletions
diff --git a/csound-catalog.cabal b/csound-catalog.cabal
index 4ce4df7..a1f2d99 100644
--- a/csound-catalog.cabal
+++ b/csound-catalog.cabal
@@ -1,5 +1,5 @@
Name: csound-catalog
-Version: 0.7.2
+Version: 0.7.3
Cabal-Version: >= 1.6
License: BSD3
License-file: LICENSE
diff --git a/src/Csound/Catalog/Wave/Ac.hs b/src/Csound/Catalog/Wave/Ac.hs
index a9a56be..09909c7 100644
--- a/src/Csound/Catalog/Wave/Ac.hs
+++ b/src/Csound/Catalog/Wave/Ac.hs
@@ -49,7 +49,7 @@ xanaduPlucks cps vibrAmp vibrCps = (phi vib, phi shift, phi (-shift))
xanadu1 :: D -> SE Sig
xanadu1 cps = do
_ <- delayr 2
- [tap1, tap2, d1, d2] <- mapM deltap3 [f1, f2, 2, 1.1]
+ ~ [tap1, tap2, d1, d2] <- mapM deltap3 [f1, f2, 2, 1.1]
delayw $ g * damping
return $ damping * mean [gleft, tap1, d1, gright, tap2, d2]
where (g, gleft, gright) = xanaduPlucks cps (1/120) (cps/50)
@@ -63,7 +63,7 @@ xanadu1 cps = do
xanadu2 :: D -> SE Sig
xanadu2 cps = do
_ <- delayr 0.4
- [d1, d2] <- mapM deltap3 [0.07, 0.105]
+ ~ [d1, d2] <- mapM deltap3 [0.07, 0.105]
delayw $ g * damping
return $ damping * mean [d1, gleft, d2, gright]
where (g, gleft, gright) = xanaduPlucks cps (1/80) 6.1
diff --git a/src/Csound/Catalog/Wave/WoodwindAlg.hs b/src/Csound/Catalog/Wave/WoodwindAlg.hs
index 82838eb..2d99b31 100644
--- a/src/Csound/Catalog/Wave/WoodwindAlg.hs
+++ b/src/Csound/Catalog/Wave/WoodwindAlg.hs
@@ -126,7 +126,7 @@ rndWoodwind spec vibCoeff attack sustain decay brightnessLevel cps = do
woodwindVibrato xdur asig = do
let ivibdepth = abs (vibCoeff * cps)
kvibdepth <- randiPct 0.1 5 $ sig ivibdepth * linseg [0.1, 0.8 * xdur, 1, 0.2 * xdur, 0.7]
- [ivibr1, ivibr2, ivibr3] <- mapM rndWithin $ replicate 3 (0, 1)
+ ~ [ivibr1, ivibr2, ivibr3] <- mapM rndWithin $ replicate 3 (0, 1)
kvibrate <- randiPct 0.1 5 $
ifB (sig vibCoeff >* 0)
-- if vibrato is positive it gets faster
@@ -137,7 +137,7 @@ rndWoodwind spec vibCoeff attack sustain decay brightnessLevel cps = do
freqDeviation :: ((D, D), (D, D), (D, D), (D, D)) -> (D, D, D) -> Sig -> Rnd Sig
freqDeviation (f1, f2, f3, f4) (iattack, isustain, idecay) asig = do
- [fdev1, fdev2, fdev3, fdev4] <- mapM rndWithin [f1, f2, f3, f4]
+ ~ [fdev1, fdev2, fdev3, fdev4] <- mapM rndWithin [f1, f2, f3, f4]
return $ asig * (1 + linseg [fdev1, iattack, fdev2, isustain, fdev3, idecay, fdev4])
ampVar :: D -> Sig -> Rnd Sig