Skip to content

Commit 87f723a

Browse files
committed
Merge remote-tracking branch 'origin/main' into ladvoc/add-apm
2 parents bbad26a + a81053f commit 87f723a

File tree

15 files changed

+242
-119
lines changed

15 files changed

+242
-119
lines changed
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:dd33a01136ccc682607548cc1ac254afa9f1804de3d2f503b6536641cbf2550b
3-
size 19700992
2+
oid sha256:25586a0ce23e65d4281a1d5d7ad0497563194de8a226adbd8bfcd6775b8a9977
3+
size 20661728
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:f1d277a2e6425a8ec764c8649a8d542095e21680143523deb0c09daa093e8aa2
3-
size 986160
2+
oid sha256:40f4ce75d2f11a2c2f7ecbb43df80f1d6dc903d1120b761107cbdc4e15f8236d
3+
size 957534
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:aea8cae17938aab7749b3cf23deb484531c762c8b299655158f380bfdad4c864
3-
size 12046804
2+
oid sha256:9a2b85e2759ae7deb37638e9352e6007e6b67fa90decf1d28017bb6314f9b8a2
3+
size 12519052
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:f1d277a2e6425a8ec764c8649a8d542095e21680143523deb0c09daa093e8aa2
3-
size 986160
2+
oid sha256:40f4ce75d2f11a2c2f7ecbb43df80f1d6dc903d1120b761107cbdc4e15f8236d
3+
size 957534
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:a1f6282055964d03864990144af5029d666ccfa92540c9362ff46588849d0420
3-
size 23159536
2+
oid sha256:4420f3596c9e2e6c2499ac9f807d05f454332f0195b03b55b1f8417b825b3c77
3+
size 23548760
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:f1d277a2e6425a8ec764c8649a8d542095e21680143523deb0c09daa093e8aa2
3-
size 986160
2+
oid sha256:40f4ce75d2f11a2c2f7ecbb43df80f1d6dc903d1120b761107cbdc4e15f8236d
3+
size 957534

Runtime/Plugins/ffi-macos-arm64/liblivekit_ffi.dylib.meta

Lines changed: 15 additions & 35 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Runtime/Plugins/ffi-macos-x86_64/liblivekit_ffi.dylib.meta

Lines changed: 15 additions & 35 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Runtime/Scripts/Internal/FFIClient.cs

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,9 @@ internal sealed class FfiClient : IFFIClient
3939
public event RoomEventReceivedDelegate? RoomEventReceived;
4040
public event TrackEventReceivedDelegate? TrackEventReceived;
4141
public event RpcMethodInvocationReceivedDelegate? RpcMethodInvocationReceived;
42+
public event SetLocalMetadataReceivedDelegate? SetLocalMetadataReceived;
43+
public event SetLocalNameReceivedDelegate? SetLocalNameReceived;
44+
public event SetLocalAttributesReceivedDelegate? SetLocalAttributesReceived;
4245

4346
// participant events are not allowed in the fii protocol public event ParticipantEventReceivedDelegate ParticipantEventReceived;
4447
public event VideoStreamEventReceivedDelegate? VideoStreamEventReceived;
@@ -255,6 +258,15 @@ static unsafe void FFICallback(UIntPtr data, UIntPtr size)
255258
case FfiEvent.MessageOneofCase.RoomEvent:
256259
Instance.RoomEventReceived?.Invoke(r.RoomEvent);
257260
break;
261+
case FfiEvent.MessageOneofCase.SetLocalName:
262+
Instance.SetLocalNameReceived?.Invoke(r.SetLocalName!);
263+
break;
264+
case FfiEvent.MessageOneofCase.SetLocalMetadata:
265+
Instance.SetLocalMetadataReceived?.Invoke(r.SetLocalMetadata!);
266+
break;
267+
case FfiEvent.MessageOneofCase.SetLocalAttributes:
268+
Instance.SetLocalAttributesReceived?.Invoke(r.SetLocalAttributes!);
269+
break;
258270
case FfiEvent.MessageOneofCase.TrackEvent:
259271
Instance.TrackEventReceived?.Invoke(r.TrackEvent!);
260272
break;

Runtime/Scripts/Internal/FFIClients/FFIEvents.cs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,10 @@ namespace LiveKit.Internal
2222

2323
internal delegate void GetSessionStatsDelegate(GetStatsCallback e);
2424

25+
internal delegate void SetLocalMetadataReceivedDelegate(SetLocalMetadataCallback e);
26+
internal delegate void SetLocalNameReceivedDelegate(SetLocalNameCallback e);
27+
internal delegate void SetLocalAttributesReceivedDelegate(SetLocalAttributesCallback e);
28+
2529
internal delegate void ByteStreamReaderReadAllReceivedDelegate(ByteStreamReaderReadAllCallback e);
2630

2731
internal delegate void ByteStreamReaderWriteToFileReceivedDelegate(ByteStreamReaderWriteToFileCallback e);

0 commit comments

Comments
 (0)