compile with stack

Got rid of dependency on netwire since it wasn't used for anything
except to get a time delta from the previous frame.

(That time delta still needs to be reimplemented, though.)

6 files changed, 32 insertions, 27 deletions

diff --git a/.gitignore b/.gitignore
index dfe42e9..9b1a93c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /dist
 *.swp
+.stack-work
diff --git a/axis b/axis
deleted file mode 120000
index fafd197..0000000
--- a/axis
+++ /dev/null
@@ -1 +0,0 @@
-dist/build/axis-of-eval/axis-of-eval
\ No newline at end of file
diff --git a/axis-of-eval.cabal b/axis-of-eval.cabal
index 161575f..ed67081 100644
--- a/axis-of-eval.cabal
+++ b/axis-of-eval.cabal
@@ -18,12 +18,12 @@ executable axis-of-eval
   default-language: Haskell2010
   hs-source-dirs: .
   build-depends:
-    base >= 4.5 && < 4.7, time, SDL, SDL-ttf, SDL-gfx, containers, haskore, alsa-seq, alsa-core, netwire (>= 5.0.0)
+    base, time, SDL, SDL-ttf, SDL-gfx, containers, haskore, alsa-seq, alsa-core
   main-is: axis.hs
 
 executable midi-dump
   default-language: Haskell2010
   hs-source-dirs: .
   build-depends:
-    base >= 4.5 && < 4.7, time, containers, haskore, alsa-seq, alsa-core
+    base, time, containers, haskore, alsa-seq, alsa-core
   main-is: midi-dump.hs
diff --git a/axis.hs b/axis.hs
index 90770f0..ba4ccdc 100644
--- a/axis.hs
+++ b/axis.hs
@@ -1,10 +1,7 @@
 {-# LANGUAGE NondecreasingIndentation #-}
 {-# LANGUAGE StandaloneDeriving #-}
-import FRP.Netwire hiding (when)
 import Prelude hiding ((.), id, null, filter)
 import Data.Time.Clock
-import Control.Wire hiding (when)
-import Control.Wire.Session
 import Control.Monad
 import qualified Graphics.UI.SDL as SDL
 import AlsaSeq
@@ -22,19 +19,6 @@ import qualified Sound.ALSA.Sequencer.Event as Event
 import qualified Graphics.UI.SDL.Utilities as SDL.Util
 import qualified Data.Map as Map
 
-netwireIsCool :: (Monad m) => Wire (Timed NominalDiffTime ()) () m a String
-netwireIsCool =
-    for 2.5 . pure "Once upon a time..." -->
-    for 3   . pure "... games were completely imperative..." -->
-    for 2   . pure "... but then..." -->
-    for 10  . (pure "Netwire 5! " <> anim) -->
-    netwireIsCool
-
-  where
-    anim =
-        holdFor 0.5 . periodic 1 . pure "Hoo..." <|>
-        pure "...ray!"
-
 smartShowPitch p = showPitch p -- TODO: use flat for Eb, Bb; use unicode flat/sharp chars
 
 _USE_HEXAGONS = True
@@ -233,14 +217,11 @@ main =
   putStrLn "Initialized."
 
   let parseAlsa keysDown = parseAlsaEvents h keysDown (forwardNoteEvent h q publicAddr)
-  let loop state midiKeysDown keysDown resolution font s w x = do
+  let loop state midiKeysDown keysDown resolution font = do
         let (LoopState firstLoop colsRepeat) = state
 
         (keysDown', resolution') <- parseSDLEvents keysDown resolution
         midiKeysDown' <- parseAlsa midiKeysDown
-        (ds, s') <- stepSession s
-        (ex, w') <- stepWire w ds (Right x)
-        let x' = either (const "") id ex
         let colsRepeat' = case firstDigitDown keysDown' of Nothing -> colsRepeat; (Just 0) -> colsRepeat; (Just n) -> n;
 
         let restartVideo = resolution' /= resolution || colsRepeat' /= colsRepeat
@@ -315,12 +296,12 @@ main =
         _ <- SDL.flip videoSurface
 
         let framerate = 30
-        let delay = 1000 `div` framerate - 1000 * (floor $ dtime ds)
+        let delay = 1000 `div` framerate -- TODO: subtract delta
         SDL.delay (delay)
         Control.Monad.when (not $ keyDown SDL.SDLK_ESCAPE keysDown) $
-          loop (LoopState False colsRepeat') midiKeysDown' keysDown' resolution' font' s' w' x'
+          loop (LoopState False colsRepeat') midiKeysDown' keysDown' resolution' font'
 
-  loop (LoopState True _AXIS_COLS_REPEAT) Set.empty Set.empty (sWidth, sHeight) font clockSession_ netwireIsCool ""
+  loop (LoopState True _AXIS_COLS_REPEAT) Set.empty Set.empty (sWidth, sHeight) font
 
 zipzip ls = if (head ls) == [] then [] else (map head ls) : (zipzip $ map tail ls)
 
diff --git a/dump b/dump
deleted file mode 120000
index 4983da0..0000000
--- a/dump
+++ /dev/null
@@ -1 +0,0 @@
-dist/build/midi-dump/midi-dump
\ No newline at end of file
diff --git a/stack.yaml b/stack.yaml
new file mode 100644
index 0000000..abcd766
--- /dev/null
+++ b/stack.yaml
@@ -0,0 +1,25 @@
+flags: {}
+packages:
+  - '.'
+extra-deps:
+- SDL-0.6.5.1
+- SDL-gfx-0.6.0.1
+- SDL-ttf-0.6.2.1
+- alsa-core-0.5.0.1
+- alsa-seq-0.6.0.5
+- haskore-0.2.0.7
+
+- enumset-0.0.4
+- event-list-0.1.1.2
+- markov-chain-0.0.3.3
+- midi-0.2.1.5
+- non-negative-0.1.1
+- poll-0.0
+- utility-ht-0.0.11
+
+- explicit-exception-0.1.7.3
+- monoid-transformer-0.0.3
+- storable-record-0.0.3
+
+resolver: lts-3.7
+system-ghc: false