feat(crucible): keep every captured take
With Keep takes on (default), each capture is written to <folder>/takes/ as a WAV named by time, tempo and length, so a take is not lost when the next capture replaces it. Files are never overwritten: a clash gets a numbered suffix. Saving runs off the UI thread and the status line shows the path or the error.
This commit is contained in:
1 parent
839e46aec9
commit
6d868a63c4
8 files changed
+114
-4
No files matched your search
@@ -1,8 +1,8 @@
|
||||
//! Crucible editor, shared by the CLAP wrapper and the headless renderer.
|
||||
use common_ui::*;
|
||||
use crucible_core::{
|
||||
capture, export, render, Division, Exported, Mode, Queues, Ring, Settings, Take, Transport,
|
||||
OVERVIEW,
|
||||
capture, export, render, save_take, Division, Exported, Mode, Queues, Ring, Settings, Take,
|
||||
Transport, OVERVIEW,
|
||||
};
|
||||
use egui::{self, Color32, FontId, Pos2, Rect, RichText, Sense, Stroke, Vec2};
|
||||
use std::sync::{Arc, Mutex};
|
||||
@@ -33,6 +33,8 @@ pub struct State {
|
||||
names: Vec<String>,
|
||||
/// Filled by the export thread when it finishes.
|
||||
job: Option<Arc<Mutex<Option<std::io::Result<Exported>>>>>,
|
||||
/// Filled by the take-saving thread when it finishes.
|
||||
saving: Option<Arc<Mutex<Option<std::io::Result<std::path::PathBuf>>>>>,
|
||||
last_export: Option<std::path::PathBuf>,
|
||||
}
|
||||
impl Default for State {
|
||||
@@ -49,6 +51,7 @@ impl Default for State {
|
||||
counter: 0,
|
||||
names: Vec::new(),
|
||||
job: None,
|
||||
saving: None,
|
||||
last_export: None,
|
||||
}
|
||||
}
|
||||
@@ -136,6 +139,17 @@ pub fn show(ui: &mut egui::Ui, settings: &mut Settings, state: &mut State, link:
|
||||
Err(e) => format!("Export failed: {e}"),
|
||||
};
|
||||
}
|
||||
let saved = state
|
||||
.saving
|
||||
.as_ref()
|
||||
.and_then(|job| job.lock().ok().and_then(|mut slot| slot.take()));
|
||||
if let Some(result) = saved {
|
||||
state.saving = None;
|
||||
state.status += &match result {
|
||||
Ok(path) => format!(" Saved {}", path.display()),
|
||||
Err(e) => format!(" Saving the take failed: {e}"),
|
||||
};
|
||||
}
|
||||
ui.add_space(2.);
|
||||
header(ui, "CRUCIBLE", "RESAMPLER", |ui| {
|
||||
let db = 20. * state.peak.max(1e-6).log10();
|
||||
@@ -204,6 +218,19 @@ fn capture_row(ui: &mut egui::Ui, settings: &mut Settings, state: &mut State, li
|
||||
match capture(ring, settings.bars) {
|
||||
Ok(take) => {
|
||||
let synced = take.synced;
|
||||
if settings.keep_takes {
|
||||
let slot = Arc::new(Mutex::new(None));
|
||||
let done = slot.clone();
|
||||
let take = take.clone();
|
||||
let folder = settings.folder();
|
||||
std::thread::spawn(move || {
|
||||
let result = save_take(&take, &folder, unix_now());
|
||||
if let Ok(mut slot) = done.lock() {
|
||||
*slot = Some(result);
|
||||
}
|
||||
});
|
||||
state.saving = Some(slot);
|
||||
}
|
||||
state.add(take, settings);
|
||||
state.status = if synced {
|
||||
format!("Captured {} bars on the bar grid.", settings.bars)
|
||||
@@ -481,6 +508,15 @@ fn controls(ui: &mut egui::Ui, settings: &mut Settings, state: &mut State, link:
|
||||
state,
|
||||
"Also write wavetable.wav from the selected slice: 2048-sample frames for Serum or Vital.",
|
||||
);
|
||||
let r = chip(ui, settings.keep_takes, "KEEP TAKES");
|
||||
if r.clicked() {
|
||||
settings.keep_takes = !settings.keep_takes;
|
||||
}
|
||||
hint(
|
||||
&r,
|
||||
state,
|
||||
"Save every capture's loop to the takes folder at once, so a reload or crash loses nothing.",
|
||||
);
|
||||
ui.separator();
|
||||
let take = state.take;
|
||||
let slice = state.slice;
|
||||
|
||||
Reference in new issue
Block a user