wip: more shrunkening
Some checks failed
/ build (push) Has been cancelled

This commit is contained in:
i do not exist 2026-09-21 01:44:52 +03:00
parent 186b81f29c
commit ca774cca41
21 changed files with 2160 additions and 2191 deletions

View file

@ -19,7 +19,7 @@ pub trait HasPlayClip: HasClock {
fn pulses_since_start_looped (&self) -> Option<(f64, f64)> {
if let Some((started, Some(clip))) = self.play_clip().as_ref() {
let elapsed = self.clock().playhead.pulse.get() - started.pulse.get();
let length = clip.try_read().unwrap().length.max(1); // prevent div0 on empty clip
let length = clip.read().length.max(1); // prevent div0 on empty clip
let times = (elapsed as usize / length) as f64;
let elapsed = (elapsed as usize % length) as f64;
return Some((times, elapsed))
@ -34,7 +34,7 @@ pub trait HasPlayClip: HasClock {
fn play_status (&self) -> impl Draw<Tui> {
let (name, color): (Arc<str>, ItemTheme) = if let Some((_, Some(clip))) = self.play_clip() {
let MidiClip { ref name, color, .. } = *clip.try_read().unwrap();
let MidiClip { ref name, color, .. } = *clip.read();
(name.clone(), color)
} else {
("".into(), ItemTheme::G[64].into())
@ -55,7 +55,7 @@ pub trait HasPlayClip: HasClock {
let mut color = ItemTheme::G[64];
let clock = self.clock();
if let Some((t, Some(clip))) = self.next_clip() {
let clip = clip.try_read().unwrap();
let clip = clip.read();
name = clip.name.clone();
color = clip.color.clone();
time = {
@ -69,7 +69,7 @@ pub trait HasPlayClip: HasClock {
}
}.into()
} else if let Some((t, Some(clip))) = self.play_clip() {
let clip = clip.try_read().unwrap();
let clip = clip.read();
if clip.looped {
name = clip.name.clone();
color = clip.color.clone();