diff options
Diffstat (limited to 'examples/live/src')
| -rw-r--r-- | examples/live/src/Lang.zig | 6 | ||||
| -rw-r--r-- | examples/live/src/main.zig | 13 | ||||
| -rw-r--r-- | examples/live/src/probe.zig | 1 |
3 files changed, 14 insertions, 6 deletions
diff --git a/examples/live/src/Lang.zig b/examples/live/src/Lang.zig index 4f3c3bf..484de54 100644 --- a/examples/live/src/Lang.zig +++ b/examples/live/src/Lang.zig @@ -484,10 +484,12 @@ pub const Synth = extern struct { /// Samples in the block. count: u32, fade: u32, - /// The block's first sample, seconds. + /// The block's first sample, seconds; the old tape's, which differs + /// after a jump (a seek: the old tape where the device was). start: f32, + old_start: f32, rate: f32, - pad: [2]f32 = .{ 0, 0 }, + pad: f32 = 0, pub const glsl = .{ .uniform = .{ .set = 2, .instance = "u" } }; }; diff --git a/examples/live/src/main.zig b/examples/live/src/main.zig index 13f89be..965152a 100644 --- a/examples/live/src/main.zig +++ b/examples/live/src/main.zig @@ -166,16 +166,20 @@ fn sound(s: *const State, ss: *Session, f: *sk.Frame) void { ss.block = f.host.newBuffer(max_block * @sizeOf(f32)); ss.tapes = f.host.newBuffer(2 * @sizeOf(Lang.Tape.Code)); } - // A jump is heard at once: what was queued from before it is dropped. + // A jump is heard at once: what was queued from before it is dropped, + // and the block crosses from where the device was to the new time. + const rate: f64 = @floatFromInt(in.sample_rate); + var queued = in.stream(stream).queued; + const was = ss.clock - @as(f64, @floatFromInt(queued)) / rate; if (in.jumped) { ss.clock = s.time; + queued = 0; f.audio(stream, &.{}, .{ .clear = true }); } - const rate: f64 = @floatFromInt(in.sample_rate); - const want: u32 = @min(in.lead -| in.stream(stream).queued, max_block); + const want: u32 = @min(in.lead -| queued, max_block); if (want > 0) { const new = std.mem.sliceAsBytes(s.out.slice()); - const changed = !std.mem.eql(u8, new, std.mem.sliceAsBytes(ss.heard.slice())); + const changed = in.jumped or !std.mem.eql(u8, new, std.mem.sliceAsBytes(ss.heard.slice())); const tapes = f.scratch.create([2]Lang.Tape.Code) catch return; tapes.* = .{ s.out.code, ss.heard.code }; f.upload(ss.tapes, 0, std.mem.asBytes(tapes)); @@ -190,6 +194,7 @@ fn sound(s: *const State, ss: *Session, f: *sk.Frame) void { .count = want, .fade = if (changed and s.crossfade) want else 0, .start = @floatCast(ss.clock), + .old_start = @floatCast(if (in.jumped) was else ss.clock), .rate = @floatCast(rate), }), .groups = .{ (want + 63) / 64, 1, 1 }, diff --git a/examples/live/src/probe.zig b/examples/live/src/probe.zig index 1e2970c..4f816b2 100644 --- a/examples/live/src/probe.zig +++ b/examples/live/src/probe.zig @@ -123,6 +123,7 @@ pub fn draw(ss: *Session, f: *sk.Frame) void { .count = k.count, .fade = if (k.fade) k.count else 0, .start = ss.time, + .old_start = ss.time, .rate = 48000, }), .groups = .{ (k.count + 63) / 64, 1, 1 }, |
