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

Allow sending/receiving of broadcasted OSC control messages #894

Merged
merged 6 commits into from
Feb 9, 2022
Merged

Allow sending/receiving of broadcasted OSC control messages #894

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
6dff012
broadcast on
yaxu Jan 28, 2022
f70cc26
allow sending to broadcast
yaxu Jan 28, 2022
e7f7633
broadcast ctrlTarget
yaxu Jan 28, 2022
d50d815
Undo customisations
yaxu Feb 9, 2022
95ff606
oops
yaxu Feb 9, 2022
a058922
Make accepting/sending broadcast control messages optional
yaxu Feb 9, 2022
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
2 changes: 2 additions & 0 deletions src/Sound/Tidal/Config.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ module Sound.Tidal.Config where
data Config = Config {cCtrlListen :: Bool,
cCtrlAddr :: String,
cCtrlPort :: Int,
cCtrlBroadcast :: Bool,
cFrameTimespan :: Double,
cTempoAddr :: String,
cTempoPort :: Int,
Expand All @@ -33,6 +34,7 @@ defaultConfig :: Config
defaultConfig = Config {cCtrlListen = True,
cCtrlAddr ="127.0.0.1",
cCtrlPort = 6010,
cCtrlBroadcast = False,
cFrameTimespan = 1/20,
cTempoAddr = "127.0.0.1",
cTempoPort = 9160,
Expand Down
6 changes: 5 additions & 1 deletion src/Sound/Tidal/Stream.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,10 @@ startStream config oscmap
remote_bus_addr <- if isJust $ oBusPort target
then Just <$> resolve (oAddress target) (show $ fromJust $ oBusPort target)
else return Nothing
u <- O.openUDP (oAddress target) (oPort target)
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
) (oAddress target) (oPort target)
return $ Cx {cxUDP = u, cxAddr = remote_addr, cxBusAddr = remote_bus_addr, cxTarget = target, cxOSCs = os}
) oscmap
let stream = Stream {sConfig = config,
Expand Down Expand Up @@ -630,6 +633,7 @@ openListener c
| otherwise = return Nothing
where
run = do sock <- O.udpServer (cCtrlAddr c) (cCtrlPort c)
when (cCtrlBroadcast c) $ N.setSocketOption (O.udpSocket sock) N.Broadcast 1
return $ Just sock
catchAny :: IO a -> (E.SomeException -> IO a) -> IO a
catchAny = E.catch
Expand Down