Skip to content

Commit 4e5bf81

Browse files
committed
Adding CTs to Receiving
1 parent 8a4717d commit 4e5bf81

File tree

2 files changed

+15
-13
lines changed

2 files changed

+15
-13
lines changed

CoreOSC/IOscListener.cs

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
using System.Net;
2+
using System.Threading;
23
using System.Threading.Tasks;
34

45
namespace LucHeart.CoreOSC;
56

67
public interface IOscListener
78
{
8-
public Task<OscMessage> ReceiveMessageAsync();
9+
public Task<OscMessage> ReceiveMessageAsync(CancellationToken ct = default);
910

10-
public Task<(OscMessage Message, IPEndPoint EndPoint)> ReceiveMessageExAsync();
11+
public Task<(OscMessage Message, IPEndPoint EndPoint)> ReceiveMessageExAsync(CancellationToken ct = default);
1112

12-
public Task<OscBundle> ReceiveBundleAsync();
13+
public Task<OscBundle> ReceiveBundleAsync(CancellationToken ct = default);
1314

14-
public Task<(OscBundle Bundle, IPEndPoint EndPoint)> ReceiveBundleExAsync();
15+
public Task<(OscBundle Bundle, IPEndPoint EndPoint)> ReceiveBundleExAsync(CancellationToken ct = default);
1516
}

CoreOSC/OscListener.cs

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
using System.Collections.Generic;
33
using System.Net;
44
using System.Net.Sockets;
5+
using System.Threading;
56
using System.Threading.Tasks;
67

78
namespace LucHeart.CoreOSC;
@@ -42,14 +43,14 @@ public OscListener(IPEndPoint listenerEndPoint)
4243
}
4344
}
4445

45-
public async Task<OscMessage> ReceiveMessageAsync()
46+
public async Task<OscMessage> ReceiveMessageAsync(CancellationToken ct = default)
4647
{
4748
if (EnableTransparentBundleToMessageConversion)
4849
{
4950
if (MessageQueue.Count > 0)
5051
return MessageQueue.Dequeue();
5152

52-
var receiveResult = await UdpClient.ReceiveAsync();
53+
var receiveResult = await UdpClient.ReceiveAsync(ct);
5354

5455
if (!OscBundle.IsBundle(receiveResult.Buffer))
5556
return OscMessage.ParseMessage(receiveResult.Buffer);
@@ -62,26 +63,26 @@ public async Task<OscMessage> ReceiveMessageAsync()
6263
}
6364
else
6465
{
65-
var receiveResult = await UdpClient.ReceiveAsync();
66+
var receiveResult = await UdpClient.ReceiveAsync(ct);
6667
return OscMessage.ParseMessage(receiveResult.Buffer);
6768
}
6869
}
6970

70-
public async Task<(OscMessage Message, IPEndPoint EndPoint)> ReceiveMessageExAsync()
71+
public async Task<(OscMessage Message, IPEndPoint EndPoint)> ReceiveMessageExAsync(CancellationToken ct = default)
7172
{
72-
var receiveResult = await UdpClient.ReceiveAsync();
73+
var receiveResult = await UdpClient.ReceiveAsync(ct);
7374
return (OscMessage.ParseMessage(receiveResult.Buffer), receiveResult.RemoteEndPoint);
7475
}
7576

76-
public async Task<OscBundle> ReceiveBundleAsync()
77+
public async Task<OscBundle> ReceiveBundleAsync(CancellationToken ct = default)
7778
{
78-
var receiveResult = await UdpClient.ReceiveAsync();
79+
var receiveResult = await UdpClient.ReceiveAsync(ct);
7980
return OscBundle.ParseBundle(receiveResult.Buffer);
8081
}
8182

82-
public async Task<(OscBundle Bundle, IPEndPoint EndPoint)> ReceiveBundleExAsync()
83+
public async Task<(OscBundle Bundle, IPEndPoint EndPoint)> ReceiveBundleExAsync(CancellationToken ct = default)
8384
{
84-
var receiveResult = await UdpClient.ReceiveAsync();
85+
var receiveResult = await UdpClient.ReceiveAsync(ct);
8586
return (OscBundle.ParseBundle(receiveResult.Buffer), receiveResult.RemoteEndPoint);
8687
}
8788

0 commit comments

Comments
 (0)