fix audio. possible fix strings

Author: Pycckue-Bnepeg

cef/Cargo.toml

@@ -6,6 +6,7 @@ edition = "2018"
 
 [dependencies]
 cef-sys = { path = "../cef-sys" }
+widestring = "0.4.3"
 
 [dev-dependencies]
 testdrop = "0.1.2"

cef/src/types/string.rs

@@ -1,4 +1,4 @@
-use cef_sys::cef_string_userfree_t;
+use cef_sys::{_cef_string_utf16_t, cef_string_userfree_t};
 pub use cef_sys::{
     cef_string_t, cef_string_utf16_clear, cef_string_utf16_to_utf8, cef_string_utf8_to_utf16,
 };
@@ -98,3 +98,23 @@ impl From<cef_string_userfree_t> for CefString {
         cefstr
     }
 }
+
+pub fn into_cef_string(string: &str) -> cef_string_t {
+    extern "C" fn free(ptr: *mut u16) {
+        if ptr.is_null() {
+            return;
+        }
+
+        unsafe {
+            widestring::U16CString::from_raw(ptr);
+        }
+    }
+
+    let wide = widestring::U16CString::from_str(string).unwrap();
+
+    _cef_string_utf16_t {
+        length: wide.len(),
+        str: wide.into_raw(),
+        dtor: Some(free),
+    }
+}

client/src/browser/cef.rs

@@ -54,32 +54,52 @@ pub fn initialize(event_tx: Sender<Event>) {
 
     let mut settings = unsafe { std::mem::zeroed::<cef_sys::cef_settings_t>() };
 
-    let cache_path = crate::utils::documents_path();
+    // let cache_path = crate::utils::documents_path();
     let cef_dir = crate::utils::cef_dir();
+    let cache_path = cef_dir.join("cache");
 
-    log::trace!("cache_path: {:?}", cache_path);
+    // log::trace!("cache_path: {:?}", cache_path);
     log::trace!("cef_dir: {:?}", cef_dir);
 
-    let path = CefString::new(&cef_dir.join("renderer.exe").to_string_lossy());
-    let cache_path = CefString::new(&cache_path.to_string_lossy());
-    let locales_dir_path = CefString::new(&cef_dir.join("locales").to_string_lossy());
-    let resources_dir_path = CefString::new(&cef_dir.to_string_lossy());
+    // let path = CefString::new(&cef_dir.join("renderer.exe").to_string_lossy());
+    // let cache_path = CefString::new(&cache_path.to_string_lossy());
+    // let locales_dir_path = CefString::new(&cef_dir.join("locales").to_string_lossy());
+    // let resources_dir_path = CefString::new(&cef_dir.to_string_lossy());
+    // let root_cache_path = CefString::new(&cef_dir.to_string_lossy());
+    // let log_file = CefString::new(&cef_dir.join("cef.log").to_string_lossy());
+
+    let path = cef::types::string::into_cef_string(&cef_dir.join("renderer.exe").to_string_lossy());
+    let cache_path = cef::types::string::into_cef_string(&cache_path.to_string_lossy());
+    let locales_dir_path =
+        cef::types::string::into_cef_string(&cef_dir.join("locales").to_string_lossy());
+    let resources_dir_path = cef::types::string::into_cef_string(&cef_dir.to_string_lossy());
+    let root_cache_path = cef::types::string::into_cef_string(&cef_dir.to_string_lossy());
+    let log_file = cef::types::string::into_cef_string(&cef_dir.join("cef.log").to_string_lossy());
+    let user_data =
+        cef::types::string::into_cef_string(&cef_dir.join("user_data").to_string_lossy());
+
+    log::trace!("{:?}", cef_dir.join("cef.log"));
 
     settings.size = std::mem::size_of::<cef_sys::cef_settings_t>();
     settings.no_sandbox = 1;
-    settings.browser_subprocess_path = path.to_cef_string();
+    settings.browser_subprocess_path = path;
     settings.windowless_rendering_enabled = 1;
     settings.multi_threaded_message_loop = 1;
     settings.log_severity = 0;
-    settings.cache_path = cache_path.to_cef_string();
-    settings.locales_dir_path = locales_dir_path.to_cef_string();
-    settings.resources_dir_path = resources_dir_path.to_cef_string();
+    settings.cache_path = cache_path;
+    settings.locales_dir_path = locales_dir_path;
+    settings.resources_dir_path = resources_dir_path;
+    settings.ignore_certificate_errors = 1;
+    settings.command_line_args_disabled = 1;
+    settings.log_file = log_file;
+    settings.user_data_path = user_data;
 
     let app = Arc::new(DefaultApp { event_tx });
 
     log::trace!("PRE cef::initialize");
-    // cef::initialize(None, &settings, Some(app));
+
     cef::initialize(Some(&main_args), &settings, Some(app));
+
     log::trace!("POST cef::initialize");
 }
 

client/src/browser/client.rs

@@ -271,7 +271,10 @@ impl RenderHandler for WebClient {
         self: &Arc<Self>, _: Browser, paint_type: PaintElement, mut dirty_rects: DirtyRects,
         buffer: &[u8], width: usize, height: usize,
     ) {
-        if self.closing.load(Ordering::SeqCst) {
+        // TODO: тест hidden
+        if
+        /*self.hidden.load(Ordering::SeqCst) ||*/
+        self.closing.load(Ordering::SeqCst) {
             return;
         }
 

client/src/rodio_audio.rs

@@ -489,10 +489,11 @@ impl AudioInner {
     fn set_sinks_gain(&mut self, gain: f32) {
         self.streams.values_mut().for_each(|stream| {
             stream.iter_mut().for_each(|stream| {
-                stream
-                    .sources
-                    .values()
-                    .for_each(|source| source.sink.set_volume(gain));
+                stream.sources.values().for_each(|source| {
+                    if !source.muted {
+                        source.sink.set_volume(gain);
+                    }
+                });
             });
         });
     }

loader/src/lib.rs

@@ -43,7 +43,7 @@ pub extern "stdcall" fn DllMain(_instance: u32, reason: u32, _reserved: u32) ->
                 winapi::um::winbase::SetDllDirectoryW(search_dir.as_ptr());
             }
 
-            if let Ok(lib) = Library::new("client.dll") {
+            if let Ok(lib) = Library::new(path.join("cef\\client.dll")) {
                 unsafe {
                     LIBRARY = Some(lib);
                 }