From 462d9c511ad96cd2270d44bada243d981d5891e3 Mon Sep 17 00:00:00 2001 From: metamuffin Date: Sun, 25 Jun 2023 09:18:20 +0200 Subject: update all of the rusty stuff. also fixed webrtc build problems --- client-native-lib/src/lib.rs | 1 - client-native-lib/src/peer.rs | 15 +++++++-------- 2 files changed, 7 insertions(+), 9 deletions(-) (limited to 'client-native-lib/src') diff --git a/client-native-lib/src/lib.rs b/client-native-lib/src/lib.rs index 32418d4..5cfd2c6 100644 --- a/client-native-lib/src/lib.rs +++ b/client-native-lib/src/lib.rs @@ -4,7 +4,6 @@ Copyright (C) 2022 metamuffin */ #![feature(async_closure)] -#![feature(box_syntax)] // #![feature(async_fn_in_trait)] use futures_util::Future; diff --git a/client-native-lib/src/peer.rs b/client-native-lib/src/peer.rs index 023be1d..5f08061 100644 --- a/client-native-lib/src/peer.rs +++ b/client-native-lib/src/peer.rs @@ -87,21 +87,20 @@ impl Peer { { let weak = Arc::::downgrade(&peer); - peer.peer_connection.on_negotiation_needed(Box::new(move || { - let peer = weak.upgrade().unwrap(); - Box::pin(async { peer.on_negotiation_needed().await }) - })) + peer.peer_connection + .on_negotiation_needed(Box::new(move || { + let peer = weak.upgrade().unwrap(); + Box::pin(async { peer.on_negotiation_needed().await }) + })) } { let weak = Arc::::downgrade(&peer); peer.peer_connection - .on_track(Box::new(move |track_remote, receiver| { - let receiver = receiver.unwrap(); - let track_remote = track_remote.unwrap(); + .on_track(Box::new(move |track_remote, receiver, _transceiver| { let peer = weak.upgrade().unwrap(); Box::pin(async move { - let id = &track_remote.stream_id().await; + let id = &track_remote.stream_id(); if let Some(res) = peer.remote_provided.read().await.get(id) { info!("track for ({:?}) '{:?}'", res.id, res.label); peer.inst -- cgit v1.2.3-70-g09d2