Support basic tempo

Supporting Play/Pause events, and Increase/Decrease tempo.

TODO: Convert milliseconds to BPM

2 files changed, 75 insertions, 13 deletions

diff --git a/website/sandbox/chord-drill-sergeant/elm.json b/website/sandbox/chord-drill-sergeant/elm.json
index b116a66a0f6d..adef18b4daa3 100644
--- a/website/sandbox/chord-drill-sergeant/elm.json
+++ b/website/sandbox/chord-drill-sergeant/elm.json
@@ -10,12 +10,12 @@
             "elm/core": "1.0.5",
             "elm/html": "1.0.0",
             "elm/random": "1.0.0",
+            "elm/time": "1.0.0",
             "elm-community/list-extra": "8.2.3",
             "elm-community/random-extra": "3.1.0"
         },
         "indirect": {
             "elm/json": "1.1.3",
-            "elm/time": "1.0.0",
             "elm/url": "1.0.0",
             "elm/virtual-dom": "1.0.2",
             "owanturist/elm-union-find": "1.0.0"
diff --git a/website/sandbox/chord-drill-sergeant/src/Main.elm b/website/sandbox/chord-drill-sergeant/src/Main.elm
index 2fd557522fbb..bfa03f629bea 100644
--- a/website/sandbox/chord-drill-sergeant/src/Main.elm
+++ b/website/sandbox/chord-drill-sergeant/src/Main.elm
@@ -6,16 +6,26 @@ import Html.Attributes exposing (..)
 import Html.Events exposing (..)
 import Random
 import Random.List
+import Time exposing (..)
 
 import Piano
 import Theory
 
-type State = State { whitelistedChords : List Theory.Chord
+type Model = Model { whitelistedChords : List Theory.Chord
                    , selectedChord : Theory.Chord
+                   , isPaused : Bool
+                   , tempo : Int
                    }
 
 type Msg = NextChord
          | NewChord Theory.Chord
+         | Play
+         | Pause
+         | IncreaseTempo
+         | DecreaseTempo
+
+tempoStep : Int
+tempoStep = 100
 
 viewChord : Theory.Chord -> String
 viewChord (Theory.Chord (note, chordType, chordPosition)) =
@@ -58,23 +68,36 @@ cmajor : Theory.Chord
 cmajor = Theory.Chord (Theory.C, Theory.Major, Theory.First)
 
 {-| The initial state for the application. -}
-initialState : State
-initialState =
-  State { whitelistedChords = Theory.allChords
+init : Model
+init =
+  Model { whitelistedChords = Theory.allChords
         , selectedChord = cmajor
+        , isPaused = True
+        , tempo = 1000
         }
 
+subscriptions : Model -> Sub Msg
+subscriptions (Model {isPaused, tempo}) =
+  if isPaused then
+    Sub.none
+  else
+    Time.every (toFloat tempo) (\_ -> NextChord)
+
 {-| Now that we have state, we need a function to change the state. -}
-update : Msg -> State -> (State, Cmd Msg)
-update msg (State {whitelistedChords, selectedChord}) =
+update : Msg -> Model -> (Model, Cmd Msg)
+update msg (Model {whitelistedChords, selectedChord, isPaused, tempo}) =
   case msg of
-    NewChord chord -> ( State { whitelistedChords = whitelistedChords
+    NewChord chord -> ( Model { whitelistedChords = whitelistedChords
                               , selectedChord = chord
+                              , isPaused = isPaused
+                              , tempo = tempo
                               }
                       , Cmd.none
                       )
-    NextChord -> ( State { whitelistedChords = whitelistedChords
+    NextChord -> ( Model { whitelistedChords = whitelistedChords
                          , selectedChord = selectedChord
+                         , isPaused = isPaused
+                         , tempo = tempo
                          }
                  , Random.generate (\x ->
                                       case x of
@@ -82,18 +105,57 @@ update msg (State {whitelistedChords, selectedChord}) =
                                         (Nothing, _)    -> NewChord cmajor)
                    (Random.List.choose whitelistedChords)
                  )
+    Play -> ( Model { whitelistedChords = whitelistedChords
+                    , selectedChord = selectedChord
+                    , isPaused = False
+                    , tempo = tempo
+                    }
+            , Cmd.none
+            )
+    Pause -> ( Model { whitelistedChords = whitelistedChords
+                     , selectedChord = selectedChord
+                     , isPaused = True
+                     , tempo = tempo
+                    }
+             , Cmd.none
+             )
+    IncreaseTempo -> ( Model { whitelistedChords = whitelistedChords
+                             , selectedChord = selectedChord
+                             , isPaused = isPaused
+                             , tempo = tempo - tempoStep
+                             }
+                     , Cmd.none
+                     )
+    DecreaseTempo -> ( Model { whitelistedChords = whitelistedChords
+                             , selectedChord = selectedChord
+                             , isPaused = isPaused
+                             , tempo = tempo + tempoStep
+                             }
+                     , Cmd.none
+                     )
+
+playPause : Model -> Html Msg
+playPause (Model {isPaused}) =
+  if isPaused then
+    button [ onClick Play ] [ text "Play" ]
+  else
+    button [ onClick Pause ] [ text "Pause" ]
 
-view : State -> Html Msg
-view (State {selectedChord}) =
+view : Model -> Html Msg
+view (Model {selectedChord, tempo} as model) =
   div [] [ p [] [ text (viewChord selectedChord) ]
+         , p [] [ text (String.fromInt tempo) ]
          , button [ onClick NextChord ] [ text "Next Chord" ]
+         , button [ onClick IncreaseTempo ] [ text "Faster" ]
+         , button [ onClick DecreaseTempo ] [ text "Slower" ]
+         , playPause model
          , Piano.render { highlight = Theory.notesForChord selectedChord }
          ]
 
 {-| For now, I'm just dumping things onto the page to sketch ideas. -}
 main =
-  Browser.element { init = \() -> (initialState, Cmd.none)
-                  , subscriptions = \_ -> Sub.none
+  Browser.element { init = \() -> (init, Cmd.none)
+                  , subscriptions = subscriptions
                   , update = update
                   , view = view
                   }