RCMA -> RMCA

diff --git a/BasicSemantics2.hs b/BasicSemantics2.hs
index 078241c810759ebea8934dad9e49b80345f4feb0..99b0466af6982dfb01a64a197140d55b55c12ca4 100644 (file)
--- a/BasicSemantics2.hs
+++ b/BasicSemantics2.hs
@@ -30,7 +30,7 @@
 --   a distinct graphical representation?
 --   DECIDED AGAINST FOR NOW
 
-module RMCA.Semantics where
+module Main where
 
 import Data.Array
 import Data.List  (intersperse, nub)
@@ -443,11 +443,11 @@ moveHead bd (ph@PlayHead {phPos = p, phBTM = btm, phDir = d})
                   in
                       moveHead bd (ph {phPos = p', phBTM = btm'})
     | btm > 0   = ph {phBTM = btm - 1}
-    | otherwise = ph           -- Repeat indefinitely
+    | otherwise = ph        -- Repeat indefinitely
 
 mkNote :: Pos -> BeatNo -> RelPitch -> Strength -> NoteAttr -> Maybe Note
 mkNote p bn tr st na@(NoteAttr {naDur = d})
-    | d <= 0    = Nothing      -- Notes of non-positive length are silent.
+    | d <= 0    = Nothing    -- Notes of non-positive length are silent.
     | otherwise = Just $
         Note {
             notePch = posToPitch p tr,
@@ -513,7 +513,7 @@ runRMCA bd bpb mri tr st
                                      \least 1 bar."
     | otherwise = error "The number of beats per bar must be at least 1."
     where
-        nss = runAux 1 (startHeads bd)
+        nss = runAux 1 []--(startHeads bd)
 
         runAux bn phs = ns : runAux (nextBeatNo bpb bn) phs'
             where

diff --git a/RCMA/Layer/PlayHead.hs b/RCMA/Layer/PlayHead.hs
deleted file mode 100644 (file)
index 39b49e4..0000000
--- a/RCMA/Layer/PlayHead.hs
+++ /dev/null
@@ -1,6 +0,0 @@
-module RCMA.Layer.PlayHead where
-
-import RCMA.Semantics
-import FRP.Yampa
-
-playHead :: SF () ()

diff --git a/RCMA/Auxiliary/Auxiliary.hs b/RMCA/Auxiliary/Auxiliary.hs
similarity index 97%
rename from RCMA/Auxiliary/Auxiliary.hs
rename to RMCA/Auxiliary/Auxiliary.hs
index edbe4411c8f635d518d892092d10dce73d873ae3..ef8256d336358e2ea52ec13fbb86fae7e3009715 100644 (file)
--- a/RCMA/Auxiliary/Auxiliary.hs
+++ b/RMCA/Auxiliary/Auxiliary.hs
@@ -1,6 +1,6 @@
 {-# LANGUAGE Arrows #-}
 
-module RCMA.Auxiliary.Auxiliary where
+module RMCA.Auxiliary.Auxiliary where
 
 import Data.Maybe
 import FRP.Yampa

diff --git a/RCMA/Auxiliary/Concurrent.hs b/RMCA/Auxiliary/Concurrent.hs
similarity index 82%
rename from RCMA/Auxiliary/Concurrent.hs
rename to RMCA/Auxiliary/Concurrent.hs
index 2531fd04512ec1e6e33abdb6a4ee0938faededd8..63db9fa5d6f4eb913368569cfbc346249bb10b18 100644 (file)
--- a/RCMA/Auxiliary/Concurrent.hs
+++ b/RMCA/Auxiliary/Concurrent.hs
@@ -1,4 +1,4 @@
-module RCMA.Auxiliary.Concurrent where
+module RMCA.Auxiliary.Concurrent where
 
 import Control.Concurrent
 import Control.Concurrent.MVar

diff --git a/RCMA/Auxiliary/Curry.hs b/RMCA/Auxiliary/Curry.hs
similarity index 95%
rename from RCMA/Auxiliary/Curry.hs
rename to RMCA/Auxiliary/Curry.hs
index a7910cc2f5070e7b7d0f4ee61dcb2aa320f04c61..49839164a6abed22084a620857804154bbc9476a 100644 (file)
--- a/RCMA/Auxiliary/Curry.hs
+++ b/RMCA/Auxiliary/Curry.hs
@@ -1,7 +1,7 @@
 -- Contains function to currify/uncurrify functions with more than
 -- two arguments. It might be useful to use Template Haskell there.
 
-module RCMA.Auxiliary.Curry where
+module RMCA.Auxiliary.Curry where
 
 curry3 :: ((a,b,c) -> d) -> a -> b -> c -> d
 curry3 f a b c = f (a,b,c)

diff --git a/RCMA/Auxiliary/RV.hs b/RMCA/Auxiliary/RV.hs
similarity index 93%
rename from RCMA/Auxiliary/RV.hs
rename to RMCA/Auxiliary/RV.hs
index 0608e602af547d64cdcd2a839ed67332445a8a80..b459a225e9fc11ed69b40d619de77f5a8f077037 100644 (file)
--- a/RCMA/Auxiliary/RV.hs
+++ b/RMCA/Auxiliary/RV.hs
@@ -1,6 +1,6 @@
 {-# LANGUAGE ScopedTypeVariables #-}
 
-module RCMA.Auxiliary.RV where
+module RMCA.Auxiliary.RV where
 
 import Data.CBMVar
 import Data.ReactiveValue

diff --git a/RCMA/Global/Clock.hs b/RMCA/Global/Clock.hs
similarity index 95%
rename from RCMA/Global/Clock.hs
rename to RMCA/Global/Clock.hs
index ceec8e652e9458a30dee0f757d1b582e3b894434..f791dbc4f78ff3a9b0f7f845e39ac5b114124fb3 100644 (file)
--- a/RCMA/Global/Clock.hs
+++ b/RMCA/Global/Clock.hs
@@ -1,12 +1,12 @@
-module RCMA.Global.Clock where
+module RMCA.Global.Clock where
 
 import Control.Concurrent
 import Control.Monad
 import Data.CBMVar
 import Data.ReactiveValue
 import FRP.Yampa
-import RCMA.Auxiliary.Auxiliary
-import RCMA.Semantics
+import RMCA.Auxiliary.Auxiliary
+import RMCA.Semantics
 
 tempo :: Tempo -> SF () Tempo
 tempo = constant

diff --git a/RCMA/Layer/Board.hs b/RMCA/Layer/Board.hs
similarity index 50%
rename from RCMA/Layer/Board.hs
rename to RMCA/Layer/Board.hs
index 7d0da448c289e25d504810c013b78ecddc85934e..bcadf65f80a078ebe2cf6ff44f443665c92a4720 100644 (file)
--- a/RCMA/Layer/Board.hs
+++ b/RMCA/Layer/Board.hs
@@ -1,6 +1,6 @@
 {-# LANGUAGE Arrows, FlexibleContexts #-}
 
-module RCMA.Layer.Board ( boardSF
+module RMCA.Layer.Board ( boardSF
                         , (^:>)
                         ) where
 
@@ -10,46 +10,48 @@ import Data.ReactiveValue
 import Data.Tuple
 import FRP.Yampa
 import Hails.Yampa
-import RCMA.Auxiliary.Curry
-import RCMA.Layer.Layer
-import RCMA.Semantics
-import RCMA.Global.Clock
+import RMCA.Auxiliary.Curry
+import RMCA.Layer.Layer
+import RMCA.Semantics
+import RMCA.Global.Clock
 import Control.Monad
 
 import Debug.Trace
 
 -- The state of the board is described by the list of the playheads
 -- and the different actions onto the board.
--- It can then be modified discretly when a beat is received or
--- continuously when the user acts on it.
-boardAction :: SF (Board, Layer, [PlayHead], Event BeatNo)
-                  (Event ([PlayHead], [Note]))
-boardAction = proc (board, Layer { relPitch    = rp
-                                 , strength    = s
-                                 , beatsPerBar = bpb
-                                 }, pl, ebn) ->
-  ahSF <<^ arr propEvent -< (board, ebn, rp, s, pl)
-  where
-    ahSF :: SF (Event (Board, BeatNo, RelPitch, Strength, [PlayHead]))
-               (Event ([PlayHead], [Note]))
-    ahSF = arr $ fmap (uncurry5 $ advanceHeads)
-    propEvent (a,b,c,d,e) = if let a = b in traceShow a $ isEvent b
-                            then Event (a,fromEvent b,c,d,e)
-                            else NoEvent
-
-boardSF :: SF (Event BeatNo) (Event ([PlayHead], [Note]))
-
-boardSF' :: [PlayHead]
-         -> SF (Board, Layer, Tempo) (Event ([PlayHead], [Note]))
-boardSF' ph = proc (board, l, t) -> do
+boardAction :: [PlayHead]
+            -> SF ((Board, Layer), Event BeatNo) (Event ([PlayHead], [Note]))
+boardAction ph = proc ((board, Layer { relPitch    = rp
+                                     , strength    = s
+                                     , beatsPerBar = bpb
+                                     }), ebno) -> do
+  e <- arr $ fmap (uncurry5 $ advanceHeads) -< ebno `tag` (board, fromEvent ebno, rp, s, ph)
+  returnA -< traceShow e e
+{-
+boardSF :: SF (Board, Layer, Tempo) (Event [Note])
+boardSF = proc (board, l, t) -> do
   ebno <- layerMetronome -< (t, l)
-  boardAction -< (board, l, ph, ebno)
+  iph <- startHeads -< board
+  boardSF' iph -< (board, l, ebno)
+  where boardSF' :: [PlayHead] -> SF (Board, Layer, Event BeatNo) (Event [Note])
+        boardSF' ph = switch (swap ^<< splitE ^<< boardAction ph)
+                      boardSF'
+-}
 
 boardSF :: SF (Board, Layer, Tempo) (Event [Note])
-boardSF = boardSF'' []
-  where boardSF'' :: [PlayHead] -> SF (Board, Layer, Tempo) (Event [Note])
-        boardSF'' ph = switch (splitE ^<< fmap swap ^<< boardSF' ph)
-                       boardSF''
+boardSF = proc (board, l@Layer { relPitch = rp
+                               , strength = s
+                               }, t) -> do
+  ebno <- layerMetronome -< (t,l)
+  --iph <- arr startHeads -< board
+  boardSF' [] -< ((board, l), ebno)
+  where
+    boardSF' :: [PlayHead] -> SF ((Board, Layer), Event BeatNo) (Event [Note])
+    boardSF' ph = switch (boardAction ph >>> arr splitE >>> arr swap)
+                  (\nph -> second notYet >>> boardSF' nph)
+
+
 {-
 boardSetup :: Board
            -> ReactiveFieldReadWrite IO Tempo

diff --git a/RCMA/Layer/Layer.hs b/RMCA/Layer/Layer.hs
similarity index 91%
rename from RCMA/Layer/Layer.hs
rename to RMCA/Layer/Layer.hs
index fdcca6127da2be50594784f5b328953ff00e5698..c1d2397170ddcad30f52392b6a7cf792cf4492ac 100644 (file)
--- a/RCMA/Layer/Layer.hs
+++ b/RMCA/Layer/Layer.hs
@@ -1,12 +1,12 @@
 {-# LANGUAGE Arrows #-}
 
-module RCMA.Layer.Layer where
+module RMCA.Layer.Layer where
 
 import Data.CBMVar
 import Data.ReactiveValue
 import FRP.Yampa
-import RCMA.Global.Clock
-import RCMA.Semantics
+import RMCA.Global.Clock
+import RMCA.Semantics
 
 import Debug.Trace
 
@@ -29,7 +29,7 @@ layerMetronome' b = proc (t, l@Layer { beatsPerBar = bpb }) -> do
 
 layerMetronome :: SF (Tempo, Layer) (Event BeatNo)
 layerMetronome = layerMetronome'' 0
-  where layerMetronome'' no = switch (layerMetronome' no >>^ dup)
+  where layerMetronome'' no = dSwitch (layerMetronome' no >>^ dup)
                               layerMetronome''
 
 layerRV :: CBMVar Layer -> ReactiveFieldReadWrite IO Layer

diff --git a/RMCA/Layer/PlayHead.hs b/RMCA/Layer/PlayHead.hs
new file mode 100644 (file)
index 0000000..1c74676
--- /dev/null
+++ b/RMCA/Layer/PlayHead.hs
@@ -0,0 +1,6 @@
+module RMCA.Layer.PlayHead where
+
+import RMCA.Semantics
+import FRP.Yampa
+
+playHead :: SF () ()

diff --git a/RCMA/Main.hs b/RMCA/Main.hs
similarity index 87%
rename from RCMA/Main.hs
rename to RMCA/Main.hs
index 33837c412fa1835cdcf0068ed7f8aca8dc545aa6..1746c0faaddd8855223e78d89af219b9e0fdc0b3 100644 (file)
--- a/RCMA/Main.hs
+++ b/RMCA/Main.hs
@@ -6,16 +6,16 @@ import Control.Concurrent
 import Data.ReactiveValue
 import FRP.Yampa
 import Hails.Yampa
-import RCMA.Auxiliary.Concurrent
-import RCMA.Auxiliary.RV
-import RCMA.Auxiliary.RV
-import RCMA.Global.Clock
-import RCMA.Layer.Board
-import RCMA.Layer.Layer
-import RCMA.Semantics
-import RCMA.Translator.Jack
-import RCMA.Translator.Message
-import RCMA.Translator.Translator
+import RMCA.Auxiliary.Concurrent
+import RMCA.Auxiliary.RV
+import RMCA.Auxiliary.RV
+import RMCA.Global.Clock
+import RMCA.Layer.Board
+import RMCA.Layer.Layer
+import RMCA.Semantics
+import RMCA.Translator.Jack
+import RMCA.Translator.Message
+import RMCA.Translator.Translator
 
 import Control.Monad
 import Data.Ratio

diff --git a/RCMA/Semantics.hs b/RMCA/Semantics.hs
similarity index 99%
rename from RCMA/Semantics.hs
rename to RMCA/Semantics.hs
index ba28766c1a36a4251182f42b2482a2222b3ffb7b..51367eb13599669399749f009650ddb43249f9b0 100644 (file)
--- a/RCMA/Semantics.hs
+++ b/RMCA/Semantics.hs
@@ -3,7 +3,7 @@
 -- Written by Henrik Nilsson, 2016-05-27
 -- Based on an earlier version.
 --
--- This gives the semantics of a single RCMA layer. The output is
+-- This gives the semantics of a single RMCA layer. The output is
 -- a high-level representation of notes for each beat. This is to be
 -- translated to low-level MIDI message by a subsequent translator
 -- responsible for merging notes from different layers, ensuring that
@@ -30,7 +30,7 @@
 --   a distinct graphical representation?
 --   DECIDED AGAINST FOR NOW
 
-module RCMA.Semantics where
+module RMCA.Semantics where
 
 import Data.Array
 import Data.List  (intersperse, nub)

diff --git a/RCMA/Translator/Controller.hs b/RMCA/Translator/Controller.hs
similarity index 62%
rename from RCMA/Translator/Controller.hs
rename to RMCA/Translator/Controller.hs
index edf29d7a7ba78e695a96165ca75fe6e452ffa055..29b62f595daa27404be8587f32c9737cf4da705a 100644 (file)
--- a/RCMA/Translator/Controller.hs
+++ b/RMCA/Translator/Controller.hs
@@ -1,7 +1,7 @@
-module RCMA.Translator.Controller where
+module RMCA.Translator.Controller where
 
-import RCMA.Semantics
-import RCMA.Translator.Message
+import RMCA.Semantics
+import RMCA.Translator.Message
 
 messageToController :: Message -> Controller
 messageToController _ = Lol

diff --git a/RCMA/Translator/Filter.hs b/RMCA/Translator/Filter.hs
similarity index 95%
rename from RCMA/Translator/Filter.hs
rename to RMCA/Translator/Filter.hs
index c39345570d80e880209e029e337056ad542968c2..9afcb9381c2df6a79953fdeaca23cdfa22376597 100644 (file)
--- a/RCMA/Translator/Filter.hs
+++ b/RMCA/Translator/Filter.hs
@@ -1,15 +1,15 @@
 -- Contains function for scheduling and filtering events given the
 -- correct informations.
 
-module RCMA.Translator.Filter where
+module RMCA.Translator.Filter where
 
 import Data.Bifunctor          as BF
 import Data.Function           (on)
 import Data.List               (group, groupBy, sortBy)
 import Data.Ord
 import FRP.Yampa
-import RCMA.Semantics
-import RCMA.Translator.Message
+import RMCA.Semantics
+import RMCA.Translator.Message
 import Sound.JACK              (NFrames (NFrames))
 
 -- Takes a list of time stamped "things", a sample rate and a buffer

diff --git a/RCMA/Translator/Jack.hs b/RMCA/Translator/Jack.hs
similarity index 90%
rename from RCMA/Translator/Jack.hs
rename to RMCA/Translator/Jack.hs
index 12794836a54654b5f5339a2a72149c8dcc315001..c30778e1fc9b7c43bf6b9326ed614a87a8474273 100644 (file)
--- a/RCMA/Translator/Jack.hs
+++ b/RMCA/Translator/Jack.hs
@@ -1,6 +1,6 @@
 -- Contains all the information and functions necessary to run a Jack
 -- port and exchange information through reactive values and Yampa.
-module RCMA.Translator.Jack ( jackSetup
+module RMCA.Translator.Jack ( jackSetup
                             ) where
 
 import           Control.Applicative                 ((<**>))
@@ -12,19 +12,19 @@ import qualified Data.EventList.Absolute.TimeBody    as EventListAbs
 import           Data.ReactiveValue
 import qualified Foreign.C.Error                     as E
 import           Hails.Yampa
-import           RCMA.Semantics
-import           RCMA.Translator.Filter
-import           RCMA.Translator.Message
-import           RCMA.Translator.RV
-import           RCMA.Translator.Translator
+import           RMCA.Semantics
+import           RMCA.Translator.Filter
+import           RMCA.Translator.Message
+import           RMCA.Translator.RV
+import           RMCA.Translator.Translator
 import qualified Sound.JACK                          as Jack
 import qualified Sound.JACK.Exception                as JExc
 import qualified Sound.JACK.MIDI                     as JMIDI
 
 import           Debug.Trace
 
-rcmaName :: String
-rcmaName = "RCMA"
+rmcaName :: String
+rmcaName = "RMCA"
 
 inPortName :: String
 inPortName = "input"
@@ -38,13 +38,13 @@ jackSetup :: ReactiveFieldRead IO (LTempo, Int, [Note])
           -> IO ()
 jackSetup boardInRV = Jack.handleExceptions $ do
   toProcessRV <- Trans.lift $ toProcess <$> newCBMVar []
-  Jack.withClientDefault rcmaName $ \client ->
+  Jack.withClientDefault rmcaName $ \client ->
     Jack.withPort client outPortName $ \output ->
     Jack.withPort client inPortName  $ \input ->
     Jack.withProcess client (jackCallBack client input output
                               toProcessRV boardInRV) $
     Jack.withActivation client $ Trans.lift $ do
-    putStrLn $ "Started " ++ rcmaName ++ " JACK client."
+    putStrLn $ "Started " ++ rmcaName ++ " JACK client."
     Jack.waitForBreak
 
 {-
@@ -56,7 +56,7 @@ jackRun :: (JExc.ThrowsErrno e) =>
         -> Sync.ExceptionalT e IO ()
 jackRun client callback =
   Jack.withProcess client callback $ do
-  Trans.lift $ putStrLn $ "Startedbbb " ++ rcmaName
+  Trans.lift $ putStrLn $ "Startedbbb " ++ rmcaName
   Trans.lift $ Jack.waitForBreak
 -}
 defaultTempo :: Tempo

diff --git a/RCMA/Translator/Message.hs b/RMCA/Translator/Message.hs
similarity index 97%
rename from RCMA/Translator/Message.hs
rename to RMCA/Translator/Message.hs
index ca95cf88a43f62a3ee017652473b066533325fe6..8663e69bde74d1521113ca166b013fc875abcbb2 100644 (file)
--- a/RCMA/Translator/Message.hs
+++ b/RMCA/Translator/Message.hs
@@ -1,6 +1,6 @@
-module RCMA.Translator.Message where
+module RMCA.Translator.Message where
 
-import           RCMA.Semantics
+import           RMCA.Semantics
 import qualified Sound.JACK                       as Jack
 import qualified Sound.MIDI.Message               as Message
 import qualified Sound.MIDI.Message.Channel       as Channel

diff --git a/RCMA/Translator/Note.hs b/RMCA/Translator/Note.hs
similarity index 89%
rename from RCMA/Translator/Note.hs
rename to RMCA/Translator/Note.hs
index a22d497f5feb283f7f6ec03dab9f66c26c87578c..e89b5042927e548a4666c0c772bcb4352f7721ad 100644 (file)
--- a/RCMA/Translator/Note.hs
+++ b/RMCA/Translator/Note.hs
@@ -1,13 +1,13 @@
 {-# LANGUAGE Arrows #-}
 
-module RCMA.Translator.Note where
+module RMCA.Translator.Note where
 
 import Data.Ratio
 import FRP.Yampa
-import RCMA.Global.Clock
-import RCMA.Layer.Layer
-import RCMA.Semantics
-import RCMA.Translator.Message
+import RMCA.Global.Clock
+import RMCA.Layer.Layer
+import RMCA.Semantics
+import RMCA.Translator.Message
 
 messageToNote :: Message -> Note
 messageToNote (NoteOn _ p s) = Note { notePch = p

diff --git a/RCMA/Translator/RV.hs b/RMCA/Translator/RV.hs
similarity index 97%
rename from RCMA/Translator/RV.hs
rename to RMCA/Translator/RV.hs
index 1f630a303acf142b33590837e720828c3054d9b7..f2ba9f433e8b1cb08a391d4f7a4f5ad8dd3f2270 100644 (file)
--- a/RCMA/Translator/RV.hs
+++ b/RMCA/Translator/RV.hs
@@ -1,6 +1,6 @@
 {-# LANGUAGE ScopedTypeVariables #-}
 
-module RCMA.Translator.RV where
+module RMCA.Translator.RV where
 
 import           Control.Monad
 import           Control.Monad.Exception.Synchronous (ExceptionalT, resolveT)
@@ -12,7 +12,7 @@ import qualified Data.List                           as L
 import           Data.Ord                            (comparing)
 import           Data.ReactiveValue
 import qualified Foreign.C.Error                     as E
-import           RCMA.Translator.Message
+import           RMCA.Translator.Message
 import qualified Sound.JACK                          as Jack
 import           Sound.JACK.Exception
     ( All

diff --git a/RCMA/Translator/SortMessage.hs b/RMCA/Translator/SortMessage.hs
similarity index 91%
rename from RCMA/Translator/SortMessage.hs
rename to RMCA/Translator/SortMessage.hs
index 3560405075277d237d874ac71aa55721fc329d8c..b2135a062416c53b42ad73f559b8910f98464b06 100644 (file)
--- a/RCMA/Translator/SortMessage.hs
+++ b/RMCA/Translator/SortMessage.hs
@@ -5,7 +5,7 @@
 -- events and other events. The latter will be transmitted as is
 -- through the whole systems.
 
-module RCMA.Translator.SortMessage where
+module RMCA.Translator.SortMessage where
 
 import qualified Data.Bifunctor             as BF
 import           Data.Function              (on)
@@ -13,10 +13,10 @@ import           Data.List                  (groupBy)
 import           Data.Maybe
 import           Data.Ratio
 import           FRP.Yampa
-import           RCMA.Semantics
-import           RCMA.Translator.Controller
-import           RCMA.Translator.Message
-import           RCMA.Translator.Note
+import           RMCA.Semantics
+import           RMCA.Translator.Controller
+import           RMCA.Translator.Message
+import           RMCA.Translator.Note
 
 sortRawMessages :: [(Frames, RawMessage)]
                 -> ([(Frames,Message)], [(Frames,RawMessage)])

diff --git a/RCMA/Translator/Translator.hs b/RMCA/Translator/Translator.hs
similarity index 82%
rename from RCMA/Translator/Translator.hs
rename to RMCA/Translator/Translator.hs
index e39e61a80cb09ab61a7525cb889f814af11eda78..62c2729afe2d9a8eef0e640274d5a0e1746d68c0 100644 (file)
--- a/RCMA/Translator/Translator.hs
+++ b/RMCA/Translator/Translator.hs
@@ -1,18 +1,18 @@
 {-# LANGUAGE Arrows #-}
 
-module RCMA.Translator.Translator ( readMessages
+module RMCA.Translator.Translator ( readMessages
                                   , gatherMessages
                                   ) where
 
 import qualified Data.Bifunctor              as BF
 import           FRP.Yampa
-import           RCMA.Auxiliary.Curry
-import           RCMA.Layer.Layer
-import           RCMA.Semantics
-import           RCMA.Translator.Controller
-import           RCMA.Translator.Message
-import           RCMA.Translator.Note
-import           RCMA.Translator.SortMessage
+import           RMCA.Auxiliary.Curry
+import           RMCA.Layer.Layer
+import           RMCA.Semantics
+import           RMCA.Translator.Controller
+import           RMCA.Translator.Message
+import           RMCA.Translator.Note
+import           RMCA.Translator.SortMessage
 
 -- Uses function defined in SortMessage. This is a pure function and
 -- it might not need to be a signal function.

diff --git a/RCMA/Unknown/Arpeggiated.hs b/RMCA/Unknown/Arpeggiated.hs
similarity index 100%
rename from RCMA/Unknown/Arpeggiated.hs
rename to RMCA/Unknown/Arpeggiated.hs

diff --git a/RCMA/Unknown/Auxiliary.hs b/RMCA/Unknown/Auxiliary.hs
similarity index 100%
rename from RCMA/Unknown/Auxiliary.hs
rename to RMCA/Unknown/Auxiliary.hs

diff --git a/RCMA/Unknown/AvgInt.hs b/RMCA/Unknown/AvgInt.hs
similarity index 100%
rename from RCMA/Unknown/AvgInt.hs
rename to RMCA/Unknown/AvgInt.hs

diff --git a/RCMA/Unknown/AvgIvl.hs b/RMCA/Unknown/AvgIvl.hs
similarity index 100%
rename from RCMA/Unknown/AvgIvl.hs
rename to RMCA/Unknown/AvgIvl.hs

diff --git a/RCMA/Unknown/ClientState.hs b/RMCA/Unknown/ClientState.hs
similarity index 100%
rename from RCMA/Unknown/ClientState.hs
rename to RMCA/Unknown/ClientState.hs

diff --git a/RCMA/Unknown/MIDI.hs b/RMCA/Unknown/MIDI.hs
similarity index 100%
rename from RCMA/Unknown/MIDI.hs
rename to RMCA/Unknown/MIDI.hs

diff --git a/RCMA/Unknown/Reactimation.hs b/RMCA/Unknown/Reactimation.hs
similarity index 100%
rename from RCMA/Unknown/Reactimation.hs
rename to RMCA/Unknown/Reactimation.hs

diff --git a/RCMA/Unknown/Reactogon.hs b/RMCA/Unknown/Reactogon.hs
similarity index 95%
rename from RCMA/Unknown/Reactogon.hs
rename to RMCA/Unknown/Reactogon.hs
index c6068fa0517b9d77e910b1ba23800dd6e3cde1be..83b455aa297f0b9947fd2326db266b2ee1dbe370 100644 (file)
--- a/RCMA/Unknown/Reactogon.hs
+++ b/RMCA/Unknown/Reactogon.hs
@@ -40,8 +40,8 @@ outLoop = concat [[(t,MIDI.Channel $ Channel.Cons
     })] | t <- [0,2..]]
 -}
 
-rcmaName :: String
-rcmaName = "RCMA"
+rmcaName :: String
+rmcaName = "RMCA"
 
 inPortName :: String
 inPortName = "input"
@@ -56,7 +56,7 @@ main = do
   inState <- newMVar M.empty
   outState <- newMVar M.empty
   Jack.handleExceptions $
-    Jack.withClientDefault rcmaName $ \client ->
+    Jack.withClientDefault rmcaName $ \client ->
     Jack.withPort client outPortName $ \output ->
     Jack.withPort client inPortName $ \input -> do
     clientState <- Trans.lift $ newEmptyMVar
@@ -64,8 +64,8 @@ main = do
       (jackLoop client clientState inState outState input output) $
       Jack.withActivation client $ do
       frpid <- Trans.lift $ forkIO $ mainReact inState outState clientState
-      Jack.connect client (rcmaName ++ ":" ++ outPortName) fsPortName
-      Trans.lift $ putStrLn $ "Started " ++ rcmaName
+      Jack.connect client (rmcaName ++ ":" ++ outPortName) fsPortName
+      Trans.lift $ putStrLn $ "Started " ++ rmcaName
       Trans.lift $ Jack.waitForBreak
 
 jackLoop :: Jack.Client

diff --git a/RCMA/Unknown/Shared.hs b/RMCA/Unknown/Shared.hs
similarity index 100%
rename from RCMA/Unknown/Shared.hs
rename to RMCA/Unknown/Shared.hs

diff --git a/RCMA/Unknown/Time.hs b/RMCA/Unknown/Time.hs
similarity index 100%
rename from RCMA/Unknown/Time.hs
rename to RMCA/Unknown/Time.hs

diff --git a/RCMA/tests/testArpeggiated.hs b/RMCA/tests/testArpeggiated.hs
similarity index 100%
rename from RCMA/tests/testArpeggiated.hs
rename to RMCA/tests/testArpeggiated.hs

diff --git a/RCMA/tests/testAvgInt.hs b/RMCA/tests/testAvgInt.hs
similarity index 100%
rename from RCMA/tests/testAvgInt.hs
rename to RMCA/tests/testAvgInt.hs

diff --git a/RCMA/tests/testClock.hs b/RMCA/tests/testClock.hs
similarity index 84%
rename from RCMA/tests/testClock.hs
rename to RMCA/tests/testClock.hs
index de65615aeda346f33988ef417bae7fc0f66ea60a..5e8911a28cf846b81d9ff397f12c5acdd07d84ab 100644 (file)
--- a/RCMA/tests/testClock.hs
+++ b/RMCA/tests/testClock.hs
@@ -1,6 +1,6 @@
-import RCMA.Global.Clock
-import RCMA.Auxiliary.Auxiliary
-import RCMA.Semantics
+import RMCA.Global.Clock
+import RMCA.Auxiliary.Auxiliary
+import RMCA.Semantics
 import FRP.Yampa
 
 main :: IO ()

diff --git a/RCMA/tests/testOnChange.hs b/RMCA/tests/testOnChange.hs
similarity index 91%
rename from RCMA/tests/testOnChange.hs
rename to RMCA/tests/testOnChange.hs
index 5841a0241ac1f70558216e9bb66b6a2d464ab78b..45f7f1b1d6b5786a28c34b21f115b82b43432e3c 100644 (file)
--- a/RCMA/tests/testOnChange.hs
+++ b/RMCA/tests/testOnChange.hs
@@ -1,4 +1,4 @@
-import RCMA.Auxiliary.Auxiliary
+import RMCA.Auxiliary.Auxiliary
 import FRP.Yampa
 
 main :: IO ()