diff --git a/Cargo.lock b/Cargo.lock index 32b8edc38..108eed9f7 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -62,14 +62,14 @@ checksum = "85965b6739a430150bdd138e2374a98af0c3ee0d030b3bb7fc3bddff58d0102e" [[package]] name = "android_logger" -version = "0.10.1" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9ed09b18365ed295d722d0b5ed59c01b79a826ff2d2a8f73d5ecca8e6fb2f66" +checksum = "b74b7ddf197de32e415d197aa21c1c0cb36e01e4794fd801302280ac7847ee02" dependencies = [ "android_log-sys", - "env_logger 0.8.4", - "lazy_static", + "env_logger", "log", + "once_cell", ] [[package]] @@ -221,7 +221,7 @@ dependencies = [ "cexpr 0.6.0", "clang-sys", "clap 2.34.0", - "env_logger 0.9.0", + "env_logger", "lazy_static", "lazycell", "log", @@ -1066,16 +1066,6 @@ dependencies = [ "winapi 0.3.9", ] -[[package]] -name = "env_logger" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a19187fea3ac7e84da7dacf48de0c45d63c6a76f9490dae389aead16c243fce3" -dependencies = [ - "log", - "regex", -] - [[package]] name = "env_logger" version = "0.9.0" @@ -1724,7 +1714,7 @@ dependencies = [ "confy", "directories-next", "dirs-next", - "env_logger 0.9.0", + "env_logger", "filetime", "futures", "futures-util", @@ -3249,9 +3239,9 @@ dependencies = [ [[package]] name = "realfft" -version = "2.0.1" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7695c87f31dc3644760f23fb59a3fed47659703abf76cf2d111f03b9e712342" +checksum = "a83b876fe55da7e1bf5deeacb93d6411edf81eba0e1a497e79c067734729053a" dependencies = [ "rustfft", ] @@ -3339,21 +3329,22 @@ dependencies = [ [[package]] name = "rpassword" -version = "5.0.1" +version = "6.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffc936cf8a7ea60c58f030fd36a612a48f440610214dc54bc36431f9ea0c3efb" +checksum = "2bf099a1888612545b683d2661a1940089f6c2e5a8e38979b2159da876bfd956" dependencies = [ "libc", + "serde 1.0.136", + "serde_json 1.0.79", "winapi 0.3.9", ] [[package]] name = "rubato" -version = "0.10.1" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "610bbefcfef7f43cbe275995b6077b74f34480efce293c30327bf44fdad871ed" +checksum = "cd70209c27d5b08f5528bdc779ea3ffb418954e28987f9f9775c6eac41003f9c" dependencies = [ - "log", "num-complex", "num-integer", "num-traits 0.2.14", @@ -3429,7 +3420,7 @@ dependencies = [ "parity-tokio-ipc", "rdev", "repng", - "rpassword 5.0.1", + "rpassword 6.0.1", "rubato", "runas", "rust-pulsectl", @@ -3835,9 +3826,9 @@ dependencies = [ [[package]] name = "sys-locale" -version = "0.1.0" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91f89ebb59fa30d4f65fafc2d68e94f6975256fd87e812dd99cb6e020c8563df" +checksum = "3913c5a3d30054d7f77cf07cdd800c8103ace15c6e44437c5db66a43dd3a92cf" dependencies = [ "cc", "cstr_core", diff --git a/Cargo.toml b/Cargo.toml index 7df6eca3d..f3960b829 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -23,7 +23,7 @@ hbb_common = { path = "libs/hbb_common" } enigo = { path = "libs/enigo" } clipboard = { path = "libs/clipboard" } virtual_display = { path = "libs/virtual_display" } -sys-locale = "0.1" +sys-locale = "0.2" serde_derive = "1.0" serde = "1.0" serde_json = "1.0" @@ -37,13 +37,13 @@ flexi_logger = "0.22" runas = "0.2" magnum-opus = { git = "https://github.com/open-trade/magnum-opus" } dasp = { version = "0.11", features = ["signal", "interpolate-linear", "interpolate"], optional = true } -rubato = { version = "0.10", optional = true } +rubato = { version = "0.12", optional = true } samplerate = { version = "0.2", optional = true } async-trait = "0.1" crc32fast = "1.3" uuid = { version = "0.8", features = ["v4"] } clap = "3.0" -rpassword = "5.0" +rpassword = "6.0" base64 = "0.13" sysinfo = "0.23" num_cpus = "1.13" @@ -81,7 +81,7 @@ libpulse-binding = "2.25" rust-pulsectl = { git = "https://github.com/open-trade/pulsectl" } [target.'cfg(target_os = "android")'.dependencies] -android_logger = "0.10" +android_logger = "0.11" [workspace] members = ["libs/scrap", "libs/hbb_common", "libs/enigo", "libs/clipboard", "libs/virtual_display"] diff --git a/src/lang/cn.rs b/src/lang/cn.rs index 58afd2ae1..157cbea18 100644 --- a/src/lang/cn.rs +++ b/src/lang/cn.rs @@ -265,5 +265,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("android_stop_service_tip", "关闭服务将自动关闭所有已建立的连接。"), ("android_version_audio_tip", "当前安卓版本不支持音频录制,请升级至安卓10或更高。"), ("android_start_service_tip", "点击 [启动服务] 或打开 [屏幕录制] 权限开启手机屏幕共享服务。"), + ("Account", "账号"), ].iter().cloned().collect(); } diff --git a/src/lang/de.rs b/src/lang/de.rs index 7adbc7d76..88f75951c 100644 --- a/src/lang/de.rs +++ b/src/lang/de.rs @@ -265,5 +265,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("android_stop_service_tip", "Durch das Schließen des Dienstes werden automatisch alle hergestellten Verbindungen geschlossen."), ("android_version_audio_tip", "Die aktuelle Android-Version unterstützt keine Audioaufnahme, bitte aktualisieren Sie auf Android 10 oder höher."), ("android_start_service_tip", "Tippen Sie auf [Dienst starten] oder ÖFFNEN Sie die Berechtigung [Bildschirmaufnahme], um den Bildschirmfreigabedienst zu starten."), + ("Account", "Konto"), ].iter().cloned().collect(); } diff --git a/src/lang/eo.rs b/src/lang/eo.rs index 669c98d3f..7e0f8d069 100644 --- a/src/lang/eo.rs +++ b/src/lang/eo.rs @@ -265,5 +265,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("android_stop_service_tip", ""), ("android_version_audio_tip", ""), ("android_start_service_tip", ""), + ("Account", ""), ].iter().cloned().collect(); } diff --git a/src/lang/fr.rs b/src/lang/fr.rs index 58cb362b5..2388a96c4 100644 --- a/src/lang/fr.rs +++ b/src/lang/fr.rs @@ -265,5 +265,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("android_stop_service_tip", "La fermeture du service fermera automatiquement toutes les connexions établies."), ("android_version_audio_tip", "La version actuelle d'Android ne prend pas en charge la capture audio, veuillez passer à Android 10 ou supérieur."), ("android_start_service_tip", "Appuyez sur [Démarrer le service] ou sur l'autorisation OUVRIR [Capture d'écran] pour démarrer le service de partage d'écran."), + ("Account", "Compte"), ].iter().cloned().collect(); } diff --git a/src/lang/it.rs b/src/lang/it.rs index c4636fe6a..3b8ccf828 100644 --- a/src/lang/it.rs +++ b/src/lang/it.rs @@ -265,5 +265,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("android_stop_service_tip", "La chiusura del servizio chiuderà automaticamente tutte le connessioni stabilite."), ("android_version_audio_tip", "L'attuale versione di Android non supporta l'acquisizione audio, esegui l'upgrade ad Android 10 o versioni successive."), ("android_start_service_tip", "Toccare [Avvia servizio] o APRI l'autorizzazione [Cattura schermo] per avviare il servizio di condivisione dello schermo."), + ("Account", "Account"), ].iter().cloned().collect(); } diff --git a/src/lang/ptbr.rs b/src/lang/ptbr.rs index 14d48d478..b47357f3b 100644 --- a/src/lang/ptbr.rs +++ b/src/lang/ptbr.rs @@ -265,5 +265,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("android_stop_service_tip", "Fechar o serviço irá automaticamente fechar todas as conexões estabelecidas."), ("android_version_audio_tip", "A versão atual do Android não suporta captura de áudio, por favor atualize para o Android 10 ou maior."), ("android_start_service_tip", "Toque [Iniciar Serviço] ou ABRA a permissão [Captura de Tela] para iniciar o serviço de compartilhamento de tela."), + ("Account", "Conta"), ].iter().cloned().collect(); } diff --git a/src/lang/ru.rs b/src/lang/ru.rs index c9da4c734..9675a3324 100644 --- a/src/lang/ru.rs +++ b/src/lang/ru.rs @@ -265,5 +265,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("android_stop_service_tip", "Закрытие службы автоматически закроет все установленные соединения."), ("android_version_audio_tip", "Текущая версия Android не поддерживает захват звука, обновите ее до Android 10 или выше."), ("android_start_service_tip", "Коснитесь [Запуск связанного сервера] или ОТКРЫТЬ разрешение [Скриншот], чтобы запустить службу демонстрации экрана."), + ("Account", "Аккаунт"), ].iter().cloned().collect(); } diff --git a/src/lang/template.rs b/src/lang/template.rs index 7be604368..502204012 100644 --- a/src/lang/template.rs +++ b/src/lang/template.rs @@ -265,5 +265,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("android_stop_service_tip", ""), ("android_version_audio_tip", ""), ("android_start_service_tip", ""), + ("Account", ""), ].iter().cloned().collect(); } diff --git a/src/lang/tw.rs b/src/lang/tw.rs index 6c791f474..ff8751585 100644 --- a/src/lang/tw.rs +++ b/src/lang/tw.rs @@ -265,5 +265,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("android_stop_service_tip", "關閉服務將自動關閉所有已建立的連接。"), ("android_version_audio_tip", "當前安卓版本不支持音頻錄製,請升級至安卓10或更高。"), ("android_start_service_tip", "點擊 [啟動服務] 或打開 [屏幕錄製] 權限開啟手機屏幕共享服務。"), + ("Account", "帳戶"), ].iter().cloned().collect(); }