save channel information in keysDown sets

1 files changed, 6 insertions, 4 deletions

diff --git a/AlsaSeq.hs b/AlsaSeq.hs
index cdb425f..d6e3816 100644
--- a/AlsaSeq.hs
+++ b/AlsaSeq.hs
@@ -40,8 +40,10 @@ showPitch x =
   let (octave, pitch) = Haskore.Basic.Pitch.fromInt $ fromIntegral x
   in Haskore.Basic.Pitch.classFormat pitch (show octave)
 
+-- TODO: don't filter percussion here.
 pitchWords set = map showPitch $ pitchList set
-pitchList set = map Event.unPitch $ Set.toList set
+pitchList set = map Event.unPitch $ map (\ (c, n) -> n) $ filter (\ (Event.Channel c, n) -> c /= 20) $ Set.toList set
+pitchLists set = map (\ (c, n) -> (Event.unChannel c, Event.unPitch n)) $ filter (\ (Event.Channel c, n) -> c /= 20) $ Set.toList set
 
 prettyNote :: Event.Note -> String
 prettyNote (Event.Note noteChannel noteNote noteVelocity noteOffVelocity noteDuration) =
@@ -137,12 +139,12 @@ parseAlsaEvents h keysDown immediate = loop keysDown
            Event.NoteEv Event.NoteOn n  -> do
              immediate ev
              if (Event.unVelocity (Event.noteVelocity n) == 0) then
-               loop (Set.delete (Event.noteNote n) keysDown)
+               loop (Set.delete (Event.noteChannel n, Event.noteNote n) keysDown)
              else
-               loop (Set.insert (Event.noteNote n) keysDown)
+               loop (Set.insert (Event.noteChannel n, Event.noteNote n) keysDown)
            Event.NoteEv Event.NoteOff n -> do
              immediate ev
-             loop (Set.delete (Event.noteNote n) keysDown)
+             loop (Set.delete (Event.noteChannel n, Event.noteNote n) keysDown)
            _ -> loop keysDown
 
 forwardNoteEvent h q publicAddr ev = do