don't use smartDrawKeys to erase keys

1 files changed, 25 insertions, 1 deletions

diff --git a/axis.hs b/axis.hs
index e51b6cb..95f3930 100644
--- a/axis.hs
+++ b/axis.hs
@@ -140,6 +140,30 @@ smartDrawKeys colsRepeat reallyErase beforeKeys_ nowKeys_ videoSurface font axis
         (if showLabel then (Just text) else Nothing)
         chans
 
+allKeysOff colsRepeat reallyErase videoSurface font axis_key_locations axis_key_size = do
+  let indices = [0 .. length axis_key_locations - 1]
+      showLabel = (not reallyErase) && _LABEL_ALL_KEYS
+  forM_ indices $ \idx -> do
+    let pitch = pitchIndex colsRepeat !! idx
+        bgColor = if reallyErase then _KB_BG_COLOR else pitchToColor pitch
+        text = smartShowPitch pitch
+        label = (if showLabel then (Just text) else Nothing)
+    drawKey idx videoSurface font axis_key_locations axis_key_size bgColor label []
+
+-- OK, what we need to do now...
+-- 1. change smartDrawKeys to take key locations instead of midi events; these are channel/location pairs
+-- 2. change the main loop to calculate the key locations, per channel, by choosing the location closest to the average from the last N locations
+-- That should be accomplished through a Data.Map mapping from each channel to a Data.Queue of locations
+-- Note that this data needs to be thrown out if the size of the keyboard changes.
+-- The data should also be thrown out if it gets too old; if the channel isn't being used
+-- The algorithm to choose can be stupid (just use the average), because
+-- the goal is just to get the code organized so that it has the
+-- previous locations available to make a choice.  But a smart algorithm
+-- would choose based on the "structure" of the actual music.
+-- Question: how to deal with simultaneous keypresses?
+
+-- First order of business: get rid of all calls to smartDrawKeys but one
+
 --drawKey :: (Integral a1, Integral a2, Integral a) => Int -> SDL.Surface -> SDL.TTF.Font -> [(a1, a2)] -> a -> SDL.Color -> t -> Maybe String -> [Int] -> IO ()
 drawKey idx videoSurface font axis_key_locations axis_key_size fillColor text channels = do
   let (x, y) = axis_key_locations !! idx
@@ -234,7 +258,7 @@ main =
         let (axis_key_size, axis_key_locations) = getKeyLocations colsRepeat' videoClipRect
 
         let _ALL_PITCHES = Set.fromList $ map (\p -> (Event.Channel 1, Event.Pitch p)) [_AXIS_BOTTOMLEFT_PITCH .. _AXIS_TOPRIGHT_PITCH]
-            keysOFF really = smartDrawKeys colsRepeat' really _ALL_PITCHES Set.empty videoSurface font' axis_key_locations axis_key_size
+            keysOFF really = allKeysOff colsRepeat' really videoSurface font' axis_key_locations axis_key_size
             allKeysOFF =  keysOFF False
             allKeysReallyOFF = keysOFF True