hunk ./haskore-supercollider.cabal 2 -Version: 0.2 +Version: 0.3 hunk ./haskore-supercollider.cabal 29 - tag: 0.2 + tag: 0.3 hunk ./haskore-supercollider.cabal 58 - process >=1.0 && <1.2, - array >=0.1 && <0.5, + process >=1.0 && <1.3, + array >=0.1 && <0.6, hunk ./haskore-supercollider.cabal 43 - hosc >=0.13 && <0.14, - hsc3 >=0.13 && <0.14, - opensoundcontrol-ht >=0.2 && <0.3, - supercollider-ht >=0.2 && <0.3, + hosc >=0.15 && <0.16, + hsc3 >=0.15 && <0.16, + opensoundcontrol-ht >=0.3 && <0.4, + supercollider-ht >=0.3 && <0.4, hunk ./src/Haskore/Interface/SuperCollider/Channel.hs 8 -import qualified Sound.SC3.UGen.IO as SCIO +import qualified Sound.SC3.UGen.Bindings.DB as SCIO hunk ./src/Haskore/Interface/SuperCollider/Example.hs 11 -import qualified Sound.SC3.UGen.Oscillator as SCOsci -import qualified Sound.SC3.UGen.Filter as SCFilter -import qualified Sound.SC3.UGen.Noise.ID as SCNoise -import qualified Sound.SC3.UGen.Envelope as SCEnv +import qualified Sound.SC3.UGen.Bindings.DB as SCOsci +import qualified Sound.SC3.UGen.Bindings.DB as SCFilter +import qualified Sound.SC3.UGen.Bindings.DB as SCNoise +import qualified Sound.SC3.UGen.Bindings.DB as SCEnv hunk ./src/Haskore/Interface/SuperCollider/Example.hs 16 +import Sound.SC3.UGen.Envelope (SCEnv.Envelope(SCEnv.Envelope)) replace ./src/Haskore/Interface/SuperCollider/Example.hs [A-Za-z_0-9\-\.] SCEnv.Envelope Envelope hunk ./src/Haskore/Interface/SuperCollider/Example/Air.hs 8 -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.Bindings.DB as SCOsci +import qualified Sound.SC3.UGen.Bindings.DB as SCFilt +import qualified Sound.SC3.UGen.Bindings.DB as SCUGEnv hunk ./src/Haskore/Interface/SuperCollider/Example/Morph.hs 9 -import qualified Sound.SC3.UGen.Oscillator as SCOsci -import qualified Sound.SC3.UGen.Filter as SCFilt +import qualified Sound.SC3.UGen.Bindings.DB as SCOsci +import qualified Sound.SC3.UGen.Bindings.DB as SCFilt hunk ./src/Haskore/Interface/SuperCollider/Example/Morph.hs 12 -import qualified Sound.SC3.UGen.Envelope as SCEnv +import qualified Sound.SC3.UGen.Bindings.DB as SCEnv hunk ./src/Haskore/Interface/SuperCollider/Play.hs 29 -import qualified Sound.OpenSoundControl.Type as OSC -import qualified Sound.OpenSoundControl.Time as OSCTime +import qualified Sound.OSC.Type as OSC +import qualified Sound.OSC.Time as OSCTime hunk ./src/Haskore/Interface/SuperCollider/Play/Channel.hs 10 -import qualified Sound.SC3.UGen.Oscillator as SCOsci -import qualified Sound.SC3.UGen.Filter as SCFilt +import qualified Sound.SC3.UGen.Bindings.DB as SCOsci +import qualified Sound.SC3.UGen.Bindings.DB as SCFilt hunk ./src/Haskore/Interface/SuperCollider/Play/Channel.hs 17 +import Sound.SC3.Server.Enum (AddAction(SCCmd.AddToTail)) replace ./src/Haskore/Interface/SuperCollider/Play/Channel.hs [A-Za-z_0-9\-\.] SCCmd.AddToTail AddToTail hunk ./src/Haskore/Interface/SuperCollider/Play/Live.hs 18 -import qualified Sound.SC3.UGen.IO as SCIO hunk ./src/Haskore/Interface/SuperCollider/Play/Live.hs 19 -import qualified Sound.SC3.UGen.Oscillator as SCOsci -import qualified Sound.SC3.UGen.Filter as SCFilt +import qualified Sound.SC3.UGen.Bindings.DB as SCIO +import qualified Sound.SC3.UGen.Bindings.DB as SCOsci +import qualified Sound.SC3.UGen.Bindings.DB as SCFilt +import qualified Sound.SC3.UGen.Bindings.DB as SCNoise hunk ./src/Haskore/Interface/SuperCollider/Play/Live.hs 24 -import qualified Sound.SC3.UGen.Noise.ID as SCNoise hunk ./src/Haskore/Interface/SuperCollider/Play/Live.hs 31 +import Sound.SC3.Server.Enum (AddAction(SCCmd.AddToTail, AddToHead)) hunk ./src/Haskore/Interface/SuperCollider/Play/Live.hs 258 - Play.playAtom SCPlay.noId name $ + Play.playAtom SCPlay.autoId name $ replace ./src/Haskore/Interface/SuperCollider/Play/Live.hs [A-Za-z_0-9\-\.] SCCmd.AddToTail AddToTail hunk ./src/Haskore/Interface/SuperCollider/Render.hs 20 -import qualified Sound.OpenSoundControl.Type as OSC -import qualified Sound.OpenSoundControl.Time as OSCTime +import qualified Sound.OSC.Type as OSC +import qualified Sound.OSC.Time as OSCTime hunk ./src/Haskore/Interface/SuperCollider/Schedule.hs 22 +import Sound.SC3.Server.Enum (AddAction(SCCmd.AddToTail, SCCmd.AddToHead)) hunk ./src/Haskore/Interface/SuperCollider/Schedule.hs 26 -import qualified Sound.OpenSoundControl.Type as OSC +import qualified Sound.OSC.Type as OSC replace ./src/Haskore/Interface/SuperCollider/Schedule.hs [A-Za-z_0-9\-\.] SCCmd.AddToHead AddToHead replace ./src/Haskore/Interface/SuperCollider/Schedule.hs [A-Za-z_0-9\-\.] SCCmd.AddToTail AddToTail hunk ./src/Haskore/Interface/SuperCollider/Schedule/Channel.hs 8 -import qualified Sound.SC3.UGen.Oscillator as SCOsci -import qualified Sound.SC3.UGen.Filter as SCFilt +import qualified Sound.SC3.UGen.Bindings.DB as SCOsci +import qualified Sound.SC3.UGen.Bindings.DB as SCFilt hunk ./src/Haskore/Interface/SuperCollider/Schedule/Channel.hs 15 +import Sound.SC3.Server.Enum (AddAction(SCCmd.AddToTail)) hunk ./src/Haskore/Interface/SuperCollider/Schedule/Channel.hs 19 -import qualified Sound.OpenSoundControl.Type as OSC +import qualified Sound.OSC.Type as OSC replace ./src/Haskore/Interface/SuperCollider/Schedule/Channel.hs [A-Za-z_0-9\-\.] SCCmd.AddToTail AddToTail hunk ./src/Haskore/Interface/SuperCollider/Schedule/Install.hs 11 -import qualified Sound.OpenSoundControl.Type as OSC +import qualified Sound.OSC.Type as OSC hunk ./src/Haskore/Interface/SuperCollider/Channel/File.hs 11 +import System.IO.Error (catchIOError) + hunk ./src/Haskore/Interface/SuperCollider/Channel/File.hs 23 - do num <- catch + do num <- catchIOError hunk ./src/Haskore/Interface/SuperCollider/Channel/File.hs 27 - else ioError (userError "not a number in channel file")) + else ioError (userError "not a number in channel file")) hunk ./src/Haskore/Interface/SuperCollider/Render.hs 34 -import System.Cmd (rawSystem) +import System.Process (rawSystem) hunk ./src/Haskore/Interface/SuperCollider/Schedule/Channel.hs 48 -import Control.Monad (liftM2, ) +import Control.Monad (liftM2, liftM, ap, ) +import Control.Applicative (Applicative, pure, (<*>), ) hunk ./src/Haskore/Interface/SuperCollider/Schedule/Channel.hs 60 +instance Functor Environment where + fmap = liftM + +instance Applicative Environment where + (<*>) = ap + pure = return + hunk ./src/Haskore/Interface/SuperCollider/Schedule/Install.hs 32 +import Control.Monad (liftM, ap, ) +import Control.Applicative (Applicative, pure, (<*>), ) hunk ./src/Haskore/Interface/SuperCollider/Schedule/Install.hs 45 +instance Functor Environment where + fmap = liftM + +instance Applicative Environment where + (<*>) = ap + pure = return + hunk ./Makefile 15 - (export SC_JACK_DEFAULT_OUTPUTS=alsa_pcm:playback_1,alsa_pcm:playback_2; \ + (export SC_JACK_DEFAULT_OUTPUTS=system; \ replace ./src/Haskore/Interface/SuperCollider/Play/Channel.hs [A-Za-z_0-9\-\.] Sound.OpenSoundControl.Transport.File Sound.OSC.Transport.File hunk ./haskore-supercollider.cabal 15 -Tested-With: GHC==6.4.1, GHC==6.8.2 +Tested-With: GHC==7.8.3 hunk ./haskore-supercollider.cabal 6 +Maintainer: Henning Thielemann