play

ejconlon · Feb 20, 2024 · 9d17357 · 9d17357
1 parent 35800ed
commit 9d17357
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/minipat-live/minipat-live.cabal b/minipat-live/minipat-live.cabal
@@ -30,8 +30,8 @@ library
       Minipat.Live.Core
       Minipat.Live.Logger
       Minipat.Live.Notes
-      Minipat.Live.Osc
       Minipat.Live.Params
+      Minipat.Live.Play
       Minipat.Live.Resources
   other-modules:
       Paths_minipat_live

diff --git a/minipat-live/src/Minipat/Live/Core.hs b/minipat-live/src/Minipat/Live/Core.hs
@@ -58,7 +58,7 @@ import Data.Text qualified as T
 import Minipat.EStream (EStream (..))
 import Minipat.Live.Attrs (Attrs, Squishy (..), attrsDefault)
 import Minipat.Live.Logger (LogAction, logDebug, logError, logInfo, logWarn, nullLogger)
-import Minipat.Live.Osc (PlayEnv (..), PlayErr, convertTape)
+import Minipat.Live.Play (PlayEnv (..), PlayErr, playTape)
 import Minipat.Live.Resources (RelVar, Timed (..), acquireAwait, acquireLoop, relVarAcquire, relVarDispose, relVarUse)
 import Minipat.Print (prettyPrint, prettyPrintAll, prettyShow, prettyShowAll)
 import Minipat.Stream (Stream, streamRun, tapeToList)
@@ -465,7 +465,7 @@ genEventsSTM dom now = do
   let tape = streamRun stream arc
       origin = addTime now ahead
       penv = PlayEnv origin start cps
-      mpevs = convertTape penv tape
+      mpevs = playTape penv tape
   pure (penv, mpevs)
 
 doGen :: LogAction -> Domain -> PosixTime -> IO ()

diff --git a/minipat-live/src/Minipat/Live/Osc.hs → minipat-live/src/Minipat/Live/Play.hs b/minipat-live/src/Minipat/Live/Osc.hs → minipat-live/src/Minipat/Live/Play.hs
@@ -1,10 +1,10 @@
 {-# LANGUAGE OverloadedStrings #-}
 
-module Minipat.Live.Osc
+module Minipat.Live.Play
   ( PlayErr (..)
   , PlayEnv (..)
-  , convertEvent
-  , convertTape
+  , playEvent
+  , playTape
   )
 where
 
@@ -92,8 +92,8 @@ timeDeltaToMicros td =
   let (_, ns) = timeDeltaToNanos td
   in  fromIntegral ns / 1000
 
-convertEvent :: (Squishy Attrs a) => PlayEnv -> Ev a -> M (Maybe (Timed Attrs))
-convertEvent (PlayEnv startTime startCyc cps) (Ev sp dat) =
+playEvent :: (Squishy Attrs a) => PlayEnv -> Ev a -> M (Maybe (Timed Attrs))
+playEvent (PlayEnv startTime startCyc cps) (Ev sp dat) =
   case spanCycle sp of
     Nothing ->
       -- Only emit start events
@@ -115,5 +115,5 @@ traverseMaybe f = go Empty
     Empty -> pure acc
     a :<| as' -> f a >>= maybe (go acc as') (\b -> go (acc :|> b) as')
 
-convertTape :: (Squishy Attrs a) => PlayEnv -> Tape a -> M (Seq (Timed Attrs))
-convertTape penv = traverseMaybe (convertEvent penv) . Seq.fromList . tapeToList
+playTape :: (Squishy Attrs a) => PlayEnv -> Tape a -> M (Seq (Timed Attrs))
+playTape penv = traverseMaybe (playEvent penv) . Seq.fromList . tapeToList