mirror of
https://github.com/storytold/soundcraft.git
synced 2026-10-14 14:26:46 -04:00
Fix build after merging main into #365
Co-Authored-By: Claude Opus 5.5 <[email protected]>
This commit is contained in:
1 parent
2bba5c334d
commit
bb3a6bdd9a
2 files changed
+4
-4
No files matched your search
@@ -150,7 +150,7 @@ mod tests {
|
||||
("100000000000000:00:00:00", TimeFormat::Timecode),
|
||||
("-9223372036854775808", TimeFormat::BarsBeats),
|
||||
] {
|
||||
let _ = parse_position(text, fmt, sr, &map, rate, 0);
|
||||
let _ = parse_position(text, fmt, sr, &map, rate, 0, 0);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -6,7 +6,7 @@ use serde_json::{Value, json};
|
||||
use soundcraft_engine::cmd::MAX_POSITION;
|
||||
use soundcraft_engine::edit::first_movable;
|
||||
use soundcraft_model::{ClipId, Session, SourceId, TrackId};
|
||||
use soundcraft_time::{Samples, TimeFormat, format_length, format_position, parse_position};
|
||||
use soundcraft_time::{Samples, TimeFormat, format_length};
|
||||
|
||||
#[derive(Debug, Clone)]
|
||||
pub enum Target {
|
||||
@@ -115,7 +115,7 @@ fn recorded_at(s: &Session, time_reference: u64) -> Samples {
|
||||
|
||||
/// The dialog's fields; the caller adds OK and Cancel.
|
||||
pub fn fields(ui: &mut Ui, s: &Session, d: &mut Spot) {
|
||||
let show = |at: Samples, f: TimeFormat| format_position(at, f, s.sample_rate, &s.tempo, s.frame_rate, s.timecode_start);
|
||||
let show = |at: Samples, f: TimeFormat| s.format_position(at, f);
|
||||
egui::Grid::new("spot").num_columns(2).spacing(vec2(10.0, 6.0)).show(ui, |ui| {
|
||||
ui.label("Time Scale");
|
||||
egui::ComboBox::from_id_salt("spot_scale").selected_text(d.format.label()).show_ui(ui, |ui| {
|
||||
@@ -136,7 +136,7 @@ pub fn fields(ui: &mut Ui, s: &Session, d: &mut Spot) {
|
||||
}
|
||||
let r = ui.add(TextEdit::singleline(&mut d.text[i]).id(id).font(mono(13.0)).desired_width(150.0));
|
||||
if r.changed()
|
||||
&& let Ok(v) = parse_position(&d.text[i], d.format, s.sample_rate, &s.tempo, s.frame_rate, s.timecode_start)
|
||||
&& let Ok(v) = s.parse_position(&d.text[i], d.format)
|
||||
&& (-MAX_POSITION..=MAX_POSITION).contains(&v)
|
||||
{
|
||||
d.set(i, v);
|
||||
|
||||
Reference in new issue
Block a user