summaryrefslogtreecommitdiff
path: root/client-native-gui
diff options
context:
space:
mode:
Diffstat (limited to 'client-native-gui')
-rw-r--r--client-native-gui/Cargo.toml12
-rw-r--r--client-native-gui/src/chat.rs7
-rw-r--r--client-native-gui/src/main.rs13
3 files changed, 22 insertions, 10 deletions
diff --git a/client-native-gui/Cargo.toml b/client-native-gui/Cargo.toml
index 8ce3445..4829547 100644
--- a/client-native-gui/Cargo.toml
+++ b/client-native-gui/Cargo.toml
@@ -6,16 +6,16 @@ edition = "2021"
[dependencies]
client-native-lib = { path = "../client-native-lib" }
-clap = { version = "4.0.29", features = ["derive"] }
+clap = { version = "4.1.6", features = ["derive"] }
async-std = "1.12.0"
-tokio = { version = "1.21.2", features = ["full"] }
-env_logger = "0.8"
+tokio = { version = "1.25.0", features = ["full"] }
+env_logger = "0.10.0"
log = "0.4"
-anyhow = "1.0.66"
+anyhow = "1.0.69"
crossbeam-channel = "0.5.6"
-egui = "0.19.0"
-eframe = "0.19.0"
+egui = "0.21.0"
+eframe = "0.21.3"
libmpv = { git = "https://github.com/sirno/libmpv-rs.git", branch = "upgrade-libmpv" }
diff --git a/client-native-gui/src/chat.rs b/client-native-gui/src/chat.rs
index dc4c2bc..364d1bb 100644
--- a/client-native-gui/src/chat.rs
+++ b/client-native-gui/src/chat.rs
@@ -1,3 +1,8 @@
+/*
+ This file is part of keks-meet (https://codeberg.org/metamuffin/keks-meet)
+ which is licensed under the GNU Affero General Public License (version 3); see /COPYING.
+ Copyright (C) 2022 metamuffin <metamuffin@disroot.org>
+*/
use crate::GuiPeer;
use async_std::task::block_on;
use client_native_lib::{
@@ -42,7 +47,7 @@ impl Chat {
};
}
let r = TextEdit::singleline(&mut self.input_line).show(ui).response;
- if r.lost_focus() && r.ctx.input().key_down(Key::Enter) {
+ if r.lost_focus() && r.ctx.input(|i| i.key_down(Key::Enter)) {
self.send(ChatMesssage::Text(self.input_line.to_owned()));
self.input_line = "".into();
r.request_focus();
diff --git a/client-native-gui/src/main.rs b/client-native-gui/src/main.rs
index 11290ee..f0c3a9f 100644
--- a/client-native-gui/src/main.rs
+++ b/client-native-gui/src/main.rs
@@ -1,3 +1,8 @@
+/*
+ This file is part of keks-meet (https://codeberg.org/metamuffin/keks-meet)
+ which is licensed under the GNU Affero General Public License (version 3); see /COPYING.
+ Copyright (C) 2022 metamuffin <metamuffin@disroot.org>
+*/
#![feature(box_syntax)]
pub mod chat;
@@ -38,7 +43,7 @@ use tokio::task::JoinHandle;
/// A graphical interface to keks-meet conferences
struct Args {
#[arg(short = 'R', long, default_value = "")]
- default_room_name: String,
+ default_room_secret: String,
#[arg(short = 'U', long, default_value = "alice")]
default_username: String,
}
@@ -64,7 +69,8 @@ async fn main() {
});
Box::new(App::new(args))
}),
- );
+ )
+ .unwrap();
}
enum App {
@@ -108,7 +114,7 @@ enum GuiResourceState {
impl App {
pub fn new(args: Args) -> Self {
- Self::Prejoin(args.default_room_name, args.default_username)
+ Self::Prejoin(args.default_room_secret, args.default_username)
}
}
@@ -473,6 +479,7 @@ async fn track_to_raw(
let (packet, _) = track.read_rtp().await?;
if !packet.payload.is_empty() {
let raw_payload = cached_packet.depacketize(&packet.payload)?;
+ // let raw_payload = packet.payload;
if raw_payload.len() != 0 {
debug!("writing {} bytes", raw_payload.len());