Attach terminal to analyser (these should rather be combined)

src/Dodge/Placement/Instance/Terminal.hs

@@ -15,6 +15,7 @@ import Geometry
 import ShapePicture
 import LensHelp
 import Shape
+import Sound.Data
 
 import Data.Maybe
 
@@ -65,7 +66,7 @@ simpleTermMessage ss = const $ TerminalParams
     }
   where
     topflush = [replicate i ' ' ++ "*" | i <- [0,2 .. maximum (map length ss)]]
-    totermline s = TerminalLineDisplay 0 s white
+    totermline s = TerminalLineDisplay 0 (const (s,white))
     termsound subinv w' = soundStart TerminalSound tpos computerBeepingS Nothing w'
       where
         tpos = fromMaybe 0 $ w' ^? buttons . ix (_termID subinv) . btPos
@@ -73,13 +74,17 @@ simpleTermMessage ss = const $ TerminalParams
 genTermMessage :: (GenParams -> [String]) -> (GenParams -> TerminalParams)
 genTermMessage f = \gp -> TerminalParams
     {_termDisplayedLines = []
-    ,_termFutureLines = TerminalLineEffect 0 termsound
+    ,_termFutureLines = termSoundLine computerBeepingS
         : map totermline (topflush (f gp) ++ f gp)
     ,_termMaxLines = 7
     }
   where
     topflush ss = [replicate i ' ' ++ "*" | i <- [0,2 .. maximum (map length ss)]]
-    totermline s = TerminalLineDisplay 0 s white
-    termsound subinv w' = soundStart TerminalSound tpos computerBeepingS Nothing w'
+    totermline s = TerminalLineDisplay 0 (const (s,white))
+
+termSoundLine :: SoundID -> TerminalLine
+termSoundLine sid = TerminalLineEffect 0 termsound
+  where
+    termsound subinv w = soundStart TerminalSound tpos sid Nothing w
       where
-        tpos = fromMaybe 0 $ w' ^? buttons . ix (_termID subinv) . btPos
+        tpos = fromMaybe 0 $ w ^? buttons . ix (_termID subinv) . btPos