Added incomplete main.

diff --git a/Reactogon/Main.hs b/Reactogon/Main.hs
new file mode 100644 (file)
index 0000000..097eba9
--- /dev/null
+++ b/Reactogon/Main.hs
@@ -0,0 +1,15 @@
+import FRP.Yampa
+import Hails.Yampa
+import Reactogon.Semantics
+import Reactogon.Translator.Message
+import Reactogon.Translator.Translator
+
+-- The whole system is a single SF getting new messages, transforming
+-- them and adding some more.
+reactogon :: SF [(Frames, RawMessage)] [(Frames, RawMessage)]
+reactogon = undefined
+
+main :: IO ()
+main = do
+  (inp, out) <- yampaReactiveDual [] reactogon
+  return ()

diff --git a/Reactogon/Translator/Filter.hs b/Reactogon/Translator/Filter.hs
index 5100ab8422af1b5bda146b30d141f0bcfe034508..01ab1b2ee53ab790578df98ac5775cb3dbf183e1 100644 (file)
--- a/Reactogon/Translator/Filter.hs
+++ b/Reactogon/Translator/Filter.hs
@@ -19,7 +19,7 @@ import Sound.JACK                   (NFrames (NFrames))
 -- list are sorted.
 --
 -- /!\ The time is relative. A preprocessing operation removing all
--- events to soon to be happening and shifting them is necessary.
+-- events too soon to be happening and shifting them is necessary.
 schedule :: (Eq a) =>
             SampleRate
          -> NFrames

diff --git a/Reactogon/Translator/Message.hs b/Reactogon/Translator/Message.hs
index 9d76759005d2376d49fe099f0d41dc080ffef272..eca431b2896a0b40ccfc7bafe3aee2fed5343c63 100644 (file)
--- a/Reactogon/Translator/Message.hs
+++ b/Reactogon/Translator/Message.hs
@@ -1,6 +1,7 @@
 module Reactogon.Translator.Message where
 
 import           Reactogon.Semantics
+import qualified Sound.JACK                       as Jack
 import qualified Sound.MIDI.Message               as Message
 import qualified Sound.MIDI.Message.Channel       as Channel
 import qualified Sound.MIDI.Message.Channel.Voice as Voice
@@ -16,6 +17,8 @@ type Channel = Channel.Channel
 
 type ControllerIdx = Voice.Controller
 
+type Frames = Jack.NFrames
+
 -- Each channel is linked to a particular translation signal function
 -- itself linked to a particular layer. Therefore we will dispose of
 -- the channel number as soon as possible.

diff --git a/Reactogon/Translator/SortMessage.hs b/Reactogon/Translator/SortMessage.hs
index 104b9cb6319b88da047da7ce9bdc94c48d58a949..84e267d4c74b1821000cc1c0821c82c14c8c51cc 100644 (file)
--- a/Reactogon/Translator/SortMessage.hs
+++ b/Reactogon/Translator/SortMessage.hs
@@ -9,11 +9,12 @@ module Reactogon.Translator.SortMessage where
 
 import qualified Data.Bifunctor               as BF
 import           Data.Maybe
+import           FRP.Yampa
 import           Reactogon.Semantics
 import           Reactogon.Translator.Message
 
 -- TEMPORARY
-data Control
+data Controller = Lol
 --
 
 sortRawMessages :: [RawMessage] -> ([Message], [RawMessage])
@@ -40,15 +41,23 @@ sortMessages = (\((a,b),c) -> (a,b,c)) . BF.first sortNotes . sortRawMessages
 -}
 
 -- Note messages are converted to PlayHeads
-sortMessages :: SF ([Message], [Message]) ([Note], [Control])
+sortMessages :: SF ([Message], [Message]) ([Note], [Controller])
 sortMessages = proc (notes, ctrl) -> do
-  notes' <- convertNotes -< notes
-  ctrl'  <- convertControl -< ctrl
+  notes' <- arr $ map convertNotes   -< notes
+  ctrl'  <- arr $ map convertControl -< ctrl
   returnA -< (notes', ctrl')
 
-gatherMessages :: ([Note], [Control], [RawMessage]) -> [Message]
+-- /!\ Unsafe function that shouldn't be exported.
+convertNotes :: Message -> Note
+convertNotes = undefined
+
+-- /!\ Unsafe function that shouldn't be exported.
+convertControl :: Message -> Controller
+convertControl _ = Lol
+
+gatherMessages :: ([Note], [Controller], [RawMessage]) -> [Message]
 gatherMessages ([], [], []) = []
 gatherMessages _ = undefined
 
-readMessages :: SF ([RawMessage]) ([Note], [Control], [RawMessages])
+readMessages :: SF ([RawMessage]) ([Note], [Controller], [RawMessage])
 readMessages = undefined

diff --git a/Reactogon/Translator/Translator.hs b/Reactogon/Translator/Translator.hs
index 3b75ada7ff89123b0b796a839f53983319bbbb8b..a7552cf483511c892cc51787d9cacb779ab4d777 100644 (file)
--- a/Reactogon/Translator/Translator.hs
+++ b/Reactogon/Translator/Translator.hs
@@ -2,13 +2,15 @@
 
 module Reactogon.Translator.Translator where
 
+import FRP.Yampa
 import Reactogon.Semantics
 import Reactogon.Translator.Message
+import Reactogon.Translator.SortMessage
 
 -- Takes a stream of raw messages and translates them by type.
-fromRaw :: SF RawMessage (Note, SystemMessage, RawMessage)
+fromRaw :: SF RawMessage (Note, Controller, RawMessage)
 fromRaw = undefined
 
 -- Takes a stream of high level messages and translates them by type.
-toRaw :: SF (Note, SystemMessage, RawMessage) RawMessage
+toRaw :: SF (Note, Controller, RawMessage) RawMessage
 toRaw = undefined