summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAntonKholomiov <>2014-07-17 15:16:00 (GMT)
committerhdiff <hdiff@hdiff.luite.com>2014-07-17 15:16:00 (GMT)
commitfcec457c61144d20a3f2377483b7e077134f1ac9 (patch)
tree05ca7c9cebefc2fb1c92302eb3e12eb20cac8dce
parentd5274f0f9f6af176ba27d66ff3f9997a67aa75d0 (diff)
version 0.1.30.1.3
-rw-r--r--csound-catalog.cabal4
-rw-r--r--src/Csound/Catalog/Drum.hs3
-rw-r--r--src/Csound/Catalog/Wave/Ac.hs2
-rw-r--r--src/Csound/Catalog/Wave/Amsterdam.hs4
-rw-r--r--src/Csound/Catalog/Wave/VestigeOfTime.hs4
5 files changed, 9 insertions, 8 deletions
diff --git a/csound-catalog.cabal b/csound-catalog.cabal
index 65986ee..9f42755 100644
--- a/csound-catalog.cabal
+++ b/csound-catalog.cabal
@@ -1,5 +1,5 @@
Name: csound-catalog
-Version: 0.1.2
+Version: 0.1.3
Cabal-Version: >= 1.6
License: BSD3
License-file: LICENSE
@@ -27,7 +27,7 @@ Source-repository head
Library
Ghc-Options: -Wall
Build-Depends:
- base >= 4, base < 5, transformers >= 0.3, csound-expression >= 3.3.0
+ base >= 4, base < 5, transformers >= 0.3, csound-expression >= 3.3.2
Hs-Source-Dirs: src/
Exposed-Modules:
Csound.Catalog
diff --git a/src/Csound/Catalog/Drum.hs b/src/Csound/Catalog/Drum.hs
index 680f834..4f96cb1 100644
--- a/src/Csound/Catalog/Drum.hs
+++ b/src/Csound/Catalog/Drum.hs
@@ -18,6 +18,9 @@ import Csound.Base
-- subtractive
+bpb :: Sig -> Sig -> Sig -> Sig
+bpb cfq q asig = balance (bp cfq q asig) asig
+
-- | A \"dumb\" drum.
dumb :: SE Sig
dumb = fmap (bpb 1000 100) $ rand $ expseg [0.0001, 0.01, 1, 0.04, 0.01]
diff --git a/src/Csound/Catalog/Wave/Ac.hs b/src/Csound/Catalog/Wave/Ac.hs
index aa63d0c..8d9fe22 100644
--- a/src/Csound/Catalog/Wave/Ac.hs
+++ b/src/Csound/Catalog/Wave/Ac.hs
@@ -73,7 +73,7 @@ xanadu2 cps = do
--
-- > stringPad amplitude cps
stringPad :: Sig -> Sig -> Sig
-stringPad amp cps = blp (900 + amp * 300) $ chorus [0, 0.1, -0.1] f cps
+stringPad amp cps = blp (900 + amp * 300) $ chorusPitch 3 0.1 f cps
where f x = poscil 1 x giwave
-- | Tone wheel organ by Mikelson
diff --git a/src/Csound/Catalog/Wave/Amsterdam.hs b/src/Csound/Catalog/Wave/Amsterdam.hs
index b702481..99212b5 100644
--- a/src/Csound/Catalog/Wave/Amsterdam.hs
+++ b/src/Csound/Catalog/Wave/Amsterdam.hs
@@ -15,9 +15,7 @@ import Csound.Base
--
-- * cps - the frequency of the note
tibetan :: Int -> Sig -> D -> Sig
-tibetan n off cps = chorus dts (oscBy wave) (sig cps)
+tibetan n off cps = chorusPitch n (2 * off * fromIntegral n) (oscBy wave) (sig cps)
where wave = ifB (cps <* 230) (waveBy 5) (ifB (cps <* 350) (waveBy 3) (waveBy 1))
waveBy x = sines $ [0.3, 0, 0, 0] ++ replicate x 0.1
- dts = fmap ((* off) . fromIntegral) $ let dx = div n 2 in fmap (\x -> x - dx) [0 .. n - 1]
-
diff --git a/src/Csound/Catalog/Wave/VestigeOfTime.hs b/src/Csound/Catalog/Wave/VestigeOfTime.hs
index 4d77675..189aa3b 100644
--- a/src/Csound/Catalog/Wave/VestigeOfTime.hs
+++ b/src/Csound/Catalog/Wave/VestigeOfTime.hs
@@ -34,7 +34,7 @@ filteredSawFalling fallDur = filteredSaw (linseg [5000, fallDur, 500])
filteredSaw :: Sig -> Sig -> Sig
filteredSaw kcf cps = aout
where
- a1 = chorus [0, 0.998, 1.003] saw cps
+ a1 = chorusPitch 3 0.003 saw cps
aout = reson a1 kcf 100 `withD` 2
-- | The white noise is filtered with band pass filter. Centere frequency of the filter
@@ -97,7 +97,7 @@ resonVibrato vibDepth vibRate filt amp cps = gain 8 aout
femaleVowel :: Reson -> Sig -> Sig
femaleVowel vowel cps = aout
where
- afilt1 = chorus [0, 1.003] (\x -> buzz 1 x 15 sine) cps
+ afilt1 = chorusPitch 3 0.003 (\x -> buzz 1 x 15 sine) cps
aout = blp 2000 $ resonsBy (\cf bw x -> reson x cf bw `withD` 2) vowel afilt1
-- | Delayed saw wave.