Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Split controller OSC off from SuperDirt handshake OSC (Redux for 1.9) #1051

Open
wants to merge 10 commits into
base: dev
Choose a base branch
from
Open

Split controller OSC off from SuperDirt handshake OSC (Redux for 1.9) #1051

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
f0eb4b8
Move bus handshake to per-target implementation
mindofmatthew Jul 5, 2023
18791d7
Start adding tests for handshake
mindofmatthew Jul 6, 2023
753142e
Fix bugs with per-context busmaps
mindofmatthew Jul 17, 2023
73ed26e
Remove handshake tests for now
mindofmatthew Jul 18, 2023
38fcabd
Merge branch '1.9-dev' into split-osc-code
mindofmatthew Dec 4, 2023
4691224
Merge remote-tracking branch 'upstream/1.10-dev' into split-osc-code
mindofmatthew Apr 10, 2024
c3d9dd3
Re-implement per-context busses in reorganized Stream code
mindofmatthew Apr 12, 2024
9eca1d6
Use mapped bus id
mindofmatthew Apr 18, 2024
7d3a08e
Apply stylish-haskell to Stream modules
mindofmatthew Apr 19, 2024
36ea2ec
Merge remote-tracking branch 'upstream/dev' into split-osc-code
mindofmatthew Apr 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix bugs with per-context busmaps
  • Loading branch information
@mindofmatthew
mindofmatthew committed Nov 29, 2023
commit 753142e179171d4894f809804ba4031815e3a2f2
8 changes: 4 additions & 4 deletions src/Sound/Tidal/Stream.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,10 +214,10 @@ startStream config oscmap
remote_busses <- sequence (oBusPort target >> (Just $ newMVar []))
let broadcast = if cCtrlBroadcast config then 1 else 0
u <- O.udp_socket (\sock sockaddr -> do N.setSocketOption sock N.Broadcast broadcast
N.connect sock sockaddr
-- N.connect sock sockaddr
) (oAddress target) (oPort target)
let cx = Cx {cxUDP = u, cxAddr = remote_addr, cxBusAddr = remote_bus_addr, cxBusses = remote_busses, cxTarget = target, cxOSCs = os}
handshake cx config
_ <- forkIO $ handshake cx config
return cx
) oscmap
let bpm = (coerce defaultCps) * 60 * (cBeatsPerCycle config)
Expand All @@ -243,10 +243,10 @@ startStream config oscmap
return stream

handshake :: Cx -> Config -> IO ()
handshake Cx { cxUDP = udp, cxBusses = Just bussesMV } c = sendHandshake >> listen 0
handshake Cx { cxUDP = udp, cxBusses = Just bussesMV, cxAddr = addr } c = sendHandshake >> listen 0
where
sendHandshake :: IO ()
sendHandshake = O.sendMessage udp (O.Message "/dirt/handshake" [])
sendHandshake = O.sendTo udp (O.Packet_Message $ O.Message "/dirt/handshake" []) (N.addrAddress addr)
listen :: Int -> IO ()
listen waits = do ms <- recvMessagesTimeout 2 udp
if (null ms)
Expand Down