Fix warnings
This commit is contained in:
@@ -18,7 +18,6 @@ use gpui::{
|
||||
Subscription, Task, View, ViewContext, VisualContext, WeakModel, WeakView,
|
||||
};
|
||||
pub use participant::ParticipantLocation;
|
||||
use participant::RemoteParticipant;
|
||||
use postage::watch;
|
||||
use project::Project;
|
||||
use room::Event;
|
||||
@@ -666,7 +665,7 @@ impl CallHandler for Call {
|
||||
call.0.update(cx, |this, cx| {
|
||||
this.room().map(|room| {
|
||||
room.update(cx, |this, cx| {
|
||||
this.toggle_mute(cx);
|
||||
this.toggle_mute(cx).log_err();
|
||||
})
|
||||
})
|
||||
})
|
||||
@@ -678,12 +677,10 @@ impl CallHandler for Call {
|
||||
this.room().map(|room| {
|
||||
room.update(cx, |this, cx| {
|
||||
if this.is_screen_sharing() {
|
||||
dbg!("Unsharing");
|
||||
this.unshare_screen(cx);
|
||||
this.unshare_screen(cx).log_err();
|
||||
} else {
|
||||
dbg!("Sharing");
|
||||
let t = this.share_screen(cx);
|
||||
cx.spawn(move |_, cx| async move {
|
||||
cx.spawn(move |_, _| async move {
|
||||
t.await.log_err();
|
||||
})
|
||||
.detach();
|
||||
|
||||
@@ -1,7 +1,4 @@
|
||||
use crate::{
|
||||
call_settings::CallSettings,
|
||||
participant::{LocalParticipant, ParticipantLocation, RemoteParticipant},
|
||||
};
|
||||
use crate::participant::{LocalParticipant, ParticipantLocation, RemoteParticipant};
|
||||
use anyhow::{anyhow, Result};
|
||||
use audio::{Audio, Sound};
|
||||
use client::{
|
||||
@@ -21,7 +18,6 @@ use live_kit_client::{
|
||||
};
|
||||
use postage::{sink::Sink, stream::Stream, watch};
|
||||
use project::Project;
|
||||
use settings::Settings;
|
||||
use std::{future::Future, mem, sync::Arc, time::Duration};
|
||||
use util::{post_inc, ResultExt, TryFutureExt};
|
||||
|
||||
@@ -332,7 +328,8 @@ impl Room {
|
||||
}
|
||||
}
|
||||
|
||||
pub fn mute_on_join(cx: &AppContext) -> bool {
|
||||
pub fn mute_on_join(_cx: &AppContext) -> bool {
|
||||
// todo!() po: This should be uncommented, though then unmuting does not work
|
||||
false
|
||||
//CallSettings::get_global(cx).mute_on_join || client::IMPERSONATE_LOGIN.is_some()
|
||||
}
|
||||
|
||||
@@ -3,19 +3,11 @@ use anyhow::Result;
|
||||
use client::{proto::PeerId, User};
|
||||
use futures::StreamExt;
|
||||
use gpui::{
|
||||
div, img, AppContext, Div, Element, Entity, EventEmitter, FocusHandle, FocusableView,
|
||||
ImageData, Img, MouseButton, ParentElement, Render, SharedString, Task, View, ViewContext,
|
||||
VisualContext, WindowContext,
|
||||
};
|
||||
use smallvec::SmallVec;
|
||||
use std::{
|
||||
borrow::Cow,
|
||||
sync::{Arc, Weak},
|
||||
};
|
||||
use workspace::{
|
||||
item::{Item, ItemEvent},
|
||||
ItemNavHistory, WorkspaceId,
|
||||
div, img, AppContext, Div, Element, EventEmitter, FocusHandle, FocusableView, ImageData,
|
||||
ParentElement, Render, SharedString, Task, View, ViewContext, VisualContext, WindowContext,
|
||||
};
|
||||
use std::sync::{Arc, Weak};
|
||||
use workspace::{item::Item, ItemNavHistory, WorkspaceId};
|
||||
|
||||
pub enum Event {
|
||||
Close,
|
||||
@@ -65,13 +57,13 @@ impl EventEmitter<Event> for SharedScreen {}
|
||||
impl EventEmitter<workspace::item::ItemEvent> for SharedScreen {}
|
||||
|
||||
impl FocusableView for SharedScreen {
|
||||
fn focus_handle(&self, cx: &AppContext) -> FocusHandle {
|
||||
fn focus_handle(&self, _: &AppContext) -> FocusHandle {
|
||||
self.focus.clone()
|
||||
}
|
||||
}
|
||||
impl Render for SharedScreen {
|
||||
type Element = Div;
|
||||
fn render(&mut self, cx: &mut ViewContext<Self>) -> Self::Element {
|
||||
fn render(&mut self, _: &mut ViewContext<Self>) -> Self::Element {
|
||||
let frame = self.frame.clone();
|
||||
div().children(frame.map(|frame| {
|
||||
img().data(Arc::new(ImageData::new(image::ImageBuffer::new(
|
||||
|
||||
Reference in New Issue
Block a user