supercollider-ht 0.1.0.1 → 0.1.1
raw patch · 3 files changed
+24/−21 lines, 3 filesdep −bytestringdep ~hoscdep ~hsc3dep ~transformersPVP: major bump suggested
API removals or changes: PVP suggests a major version bump
Dependencies removed: bytestring
Dependency ranges changed: hosc, hsc3, transformers
API changes (from Hackage documentation)
+ Sound.SC3.Example.Effect: seed :: Int
- Sound.SC3.Example.Effect: dbl :: a -> [a]
+ Sound.SC3.Example.Effect: dbl :: a -> (a, a)
- Sound.SC3.Example.Effect: loadEffect :: (C m) => String -> UGen -> m OSC
+ Sound.SC3.Example.Effect: loadEffect :: C m => String -> UGen -> m OSC
- Sound.SC3.Example.Effect: loadTone :: (C m) => String -> (UGen -> UGen -> UGen) -> m OSC
+ Sound.SC3.Example.Effect: loadTone :: C m => String -> (UGen -> UGen -> UGen) -> m OSC
- Sound.SC3.Example.Effect: newGroup :: (C m) => Int -> Int -> m ()
+ Sound.SC3.Example.Effect: newGroup :: C m => Int -> Int -> m ()
- Sound.SC3.Example.Effect: playEffect :: (C m) => Int -> String -> m ()
+ Sound.SC3.Example.Effect: playEffect :: C m => Int -> String -> m ()
- Sound.SC3.Example.Effect: playTone :: (C m) => String -> Double -> Double -> m ()
+ Sound.SC3.Example.Effect: playTone :: C m => String -> Double -> Double -> m ()
- Sound.SC3.Example.Effect: playToneInGroup :: (C m) => Int -> String -> Double -> Double -> m ()
+ Sound.SC3.Example.Effect: playToneInGroup :: C m => Int -> String -> Double -> Double -> m ()
- Sound.SC3.Example.Effect: playToneSep :: (C m) => String -> Double -> Double -> m ()
+ Sound.SC3.Example.Effect: playToneSep :: C m => String -> Double -> Double -> m ()
- Sound.SC3.Server.PlayEasy: play :: (C m) => UGen -> m OSC
+ Sound.SC3.Server.PlayEasy: play :: C m => UGen -> m OSC
- Sound.SC3.Server.PlayEasy: playId :: (C m) => NodeId -> UGen -> m OSC
+ Sound.SC3.Server.PlayEasy: playId :: C m => NodeId -> UGen -> m OSC
- Sound.SC3.Server.PlayEasy: playIdCustomOut :: (C m) => NodeId -> UGen -> m OSC
+ Sound.SC3.Server.PlayEasy: playIdCustomOut :: C m => NodeId -> UGen -> m OSC
- Sound.SC3.Server.PlayEasy: reset :: (C m) => m ()
+ Sound.SC3.Server.PlayEasy: reset :: C m => m ()
- Sound.SC3.Server.PlayEasy: set :: (C m) => String -> Double -> m ()
+ Sound.SC3.Server.PlayEasy: set :: C m => String -> Double -> m ()
- Sound.SC3.Server.PlayEasy: setId :: (C m) => NodeId -> String -> Double -> m ()
+ Sound.SC3.Server.PlayEasy: setId :: C m => NodeId -> String -> Double -> m ()
- Sound.SC3.Server.PlayEasy: setMulti :: (C m) => [(String, Double)] -> m ()
+ Sound.SC3.Server.PlayEasy: setMulti :: C m => [(String, Double)] -> m ()
- Sound.SC3.Server.PlayEasy: simpleSync :: (C m) => OSC -> m ()
+ Sound.SC3.Server.PlayEasy: simpleSync :: C m => OSC -> m ()
- Sound.SC3.Server.PlayEasy: stop :: (C m) => m ()
+ Sound.SC3.Server.PlayEasy: stop :: C m => m ()
- Sound.SC3.Server.PlayEasy: stopId :: (C m) => NodeId -> m ()
+ Sound.SC3.Server.PlayEasy: stopId :: C m => NodeId -> m ()
- Sound.SC3.Server.PlayEasy: sync :: (C m) => OSC -> m OSC
+ Sound.SC3.Server.PlayEasy: sync :: C m => OSC -> m OSC
Files
- src/Sound/SC3/Example/Effect.hs +17/−14
- src/Sound/SC3/Example/Timing.hs +3/−3
- supercollider-ht.cabal +4/−4
src/Sound/SC3/Example/Effect.hs view
@@ -6,7 +6,7 @@ import Sound.SC3.UGen.Envelope (envGen, xLine, pauseSelf, ) import Sound.SC3.UGen.Filter import Sound.SC3.UGen.IO-import Sound.SC3.UGen.Noise.Base+import Sound.SC3.UGen.Noise.ID import Sound.SC3.UGen.Panner import Sound.SC3.UGen.Oscillator import Sound.SC3.UGen.Enum (Warp(Linear), DoneAction(RemoveSynth), EnvCurve(EnvNum), )@@ -23,7 +23,7 @@ import System.Random(randomRs, mkStdGen, ) import Control.Concurrent(threadDelay, )-import Control.Monad.Trans (lift, )+import Control.Monad.Trans.Class (lift, ) import System.Cmd (rawSystem) @@ -57,18 +57,21 @@ s = v * e * saw AR f w = rlpf s (exp e * (f * 1.2)) 0.05 +seed :: Int+seed = 0+ wind :: UGen -> UGen wind f = let lfo = f + sinOsc KR (sqrt 0.2) (-pi/2) * 100 + sinOsc KR 0.2 (-pi/3) * 200- noise = whiteNoise (UGenId 0) AR * 0.1+ noise = whiteNoise seed AR * 0.1 in rlpf noise lfo 0.005 windMouse :: UGen -> UGen windMouse f = let lfo = mouseY KR (f*0.5) (f*1.5) Linear 0.1- noise = whiteNoise (UGenId 0) AR * 0.1+ noise = whiteNoise seed AR * 0.1 in rlpf noise lfo 0.005 ps :: UGen@@ -79,8 +82,8 @@ envPerc' :: [UGen] envPerc' = EnvCons.envPerc' 0.01 1.0 1.0 (dbl (EnvNum (-4.0))) -dbl :: a -> [a]-dbl x = [x,x]+dbl :: a -> (a,a)+dbl x = (x,x) {- * complex configurations -} @@ -92,9 +95,9 @@ bassFilter :: UGen bassFilter = w- where control = Control KR "cutoff" 1000+ where ctrl = control KR "cutoff" 1000 tone = saw AR (MCE [55, 55.1]) * 0.1- w = rlpf tone control 0.05+ w = rlpf tone ctrl 0.05 bassFilterRun :: IO () bassFilterRun =@@ -107,9 +110,9 @@ bassFilterGlissando :: UGen bassFilterGlissando =- let control = 600 * exp (lag (lfNoise0 (UGenId 0) KR 6) 0.1)+ let ctrl = 600 * exp (lag (lfNoise0 seed KR 6) 0.1) tone = saw AR (MCE [55, 55.1]) * 0.1- w = rlpf tone control 0.05+ w = rlpf tone ctrl 0.05 in w @@ -119,8 +122,8 @@ -> m OSC loadTone name tone = Play.sync (Play.d_recv_synthdef name- (tone (Control KR "velocity" 0)- (Control KR "pitch" 0)))+ (tone (control KR "velocity" 0)+ (control KR "pitch" 0))) loadEffect :: Trans.C m => String@@ -187,8 +190,8 @@ where e = envGen KR 1 2 0 1 RemoveSynth envPerc' s = v * e * saw AR (MCE [f*1.001, f*0.999]) w = rlpf s (exp (e*filterDepth) * filterBase) 0.05- filterBase = Control KR "filter-base" 1000- filterDepth = Control KR "filter-depth" 1+ filterBase = control KR "filter-base" 1000+ filterDepth = control KR "filter-depth" 1 randomPerc :: IO () randomPerc =
src/Sound/SC3/Example/Timing.hs view
@@ -14,8 +14,8 @@ EnvCurve(EnvNum), DoneAction(RemoveSynth), AddAction(AddToTail), ) import qualified Sound.SC3.Server.PlayEasy as Play-import Control.Concurrent (forkIO)-import Control.Monad.Trans (liftIO)+import Control.Concurrent (forkIO, )+import Control.Monad.IO.Class (liftIO, ) -- * from old Rhs.Schedule module@@ -42,7 +42,7 @@ ping :: UGen -> UGen -> UGen ping f a = out 0 (sinOsc AR f 0 * e) where c = EnvNum (-4.0)- e = envGen KR 1 a 0 1 RemoveSynth (envPerc' 0.1 0.6 1 [c,c])+ e = envGen KR 1 a 0 1 RemoveSynth (envPerc' 0.1 0.6 1 (c,c)) latency :: Double latency = 0.05
supercollider-ht.cabal view
@@ -1,5 +1,5 @@ Name: supercollider-ht-Version: 0.1.0.1+Version: 0.1.1 License: GPL License-File: LICENSE Copyright: Henning Thielemann, 2008-2009@@ -27,7 +27,7 @@ Source-Repository this type: darcs location: http://code.haskell.org/~thielema/supercollider/- tag: 0.1.0.1+ tag: 0.1.1 Flag splitBase@@ -38,9 +38,9 @@ default: False Library- Build-Depends: hosc >=0.6 && <0.7, hsc3 >=0.6 && <0.7+ Build-Depends: hosc >=0.8 && <0.9, hsc3 >=0.8 && <0.9 Build-Depends: opensoundcontrol-ht >=0.1 && <0.2- Build-Depends: transformers >=0.0 && <0.2, bytestring >=0.9 && <0.10+ Build-Depends: transformers >=0.2 && <0.3 If flag(splitBase) Build-Depends: random >= 1.0 && <2,