haskore-supercollider 0.1.2 → 0.1.2.1
raw patch · 4 files changed
+13/−13 lines, 4 filesdep ~hoscdep ~hsc3
Dependency ranges changed: hosc, hsc3
Files
- haskore-supercollider.cabal +4/−4
- src/Haskore/Interface/SuperCollider/Example.hs +6/−6
- src/Haskore/Interface/SuperCollider/Play/Live.hs +1/−1
- src/Haskore/Interface/SuperCollider/SoundMap.hs +2/−2
haskore-supercollider.cabal view
@@ -1,5 +1,5 @@ Name: haskore-supercollider-Version: 0.1.2+Version: 0.1.2.1 License: GPL License-File: LICENSE Author: Henning Thielemann <haskell@henning-thielemann.de>@@ -26,7 +26,7 @@ Source-Repository this type: darcs location: http://code.haskell.org/haskore/revised/supercollider/- tag: 0.1.2+ tag: 0.1.2.1 Flag splitBase description: Choose the new smaller, split-up base package.@@ -40,8 +40,8 @@ haskore-realtime >= 0.1 && < 0.2, haskore >=0.1 && <0.3, -- for SuperCollider support- hosc >=0.6 && <0.7,- hsc3 >=0.6 && <0.7,+ hosc >=0.8 && <0.9,+ hsc3 >=0.8 && <0.9, opensoundcontrol-ht >=0.1 && <0.2, supercollider-ht >=0.1 && <0.2, bytestring >=0.9 && <1.0,
src/Haskore/Interface/SuperCollider/Example.hs view
@@ -10,7 +10,7 @@ import qualified Sound.SC3.UGen.Rate as SCRate import qualified Sound.SC3.UGen.Oscillator as SCOsci import qualified Sound.SC3.UGen.Filter as SCFilter-import qualified Sound.SC3.UGen.Noise.Base as SCNoise+import qualified Sound.SC3.UGen.Noise.ID as SCNoise import qualified Sound.SC3.UGen.Envelope as SCEnv import qualified Sound.SC3.UGen.Envelope.Construct as SCEnvCons import Sound.SC3.UGen.Enum@@ -217,7 +217,7 @@ colorDust sampleRate = SoundMap.instrumentFromUGen $ \ _vel freq -> 0.0005 * SCFilter.rlpf- (SCUGen.Constant sampleRate * SCNoise.dust zeroUId SCRate.AR 10)+ (SCUGen.Constant sampleRate * SCNoise.dust seed SCRate.AR 10) freq 0.01 @@ -347,13 +347,13 @@ [clippedFadeDur, max 0 (sustainDur-fadeDur), clippedFadeDur] segTypes (-1) (-1) -zeroUId :: SCUGen.UGenId-zeroUId = SCUGen.UGenId 0+seed :: Int+seed = 0 hihat :: SoundMap.Drum hihat = SoundMap.drumFromUGen $ \ vel ->- let noise = SCNoise.whiteNoise zeroUId SCRate.AR+ let noise = SCNoise.whiteNoise seed SCRate.AR in SCFilter.hpf noise (SCUGen.MCE [4000, 4001]) * SCEnv.xLine SCRate.KR 1 0.01 0.2 DoNothing * vel * 0.25 @@ -397,7 +397,7 @@ -- nsenv = 0.02 + SCEnv.xLine SCRate.KR 2 0.00001 0.15 DoNothing nsenv = SCEnv.line SCRate.KR 0.02 0.02 0.15 PauseSynth + SCEnv.xLine SCRate.KR 2 0.00001 0.15 PauseSynth- noise = SCFilter.lpf (SCNoise.whiteNoise zeroUId SCRate.AR) 5000 * nsenv+ noise = SCFilter.lpf (SCNoise.whiteNoise seed SCRate.AR) 5000 * nsenv drm = SCMath.clip2 0.5 (osci + noise) * vel * 0.8 in SCUGen.MCE [drm,drm]
src/Haskore/Interface/SuperCollider/Play/Live.hs view
@@ -20,7 +20,7 @@ import qualified Sound.SC3.UGen.Oscillator as SCOsci import qualified Sound.SC3.UGen.Filter as SCFilt import qualified Sound.SC3.UGen.Envelope as SCUGEnv-import qualified Sound.SC3.UGen.Noise.Base as SCNoise+import qualified Sound.SC3.UGen.Noise.ID as SCNoise import qualified Sound.SC3.UGen.UId as SCUId import Sound.SC3.UGen.Enum (DoneAction(DoNothing, PauseSynth))
src/Haskore/Interface/SuperCollider/SoundMap.hs view
@@ -32,7 +32,7 @@ attributeControl :: Int -> UGen attributeControl n =- SCUGen.Control SCRate.KR (attributeName n) 0+ SCUGen.control SCRate.KR (attributeName n) 0 attributeName :: Int -> String attributeName n = "attribute" ++ show n@@ -41,7 +41,7 @@ attributeNames = map attributeName [0..] control :: String -> UGen-control name = SCUGen.Control SCRate.KR name 0+control name = SCUGen.control SCRate.KR name 0 pitchName :: String pitchName = "pitch"