Skip to content

Commit

Permalink
single click channel (#7596)
Browse files Browse the repository at this point in the history
- Open channel notes and chat on channel click
- WIP
- Fix compile error
- Don't join live kit until requested
- Track in_call state separately from in_room



Release Notes:

- Improved channels: you can now be in a channel without joining the
audio call automatically

**or**

- N/A

---------

Co-authored-by: Nathan Sobo <nathan@zed.dev>
  • Loading branch information
ConradIrwin and nathansobo authored Feb 9, 2024
1 parent 2b39a95 commit efe23eb
Show file tree
Hide file tree
Showing 26 changed files with 656 additions and 486 deletions.
6 changes: 2 additions & 4 deletions assets/settings/default.json
Original file line number Diff line number Diff line change
Expand Up @@ -104,10 +104,8 @@
"show_whitespaces": "selection",
// Settings related to calls in Zed
"calls": {
// Join calls with the microphone live by default
"mute_on_join": false,
// Share your project when you are the first to join a channel
"share_on_join": true
// Join calls with the microphone muted by default
"mute_on_join": false
},
// Toolbar related settings
"toolbar": {
Expand Down
6 changes: 0 additions & 6 deletions crates/call/src/call_settings.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ use settings::Settings;
#[derive(Deserialize, Debug)]
pub struct CallSettings {
pub mute_on_join: bool,
pub share_on_join: bool,
}

/// Configuration of voice calls in Zed.
Expand All @@ -17,11 +16,6 @@ pub struct CallSettingsContent {
///
/// Default: false
pub mute_on_join: Option<bool>,

/// Whether your current project should be shared when joining an empty channel.
///
/// Default: true
pub share_on_join: Option<bool>,
}

impl Settings for CallSettings {
Expand Down
1 change: 1 addition & 0 deletions crates/call/src/participant.rs
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ pub struct RemoteParticipant {
pub participant_index: ParticipantIndex,
pub muted: bool,
pub speaking: bool,
pub in_call: bool,
pub video_tracks: HashMap<live_kit_client::Sid, Arc<RemoteVideoTrack>>,
pub audio_tracks: HashMap<live_kit_client::Sid, Arc<RemoteAudioTrack>>,
}
Loading

0 comments on commit efe23eb

Please sign in to comment.