Update crates

alvr-org · Aug 18, 2023 · 9591965 · 9591965
1 parent cdbfa46
commit 9591965
Show file tree

Hide file tree

Showing 9 changed files with 358 additions and 301 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/alvr/audio/Cargo.toml b/alvr/audio/Cargo.toml
@@ -14,14 +14,14 @@ alvr_sockets.workspace = true
 cpal = { version = "0.15", features = ["jack"] }
 rodio = "0.17"
 serde = "1"
-tokio = "1"
 
 [target.'cfg(windows)'.dependencies]
 widestring = "1"
-windows = { version = "0.48", features = [
+windows = { version = "0.51", features = [
     "Win32_Devices_FunctionDiscovery",
     "Win32_Foundation",
     "Win32_Media_Audio_Endpoints",
     "Win32_System_Com_StructuredStorage",
+    "Win32_System_Variant",
     "Win32_UI_Shell_PropertiesSystem",
 ] }
diff --git a/alvr/audio/src/windows.rs b/alvr/audio/src/windows.rs
@@ -7,7 +7,7 @@ fn get_windows_device(device: &AudioDevice) -> Result<windows::Win32::Media::Aud
     use windows::Win32::{
         Devices::FunctionDiscovery::PKEY_Device_FriendlyName,
         Media::Audio::{eAll, IMMDeviceEnumerator, MMDeviceEnumerator, DEVICE_STATE_ACTIVE},
-        System::Com::{self, CLSCTX_ALL, COINIT_MULTITHREADED, STGM_READ},
+        System::Com::{self, StructuredStorage, CLSCTX_ALL, COINIT_MULTITHREADED, STGM_READ},
     };
 
     let device_name = device.inner.name()?;
@@ -32,7 +32,7 @@ fn get_windows_device(device: &AudioDevice) -> Result<windows::Win32::Media::Aud
             let mut prop_variant = property_store.GetValue(&PKEY_Device_FriendlyName)?;
             let utf16_name =
                 U16CStr::from_ptr_str(prop_variant.Anonymous.Anonymous.Anonymous.pwszVal.0);
-            Com::StructuredStorage::PropVariantClear(&mut prop_variant)?;
+            StructuredStorage::PropVariantClear(&mut prop_variant)?;
 
             let imm_device_name = utf16_name.to_string()?;
             if imm_device_name == device_name {

diff --git a/alvr/client_core/Cargo.toml b/alvr/client_core/Cargo.toml
@@ -22,13 +22,10 @@ alvr_sockets.workspace = true
 
 app_dirs2 = "2"
 bincode = "1"
-bytes = "1"
-futures = "0.3"
 glyph_brush_layout = "0.2"
 rand = "0.8"
 serde = "1"
 serde_json = "1"
-tokio = { version = "1", features = ["rt-multi-thread", "macros", "time"] }
 jni = "0.21"
 
 [target.'cfg(target_os = "android")'.dependencies]

diff --git a/alvr/client_core/src/platform/android/decoder.rs b/alvr/client_core/src/platform/android/decoder.rs
@@ -269,7 +269,7 @@ pub fn video_decoder_split(
                 match decoder.dequeue_output_buffer(Duration::from_millis(1)) {
                     Ok(DequeuedOutputBufferInfoResult::Buffer(buffer)) => {
                         // The buffer timestamp is actually nanoseconds
-                        let presentation_time_ns = buffer.presentation_time_us();
+                        let presentation_time_ns = buffer.info().presentation_time_us();
 
                         if let Err(e) =
                             decoder.release_output_buffer_at_time(buffer, presentation_time_ns)

diff --git a/alvr/dashboard/Cargo.toml b/alvr/dashboard/Cargo.toml
@@ -30,14 +30,14 @@ statrs = "0.16"
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
 alvr_server_io.workspace = true
 sysinfo = { version = "0.29", default-features = false }
-tungstenite = "0.19"
+tungstenite = "0.20"
 ureq = { version = "2", features = ["json"] }
 
 [target.'cfg(target_arch = "wasm32")'.dependencies]
 console_error_panic_hook = "0.1"
 ewebsock = "0.2"
 futures = "0.3"
-gloo-net = "0.3"
+gloo-net = "0.4"
 instant = { version = "0.1", features = ["wasm-bindgen"] }
 wasm-bindgen-futures = "0.4"
 wasm-logger = "0.2"

diff --git a/alvr/dashboard/src/data_sources.rs b/alvr/dashboard/src/data_sources.rs
@@ -220,7 +220,7 @@ impl DataSources {
                     ws.get_mut().set_nonblocking(true).ok();
 
                     while running.value() {
-                        match ws.read_message() {
+                        match ws.read() {
                             Ok(tungstenite::Message::Text(json_string)) => {
                                 if let Ok(event) = serde_json::from_str(&json_string) {
                                     debug!("Server event received: {event:?}");

diff --git a/alvr/server/Cargo.toml b/alvr/server/Cargo.toml
@@ -47,7 +47,7 @@ tokio = { version = "1", features = [
     "net",
     "fs",
 ] }
-tokio-tungstenite = "0.19"
+tokio-tungstenite = "0.20"
 tokio-util = { version = "0.7", features = ["codec"] }
 # Miscellaneous
 chrono = "0.4"

diff --git a/alvr/sockets/Cargo.toml b/alvr/sockets/Cargo.toml
@@ -11,10 +11,6 @@ alvr_common.workspace = true
 alvr_session.workspace = true
 
 bincode = "1"
-bytes = "1"
-futures = "0.3"
 serde = "1"
 serde_json = "1"
 socket2 = "0.5"
-tokio = { version = "1", features = ["rt", "net", "macros"] }
-tokio-util = { version = "0.7", features = ["codec", "net"] }