From 6f3bea644d67e1e98866f39ac89f73aab26626af Mon Sep 17 00:00:00 2001 From: Marina Barros Date: Fri, 16 Oct 2026 17:38:08 -0300 Subject: seek atualiza o tempo decorrido --- .gitignore | 1 + shell.nix | 1 + src/main.zig | 91 ++++++++++++++++++++++++++++++++++++------------------------ 3 files changed, 57 insertions(+), 36 deletions(-) diff --git a/.gitignore b/.gitignore index a331e29..7d5ab91 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ zig-pkg/ zig-out/ .zig-cache/ .direnv/ +assets/ diff --git a/shell.nix b/shell.nix index 6d59bce..a5af1e0 100644 --- a/shell.nix +++ b/shell.nix @@ -6,6 +6,7 @@ in packages = with pkgs; [ zig pkg-config + gdb ]; buildInputs = with pkgs; [ diff --git a/src/main.zig b/src/main.zig index bdbc9c7..ebd5714 100644 --- a/src/main.zig +++ b/src/main.zig @@ -104,40 +104,13 @@ pub fn main( const segundos_por_parcela: usize = duracao_ms / 100; - var ms_atual: i64 = 0; - var duracao_loop: i64 = 0; + var ms_atual: usize = 0; + var duracao_loop: usize = 0; var quit_app = false; while (!quit_app) { const inicio_loop = io.Clock.now(.real, init.io); - const tempo_decorrido_ms = @as(usize, @intCast(ms_atual)); - const min_decorrido, const seg_decorrido = msToElapsedTime(tempo_decorrido_ms); - - // BARRA DE PROGRESSO: - // dividir a duração da música em 100 parcelas de x segundos - // para cada x segundos decorridos, renderizar x * █ - // depois disso, renderizar (100 - x) * • para os segundos não decorridos - const num_parcelas = tempo_decorrido_ms / segundos_por_parcela; - _ = try writer_interface.writeAll("\r"); - _ = try writer_interface.splatBytesAll(BARRA, num_parcelas); - _ = try writer_interface.splatBytesAll(PONTO, (100 - num_parcelas)); - try writer_interface.flush(); - try writer_interface.print(CNL, .{}); - - try writer_interface.print("\r{d}:{d:02} / {d}:{d}", .{ min_decorrido, seg_decorrido, minutos, segundos }); - try writer_interface.print(CNL, .{}); - try writer_interface.print("\rVolume: {d}\r", .{@round(track.getGain() * 100)}); - try writer_interface.print(CNL, .{}); - try writer_interface.print("\r{s} | {s} | {s}", .{ titulo, artista, album }); - try writer_interface.print(CNL, .{}); - try writer_interface.print("\r{s}{s}: pausar/reproduzir | =/+: aumentar volume | -: diminuir volume | q: sair", .{ REVERSE, NOT_REVERSE }); - try writer_interface.print(CPL, .{}); - try writer_interface.print(CPL, .{}); - try writer_interface.print(CPL, .{}); - try writer_interface.print(CPL, .{}); - try writer_interface.flush(); - // lê comandos var r_buffer: [64]u8 = undefined; var stdin_reader = stdin.reader(init.io, &r_buffer); @@ -146,22 +119,28 @@ pub fn main( const byte = reader_interface.takeByte() catch 0; switch (byte) { 0x1B => { - const next = try reader_interface.takeByte(); + var next = try reader_interface.takeByte(); if (next != '[') { continue; } - const final = try reader_interface.takeByte(); - switch (final) { + next = try reader_interface.takeByte(); + switch (next) { + // https://en.wikipedia.org/wiki/ANSI_escape_code#Terminal_input_sequences + // seta pra esquerda 'D' => { const cur_frame = try track.getPlaybackPosition(); const framesFromMs = try track.msToFrames(5000); if (cur_frame <= framesFromMs) { try track.setPlaybackPosition(0); + ms_atual = 0; continue; } - try track.setPlaybackPosition(cur_frame - framesFromMs); + const frames_decorridos = cur_frame - framesFromMs; + try track.setPlaybackPosition(frames_decorridos); + ms_atual = if (ms_atual <= 5000) 0 else ms_atual - 5000; }, + // seta pra direita 'C' => { const cur_frame = try track.getPlaybackPosition(); const framesFromMs = try track.msToFrames(5000); @@ -170,10 +149,12 @@ pub fn main( continue; } - try track.setPlaybackPosition(cur_frame + framesFromMs); + const frames_decorridos = cur_frame + framesFromMs; + try track.setPlaybackPosition(frames_decorridos); + ms_atual = if ((duracao_ms - ms_atual) <= 5000) duracao_ms else ms_atual + 5000; }, else => { - return; + continue; }, } }, @@ -196,8 +177,42 @@ pub fn main( else => {}, } + const min_decorrido, const seg_decorrido = msToElapsedTime(ms_atual); + + // BARRA DE PROGRESSO: + // dividir a duração da música em 100 parcelas de x segundos + // para cada x segundos decorridos, renderizar x * █ + // depois disso, renderizar (100 - x) * • para os segundos não decorridos + const num_parcelas = ms_atual / segundos_por_parcela; + _ = try writer_interface.writeAll("\r"); + _ = try writer_interface.splatBytesAll(BARRA, num_parcelas); + _ = try writer_interface.splatBytesAll(PONTO, (100 - num_parcelas - 1)); + try writer_interface.flush(); + try writer_interface.print(CNL, .{}); + + try writer_interface.print("\r{d}:{d:02} / {d}:{d}", .{ + min_decorrido, + seg_decorrido, + minutos, + segundos, + }); + try writer_interface.print(CNL, .{}); + try writer_interface.print("\rVolume: {d}\r", .{@round(track.getGain() * 100)}); + try writer_interface.print(CNL, .{}); + try writer_interface.print("\r{s} | {s} | {s}", .{ titulo, artista, album }); + try writer_interface.print(CNL, .{}); + try writer_interface.print("\r{s}{s}: pausar/reproduzir | =/+: aumentar volume | -: diminuir volume | q: sair", .{ + REVERSE, + NOT_REVERSE, + }); + try writer_interface.print(CPL, .{}); + try writer_interface.print(CPL, .{}); + try writer_interface.print(CPL, .{}); + try writer_interface.print(CPL, .{}); + try writer_interface.flush(); + const fim_loop = io.Clock.now(.real, init.io); - duracao_loop = inicio_loop.durationTo(fim_loop).toMilliseconds(); + duracao_loop = @as(usize, @intCast(inicio_loop.durationTo(fim_loop).toMilliseconds())); if (!track.isPaused()) { ms_atual += duracao_loop; } @@ -213,6 +228,10 @@ pub fn main( /// Transforma milissegundos em duração padrão no formato MM:ss fn msToElapsedTime(ms: usize) [2]usize { + if (ms == 0) { + return .{ 0, 0 }; + } + const seg_raw = ms / 1000; const min = seg_raw / 60; const seg = seg_raw % 60; -- cgit v1.2.3