summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAntonKholomiov <>2016-12-12 16:26:00 (GMT)
committerhdiff <hdiff@hdiff.luite.com>2016-12-12 16:26:00 (GMT)
commitd05a8c4980cf0ad2cc89d8f2ec4ebcb6feefec72 (patch)
treec7d54f6ef1994cb655e81d0c0790c7b9da135f18
parent053542814921925f81d90438bb2502964b014c89 (diff)
version 0.6.10.6.1
-rw-r--r--csound-catalog.cabal2
-rw-r--r--src/Csound/Catalog/Wave/Sharc.hs4
-rw-r--r--src/Csound/Patch.hs10
3 files changed, 11 insertions, 5 deletions
diff --git a/csound-catalog.cabal b/csound-catalog.cabal
index 80eb76d..5d9c8af 100644
--- a/csound-catalog.cabal
+++ b/csound-catalog.cabal
@@ -1,5 +1,5 @@
Name: csound-catalog
-Version: 0.6.0
+Version: 0.6.1
Cabal-Version: >= 1.6
License: BSD3
License-file: LICENSE
diff --git a/src/Csound/Catalog/Wave/Sharc.hs b/src/Csound/Catalog/Wave/Sharc.hs
index 8824b29..ef6588b 100644
--- a/src/Csound/Catalog/Wave/Sharc.hs
+++ b/src/Csound/Catalog/Wave/Sharc.hs
@@ -93,7 +93,7 @@ soloSharcOsc instr cps = mul (fades 0.001 0.05) $ rndSharcOsc instr cps
-- | Plays a orchestrated instrument (with pitch chorus)
orcSharcOsc :: SharcInstr -> D -> SE Sig
-orcSharcOsc instr cps = mul (fades 0.01 0.42) $ uni (rndSharcOsc instr . ir) (sig cps)
+orcSharcOsc instr cps = mul (fades 0.01 0.42) $ uni (rndSigSharcOsc instr cps) (sig cps)
-- | Plays a solo instrument with pad-like envelope
purePadSharcOsc :: SharcInstr -> D -> SE Sig
@@ -101,7 +101,7 @@ purePadSharcOsc instr cps = mul (fades 0.65 0.75) $ rndSharcOsc instr cps
-- | Plays orchestrated instrument with pad-like envelope
padSharcOsc :: SharcInstr -> D -> SE Sig
-padSharcOsc instr cps = mul (fades 0.65 0.75) $ uni (rndSharcOsc instr . ir) (sig cps)
+padSharcOsc instr cps = mul (fades 0.65 0.75) $ uni (rndSigSharcOsc instr cps) (sig cps)
---------------------------------------------------------------------------
-- padsynth
diff --git a/src/Csound/Patch.hs b/src/Csound/Patch.hs
index cd43115..ff1f6e9 100644
--- a/src/Csound/Patch.hs
+++ b/src/Csound/Patch.hs
@@ -490,6 +490,12 @@ dreamPad' bright = dreamPadFx $ polySynt $ fmap fromMono . onCps (C.dreamPad bri
dreamPadBy' :: Sig -> (Sig -> SE Sig) -> Patch2
dreamPadBy' bright wave = dreamPadFx $ polySynt $ fmap fromMono . onCps (C.dreamPadBy wave bright)
+dreamPadWithKey :: (D -> Sig -> SE Sig) -> Patch2
+dreamPadWithKey = dreamPadWithKey' 0.35
+
+dreamPadWithKey' :: Sig -> (D -> Sig -> SE Sig) -> Patch2
+dreamPadWithKey' bright wave = dreamPadFx $ polySynt $ fmap fromMono . onCps (\cps -> (C.dreamPadBy (wave cps) bright) (sig cps))
+
-- | The first argument is brightness (0 to 1)
dreamPadm' :: Sig -> Patch2
dreamPadm' bright = dreamPadFx $ MonoSynt def $ fmap fromMono . onSig1 (C.dreamPad bright)
@@ -1273,11 +1279,11 @@ purePadSharc instr = fx1 0.35 largeHall2 $ polySynt $ fmap fromMono . onCps (C.p
-- | Dream Pad patch made with SHARC oscillators.
dreamSharc :: SharcInstr -> Patch2
-dreamSharc instr = dreamPadBy (\cps -> C.rndSigSharcOsc instr (ir cps) cps)
+dreamSharc instr = dreamPadWithKey (C.rndSigSharcOsc instr)
-- | Dream Pad patch made with SHARC oscillators.
dreamSharc' :: SharcInstr -> Sig -> Patch2
-dreamSharc' instr brightness = dreamPadBy' brightness (\cps -> C.rndSigSharcOsc instr (ir cps) cps)
+dreamSharc' instr brightness = dreamPadWithKey' brightness (C.rndSigSharcOsc instr)
type PadsynthBandwidth = Double