Merge pull request #4 from yaxu/portmidi

- Allows different shapes for each channel - shortens VolcaKeys param names
lennart · Jul 1, 2015 · c8aec4a · c8aec4a
2 parents cfad579 + d36b11d
commit c8aec4a
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 22 deletions.
diff --git a/Sound/Tidal/MIDI/Output.hs b/Sound/Tidal/MIDI/Output.hs
@@ -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"
@@ -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

diff --git a/Sound/Tidal/VolcaKeys.hs b/Sound/Tidal/VolcaKeys.hs
@@ -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"