diff options
| author | Gabriel Schneider <[email protected]> | 2026-11-17 01:01:26 -0300 |
|---|---|---|
| committer | Gabriel Schneider <[email protected]> | 2026-11-17 12:15:01 -0300 |
| commit | 70be2e0776d2e61a2d018b264ef5602e7e2c7f86 (patch) | |
| tree | 620d316cc48062d374b1c270cda0723afbb3fc7f /examples/micscope | |
| parent | e699ffe4182f66e28180ea2d91ab1fb8c408d49e (diff) | |
| download | sketchbook-70be2e0776d2e61a2d018b264ef5602e7e2c7f86.tar.gz sketchbook-70be2e0776d2e61a2d018b264ef5602e7e2c7f86.zip | |
micscope: a take starts its file empty; a deleted take's file stays, and why
Phase 1 left two loose ends in micscope's take files. A new take could
continue an old file when its id met one already written without a jump
in between (the jump is what moves next_id past written files), and a
deleted take's file stayed on disk.
The host gains one call beside appendFile: f.host.writeFile(name, bytes)
writes a new, empty file of that name, through the same vtable entry
with a `replace` flag. The old file is unlinked, so a readFile mapping
of it keeps its bytes, and the host's cached mapping is retired (kept
until exit, the sketch may hold it) so the next readFile maps the new
file. The web host writes nothing, as for appendFile.
micscope writes each take's file so when the take begins: on the
frame whose transport request is newly `recording`, live, and not a
jump (a jump's requests are restored State's, not a beginning; a fresh
Session counts old requests as handled, so a restart mid-recording
keeps its file), before the takes are read; `open` writes a file's
samples so too.
A deleted take's file stays: its State entry comes back with any seek
or mark from before the delete, marks are kept with no end, and an
exported session carries them; neither the sketch (which cannot see
the history) nor the host (which cannot read State's meaning) can tell
when none is left. So "never, safely": the file is kept.
Tests: zig build test, 164/166 steps, 132/132 tests (the appendFile
test now also replaces a file and reads back only the new bytes); the
one failure was the Typst bench's 1 ms bound (1.024 ms), timing code this
change does not touch, on a machine loaded by other builds; it passed in
the next full run (166/166, with the change above this one). micscope's zig build test, 67/67 steps,
10/10 tests.
Co-Authored-By: Claude Opus 5.5 <[email protected]>
Claude-Session: https://claude.ai/code/session_016Y9MNBECMWcJD5pdS4SR6T
Diffstat (limited to 'examples/micscope')
| -rw-r--r-- | examples/micscope/README.md | 5 | ||||
| -rw-r--r-- | examples/micscope/src/main.zig | 11 |
2 files changed, 10 insertions, 6 deletions
diff --git a/examples/micscope/README.md b/examples/micscope/README.md index c02318c..e917bf0 100644 --- a/examples/micscope/README.md +++ b/examples/micscope/README.md @@ -151,7 +151,8 @@ addresses as QR codes, for phones). Each take is a file of its samples (mono 32-bit floats at the host's rate), `micscope.state.take-<id>.f32` beside the state (in `.sketchbook/` under `zig build run`), written as it records (`Host.appendFile`). State -lists the takes, so they are still there after a restart. A deleted take's -file stays: a seek back finds it again. Takes stop at ten minutes; the +lists the takes, so they are still there after a restart. A take starts +its file empty (`Host.writeFile`). A deleted take's file stays: a seek +back, or any mark from before the delete, finds it again. Takes stop at ten minutes; the strip holds 64. A `micscope.state.store` from before is not read: its takes stay in it. diff --git a/examples/micscope/src/main.zig b/examples/micscope/src/main.zig index ba7d678..99aac76 100644 --- a/examples/micscope/src/main.zig +++ b/examples/micscope/src/main.zig @@ -486,7 +486,8 @@ fn panBy(s: *State, pixels: f32, in: *const sk.Input) void { } /// Deletes the selected take and selects the one above it. Its file stays: -/// the host deletes no files, and a seek back finds it again. +/// any keyframe or mark from before the delete brings the take back, and +/// neither the sketch nor the host can tell when none is left. fn remove(s: *State, in: *const sk.Input) void { const n = s.takes.count(); const index = @min(s.selected, n - 1); @@ -539,7 +540,7 @@ pub fn command(s: *State, ss: *Session, c: *sk.Console, line: []const u8) !bool try ss.tape.appendSlice(c.session, kept); try ss.clips.appendBounded(.{ .id = take.id, .start = ss.tape.items.len - kept.len, .len = kept.len }); var file: [32]u8 = undefined; - _ = c.host.appendFile(try std.fmt.bufPrint(&file, "take-{d}.f32", .{take.id}), std.mem.sliceAsBytes(kept)); + _ = c.host.writeFile(try std.fmt.bufPrint(&file, "take-{d}.f32", .{take.id}), std.mem.sliceAsBytes(kept)); try s.takes.appendBounded(take); s.next_id += 1; s.selected = s.takes.count() - 1; @@ -571,13 +572,15 @@ pub fn draw(s: *const State, ss: *Session, f: *sk.Frame) void { while (f.host.readFile(f.host.appendFile(f.format("take-{d}.f32", .{id}), &.{})).len > 0) id += 1; if (id != s.next_id) f.run(f.format("next-id {d}", .{id})); } - readTakes(s, ss, f); - // Requests from State. Any of them, or another take selected, flushes // what is queued, so the cursor restarts from what was heard. const transport = ss.transport.take(s.transport); const seek = ss.seek.take(s.seek); const takes = s.takes.constSlice(); + // A take that begins here (not one a jump brought) starts its file + // empty, whatever a file of its id held. + if (transport == .recording and writing and !in.jumped and takes.len > 0) _ = f.host.writeFile(f.format("take-{d}.f32", .{takes[takes.len - 1].id}), &.{}); + readTakes(s, ss, f); const selected: ?*Clip = if (takes.len > 0) clipOf(ss, takes[@min(s.selected, takes.len - 1)].id) else null; var queued: usize = in.stream(stream).queued; if (selected) |t| { |
