Merge remote-tracking branch 'upstream/dev' into split-osc-code

src/Sound/Tidal/Stream/Process.hs

@@ -196,11 +196,13 @@ toOSC maybeBusses pe osc@(OSC _ _)
         toBus n | Just busses <- maybeBusses, (not . null) busses = busses !!! n
                 | otherwise = n
         busmsgs = map
-                    (\(('^':k), (VI b)) -> do v <- Map.lookup k playmap
-                                              return $ (tsPart,
-                                                        True, -- bus message ?
-                                                        O.Message "/c_set" [O.int32 (toBus b), toDatum v]
-                                                      )
+                    (\(k, b) -> do k' <- if (not $ null k) && head k == '^' then Just (tail k) else Nothing
+                                   v <- Map.lookup k' playmap
+                                   bi <- getI b
+                                   return $ (tsPart,
+                                             True, -- bus message ?
+                                             O.Message "/c_set" [O.int32 (toBus bi), toDatum v]
+                                            )
                     )
                     (Map.toList busmap)
           where
@@ -316,7 +318,7 @@ updatePattern stream k !t pat = do
 setPreviousPatternOrSilence :: MVar PlayMap -> IO ()
 setPreviousPatternOrSilence playMV =
  modifyMVar_ playMV $ return
-   . Map.map ( \ pMap -> case history pMap of
-     _:p:ps -> pMap { pattern = p, history = p:ps }
-     _      -> pMap { pattern = silence, history = [silence] }
+   . Map.map ( \ pMap -> case psHistory pMap of
+     _:p:ps -> pMap { psPattern = p, psHistory = p:ps }
+     _      -> pMap { psPattern = silence, psHistory = [silence] }
              )

src/Sound/Tidal/Stream/Types.hs

@@ -59,10 +59,10 @@ data OSC = OSC {path :: String,
          | OSCContext {path :: String}
          deriving Show
 
-data PlayState = PlayState {pattern :: ControlPattern,
-                            mute    :: Bool,
-                            solo    :: Bool,
-                            history :: [ControlPattern]
+data PlayState = PlayState {psPattern :: ControlPattern,
+                            psMute    :: Bool,
+                            psSolo    :: Bool,
+                            psHistory :: [ControlPattern]
                            }
                deriving Show
 

src/Sound/Tidal/Stream/UI.hs

@@ -51,10 +51,10 @@ streamList s = do pMap <- readMVar (sPMapMV s)
                   let hs = hasSolo pMap
                   putStrLn $ concatMap (showKV hs) $ Map.toList pMap
   where showKV :: Bool -> (PatId, PlayState) -> String
-        showKV True  (k, (PlayState {solo = True}))  = k ++ " - solo\n"
-        showKV True  (k, _)                          = "(" ++ k ++ ")\n"
-        showKV False (k, (PlayState {solo = False})) = k ++ "\n"
-        showKV False (k, _)                          = "(" ++ k ++ ") - muted\n"
+        showKV True  (k, (PlayState {psSolo = True})) = k ++ " - solo\n"
+        showKV True  (k, _) = "(" ++ k ++ ")\n"
+        showKV False (k, (PlayState {psSolo = False})) = k ++ "\n"
+        showKV False (k, _) = "(" ++ k ++ ") - muted\n"
 
 streamReplace :: Stream -> ID -> ControlPattern -> IO ()
 streamReplace stream k !pat = do