aboutsummaryrefslogtreecommitdiff
path: root/client-native-lib/src
diff options
context:
space:
mode:
authormetamuffin <metamuffin@disroot.org>2023-06-25 09:18:20 +0200
committermetamuffin <metamuffin@disroot.org>2023-06-25 09:18:20 +0200
commit462d9c511ad96cd2270d44bada243d981d5891e3 (patch)
treee5c62ab6d8cdbb67e132d8275e999bb091ac60e1 /client-native-lib/src
parente7a3c758bdd63d2a444f2fe578e54045c43ad6bb (diff)
downloadkeks-meet-462d9c511ad96cd2270d44bada243d981d5891e3.tar
keks-meet-462d9c511ad96cd2270d44bada243d981d5891e3.tar.bz2
keks-meet-462d9c511ad96cd2270d44bada243d981d5891e3.tar.zst
update all of the rusty stuff. also fixed webrtc build problems
Diffstat (limited to 'client-native-lib/src')
-rw-r--r--client-native-lib/src/lib.rs1
-rw-r--r--client-native-lib/src/peer.rs15
2 files changed, 7 insertions, 9 deletions
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 <metamuffin@disroot.org>
*/
#![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::<Peer>::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::<Peer>::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