mutex added

src/rust/Cargo.toml

@@ -28,6 +28,7 @@ cfg-if = "1.0.0"
 num-integer = "0.1.45"
 lib_ccxr = { path = "lib_ccxr" }
 url = "2.5.2"
+lazy_static = "1.4.0"
 
 [build-dependencies]
 bindgen = "0.64.0"

src/rust/src/lib.rs

@@ -40,6 +40,7 @@ use std::{
     ffi::CStr,
     io::Write,
     os::raw::{c_char, c_double, c_int, c_long, c_uint},
+    sync::Mutex,
 };
 
 #[cfg(test)]
@@ -62,7 +63,6 @@ extern "C" {
     static mut FILEBUFFERSIZE: c_int;
     static mut MPEG_CLOCK_FREQ: c_int;
     static mut tlt_config: ccx_s_teletext_config;
-    static mut ccx_options: ccx_s_options;
     static mut pts_big_change: c_uint;
     static mut current_fps: c_double;
     static mut frames_since_ref_time: c_int;
@@ -76,6 +76,10 @@ extern "C" {
     static mut profane: word_list;
 }
 
+lazy_static! {
+    static ref CCX_OPTIONS: Mutex<ccx_s_options> = Mutex::new(ccx_s_options::default());
+}
+
 /// Initialize env logger with custom format, using stdout as target
 #[no_mangle]
 pub extern "C" fn ccxr_init_logger() {
@@ -281,8 +285,11 @@ pub unsafe extern "C" fn ccxr_parse_parameters(argc: c_int, argv: *mut *mut c_ch
     );
     tlt_config = _tlt_config.to_ctype(&opt);
 
-    // Convert the rust struct (CcxOptions) to C struct (ccx_s_options), so that it can be used by the C code
-    ccx_options.copy_from_rust(opt);
+    // Lock the mutex before modifying ccx_options
+    {
+        let mut ccx_options = CCX_OPTIONS.lock().unwrap();
+        ccx_options.copy_from_rust(opt);
+    }
 
     if !_capitalization_list.is_empty() {
         capitalization_list = _capitalization_list.to_ctype();