mark/musicdb
1
0
Fork 0
mirror of https://github.com/Dummi26/musicdb.git synced 2025-06-12 20:30:58 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

use newer mers and fix merscfg deadlock bug

Browse Source
This commit is contained in:
Mark 2024-10-12 00:28:18 +02:00
parent 4bc3d0b147
commit 4549a8d360
2 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
musicdb-client/src/merscfg.rs
View File

@ -143,24 +143,32 @@ impl MersCfg {
) -> musicdb_mers::mers_lib::prelude_extend_config::Config {
let cmd_es = event_sender.clone();
let cmd_ga = self.channel_gui_actions.0.clone();
musicdb_mers::add(cfg, db, &Arc::new(move |cmd| {
cmd_ga.send(cmd).unwrap();
cmd_es.send_event(GuiEvent::RefreshMers).unwrap();
}), after_db_cmd)
fn get_type(d: &RwLock<Data>) -> Type {
d.read().unwrap().get().as_type()
}
musicdb_mers::add(
cfg,
db,
&Arc::new(move |cmd| {
cmd_ga.send(cmd).unwrap();
cmd_es.send_event(GuiEvent::RefreshMers).unwrap();
}),
after_db_cmd,
)
.add_var_from_arc(
"is_idle".to_owned(),
Arc::clone(&self.var_is_idle),
self.var_is_idle.read().unwrap().get().as_type(),
get_type(&self.var_is_idle),
)
.add_var_from_arc(
"window_size_in_pixels".to_owned(),
Arc::clone(&self.var_window_size_in_pixels),
self.var_window_size_in_pixels.read().unwrap().get().as_type(),
get_type(&self.var_window_size_in_pixels),
)
.add_var_from_arc(
"idle_screen_cover_aspect_ratio".to_owned(),
Arc::clone(&self.var_idle_screen_cover_aspect_ratio),
self.var_idle_screen_cover_aspect_ratio.read().unwrap().get().as_type(),
get_type(&self.var_idle_screen_cover_aspect_ratio),
)
.add_var("playback_resume".to_owned(),{
let es = event_sender.clone();

2
musicdb-mers/Cargo.toml
View File

@ -6,5 +6,5 @@ edition = "2021"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies]
mers_lib = { version = "0.9.6", features = ["ecolor-term"] }
mers_lib = { version = "0.9.9", features = ["ecolor-term"] }
musicdb-lib = { version = "0.1.0", path = "../musicdb-lib" }