supercollider-ht 0.2.0.1 → 0.3

raw patch · 4 files changed

+38/−30 lines, 4 filesdep ~hoscdep ~hsc3dep ~opensoundcontrol-htPVP ok

version bump matches the API change (PVP)

Dependency ranges changed: hosc, hsc3, opensoundcontrol-ht, process

API changes (from Hackage documentation)

Files

• src/Sound/SC3/Example/Effect.hs +20/−11
• src/Sound/SC3/Example/Timing.hs +4/−4
• src/Sound/SC3/Server/PlayEasy.hs +7/−7
• supercollider-ht.cabal +7/−8

@@ -1,5 +1,6 @@ {- |-Remember to call @withSC3 reset@ before trying any example.+Remember to call @initialize@ before trying any example.+Otherwise, @scsynth@ says @FAILURE /s_new Group not found@. An example can be tested with 'audition'. The sound can be stopped with @withSC3 reset@, again. -}@@ -9,24 +10,25 @@ import Sound.SC3.UGen.Type (UGen, mce, ) import Sound.SC3.UGen.Rate import Sound.SC3.UGen.Math-import Sound.SC3.UGen.Envelope (Envelope, envGen, xLine, pauseSelf, )-import Sound.SC3.UGen.Filter-import Sound.SC3.UGen.IO-import Sound.SC3.UGen.Noise.ID-import Sound.SC3.UGen.Panner-import Sound.SC3.UGen.Oscillator+import Sound.SC3.UGen.Envelope (Envelope, )+import Sound.SC3.UGen.Bindings.DB import Sound.SC3.UGen.Enum (Warp(Linear), DoneAction(RemoveSynth), Envelope_Curve(EnvNum), )+import Sound.SC3.Server.Enum (AddAction(AddToTail, AddToHead), ) import Sound.SC3.Server.Command-import Sound.SC3.Server.PlayEasy as Play import Sound.SC3.Server.NRT (NRT(NRT), writeNRT, )+ import qualified Sound.SC3.UGen.Envelope.Construct as EnvCons+import qualified Sound.SC3.Server.PlayEasy as Play+import Sound.SC3.Server.PlayEasy+          (withSC3, play, audition, stop, reset,+           homeId, rootId, autoId, lastId, set, send, ) -import qualified Sound.OpenSoundControl.Type as OSC+import qualified Sound.OSC.Type as OSC import Sound.OSC.Transport.Monad (Transport, )  import Control.Concurrent (threadDelay, ) import Control.Exception (finally, )-import System.Cmd (rawSystem)+import System.Process (rawSystem)  import System.Random (randomRs, mkStdGen, ) @@ -34,6 +36,10 @@ import Control.Monad (liftM, )  +initialize :: IO ()+initialize = withSC3 reset++ {- * example sounds -}  analogBubbles :: UGen@@ -42,7 +48,10 @@         f = lfSaw KR 0.4 1 * 24 + o         o = lfSaw KR (mce [8, 7.23]) 0 * 3 + 80 +analogBubblesRun :: IO ()+analogBubblesRun = void $ audition analogBubbles + pgmouse :: UGen -> UGen pgmouse f = pan2 i l 1     where i = sinOsc AR f 0 * envGen KR 1 1 0 1 RemoveSynth envPerc' * 0.1@@ -82,7 +91,7 @@  ps :: UGen ps = mrg2 a b-    where a = pauseSelf (mouseX KR (-1) 1 Linear 0.1)+    where a = pauseSelf KR (mouseX KR (-1) 1 Linear 0.1)           b = out 0 (sinOsc AR 440 0 * 0.1)  envPerc' :: Fractional a => Envelope a

@@ -8,10 +8,10 @@            Envelope_Curve(EnvNum), DoneAction(RemoveSynth),            AddAction(AddToTail), ) -import qualified Sound.OpenSoundControl.Time as Time-import qualified Sound.OpenSoundControl.Type as OSC-import Sound.OpenSoundControl.Time-          (Time, pauseThread, pauseThreadUntil, )+import qualified Sound.OSC.Time as Time+import qualified Sound.OSC.Type as OSC+import Sound.OSC.Type (Time, )+import Sound.OSC.Time (pauseThread, pauseThreadUntil, ) import Sound.OSC.Transport.FD.UDP (UDP)  import Control.Concurrent (forkIO, )

@@ -8,18 +8,18 @@     simpleSync, mceDegree,    ) where -import Sound.SC3.UGen.IO (out)+import Sound.SC3.UGen.Bindings.DB (out) import Sound.SC3.UGen.Type (UGen(..), constant, Proxy(Proxy), MRG(..), Primitive(..), ) import Sound.SC3.UGen.MCE (MCE(..), ) import Sound.SC3.Server.Synthdef (synthdef, )+import Sound.SC3.Server.Enum (AddAction(AddToTail), ) import Sound.SC3.Server.Command-         (AddAction(AddToTail), s_new, d_recv, g_new, g_freeAll,-          n_set, n_free, )+         (s_new, d_recv, g_new, g_freeAll, n_set, n_free, ) -import qualified Sound.OpenSoundControl.Type as OSC+import qualified Sound.OSC.Type as OSC -import Sound.OpenSoundControl.Class (OSC)-import Sound.OpenSoundControl.Type (Packet(Packet_Message), )+import Sound.OSC.Class (OSC)+import Sound.OSC.Type (Packet(Packet_Message), ) import Sound.OSC.Transport.FD.TCP (TCP) import Sound.OSC.Transport.FD.UDP (UDP) import Sound.OSC.Transport.Monad@@ -27,7 +27,7 @@  import qualified Sound.OSC.Transport.FD.TCP as TCP import qualified Sound.OSC.Transport.FD.UDP as UDP-import qualified Sound.OpenSoundControl.Transport.File as File+import qualified Sound.OSC.Transport.File as File  import Prelude hiding (init, ) 

@@ -1,8 +1,7 @@ Name:             supercollider-ht-Version:          0.2.0.1+Version:          0.3 License:          GPL License-File:     LICENSE-Copyright:        Henning Thielemann, 2008-2013 Author:           Henning Thielemann <supercollider@henning-thielemann.de> Maintainer:       Henning Thielemann <supercollider@henning-thielemann.de> Stability:        Experimental@@ -17,7 +16,7 @@    .    * example effects Category:         Sound-Tested-With:      GHC==7.4.2+Tested-With:      GHC==7.8.3 Cabal-Version:    >=1.6 Build-Type:       Simple Source-Repository head@@ -27,7 +26,7 @@ Source-Repository this   type:     darcs   location: http://code.haskell.org/~thielema/supercollider/-  tag:      0.2.0.1+  tag:      0.3   Flag splitBase@@ -39,14 +38,14 @@  Library   Build-Depends:-    hosc >=0.13 && <0.14,-    hsc3 >=0.13 && <0.14,-    opensoundcontrol-ht >=0.2 && <0.3,+    hosc >=0.15 && <0.16,+    hsc3 >=0.15 && <0.16,+    opensoundcontrol-ht >=0.3 && <0.4,     transformers >=0.2 && <0.5   If flag(splitBase)     Build-Depends:       random >= 1.0 && <2,-      process >= 1.0 && <1.2,+      process >= 1.0 && <1.3,       base >= 2 && <5   Else     Build-Depends: base >= 1.0 && < 2