Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Portmidi #4

Merged
merged 3 commits into from
Jul 1, 2015
Merged

Portmidi #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b3b1083
allow a different shape for each channel
yaxu Jun 26, 2015
524388c
Merge remote-tracking branch 'upstream/portmidi' into portmidi
yaxu Jun 26, 2015
d36b11d
terser parameters
yaxu Jun 26, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions Sound/Tidal/MIDI/Output.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,8 @@ messageLoop stream shape ch port = do
return()
makeStream shape port = S.stream "127.0.0.1" port shape

keyproxy latency deviceName shape channels = do
let ports = (map (+ 7303) channels)
keyStreams = map (makeStream (C.toOscShape shape)) ports
keyproxy latency deviceName targets = do
let keyStreams = map (\(shape, channel) -> makeStream (C.toOscShape shape) (channel + 7303)) targets
deviceID <- getIDForDeviceName deviceName
case deviceID of
Nothing -> do putStrLn "List of Available Device Names"
Expand All @@ -78,7 +77,7 @@ keyproxy latency deviceName shape channels = do
Left conn -> do
sendevents conn
midiclock conn
zipWithM_ (messageLoop conn shape) (map fromIntegral channels) ports
mapM_ (\(shape,channel) -> messageLoop conn shape (fromIntegral channel) (channel + 7303)) targets
return keyStreams

midiclock stream = do
Expand Down
36 changes: 18 additions & 18 deletions Sound/Tidal/VolcaKeys.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,21 +30,21 @@ keys = ControllerShape { params = [

oscKeys = toOscShape keys

note = makeI oscKeys "note"
dur = makeF oscKeys "dur"
portamento = makeF oscKeys "portamento"
expression = makeF oscKeys "expression"
octave = makeF oscKeys "octave"
voice = makeF oscKeys "voice"
detune = makeF oscKeys "detune"
vcoegint = makeF oscKeys "vcoegint"
kcutoff = makeF oscKeys "kcutoff"
vcfegint = makeF oscKeys "vcfegint"
lforate = makeF oscKeys "lforate"
lfopitchint = makeF oscKeys "lfopitchint"
lfocutoffint = makeF oscKeys "lfocutoffint"
attack = makeF oscKeys "attack"
decay = makeF oscKeys "decay"
sustain = makeF oscKeys "sustain"
dtime = makeF oscKeys "dtime"
dfeedback = makeF oscKeys "dfeedback"
note = makeI oscKeys "note"
dur = makeF oscKeys "dur"
por = makeF oscKeys "portamento"
expr = makeF oscKeys "expression"
oct = makeF oscKeys "octave"
voi = makeF oscKeys "voice"
det = makeF oscKeys "detune"
vco = makeF oscKeys "vcoegint"
ctf = makeF oscKeys "kcutoff"
vcf = makeF oscKeys "vcfegint"
lfo = makeF oscKeys "lforate"
lfop = makeF oscKeys "lfopitchint"
lfoc = makeF oscKeys "lfocutoffint"
att = makeF oscKeys "attack"
dec = makeF oscKeys "decay"
sus = makeF oscKeys "sustain"
dt = makeF oscKeys "dtime"
df = makeF oscKeys "dfeedback"