From 3aa30a037b4e636d4e314f4f8b9a73fd6584ba56 Mon Sep 17 00:00:00 2001
From: makefunstuff <plugatariov@gmail.com>
Date: Fri, 5 Jul 2024 17:41:48 +0300
Subject: upd

---
 src/brr.zig  | 26 +++++++++++++++++++-------
 src/main.zig |  2 +-
 2 files changed, 20 insertions(+), 8 deletions(-)

(limited to 'src')

diff --git a/src/brr.zig b/src/brr.zig
index 6e63a68..9c57076 100644
--- a/src/brr.zig
+++ b/src/brr.zig
@@ -4,16 +4,17 @@ const c = @cImport({
     @cInclude("alsa/asoundlib.h");
 });
 
-pub fn brr(allocator: std.mem.Allocator, file: []const u8) !void {
+pub fn brr(allocator: std.mem.Allocator, file: [*:0]const u8) !void {
     _ = c.mpg123_init();
     const handle = c.mpg123_new(null, null) orelse {
         std.log.warn("Failed to create mpg123 handle\n", .{});
         return;
     };
 
-    const file_path: [*c]const u8 = @ptrCast(file);
-    if (c.mpg123_open(handle, file_path) != c.MPG123_OK) {
-        std.log.warn("Failed to open the file: {s}\n", .{file_path});
+    std.log.debug("file {s}", .{file});
+
+    if (c.mpg123_open(handle, file) != c.MPG123_OK) {
+        std.log.warn("Failed to open the file: {s}\n", .{file});
         return;
     }
 
@@ -39,7 +40,6 @@ pub fn brr(allocator: std.mem.Allocator, file: []const u8) !void {
     }
 
     _ = c.snd_pcm_hw_params_any(pcm, params);
-    _ = c.snd_pcm_hw_params(pcm, params);
     _ = c.snd_pcm_hw_params_set_access(pcm, params, c.SND_PCM_ACCESS_RW_INTERLEAVED);
     _ = c.snd_pcm_hw_params_set_format(pcm, params, c.SND_PCM_FORMAT_S16_LE);
     _ = c.snd_pcm_hw_params_set_channels(pcm, params, @as(c_uint, @intCast(channels)));
@@ -56,9 +56,21 @@ pub fn brr(allocator: std.mem.Allocator, file: []const u8) !void {
     _ = &mpg123_buffer;
     defer allocator.free(mpg123_buffer);
 
-    while (c.mpg123_read(handle, @as(?*anyopaque, @ptrCast(mpg123_buffer.ptr)), buffer_size, &done) == c.MPG123_OK) {
-        _ = c.snd_pcm_writei(pcm, @as(?*anyopaque, @ptrCast(mpg123_buffer.ptr)), done / 4);
+    var result: c_int = 0;
+    while (true) {
+        result = c.mpg123_read(handle, @as(?*anyopaque, @ptrCast(mpg123_buffer.ptr)), buffer_size, &done);
+        switch (result) {
+            c.MPG123_OK => {
+                _ = c.snd_pcm_writei(pcm, @as(?*anyopaque, @ptrCast(mpg123_buffer.ptr)), done / 4);
+            },
+            else => {
+                const err_str = c.mpg123_strerror(handle);
+                std.log.warn("Failed to read from file\n {}, {s}", .{ result, err_str });
+                break;
+            },
+        }
     }
+
     _ = c.mpg123_delete(handle);
     _ = c.snd_pcm_hw_params_free(params);
     _ = c.snd_pcm_close(pcm);
diff --git a/src/main.zig b/src/main.zig
index 15df5c9..590f3b3 100644
--- a/src/main.zig
+++ b/src/main.zig
@@ -51,7 +51,7 @@ pub fn main() !void {
 
     if (args.len == 3) {
         if (std.mem.eql(u8, args[1], "brr")) {
-            try brr.brr(allocator, args[2]);
+            try brr.brr(std.heap.c_allocator, args[2]);
             return;
         }
     }
-- 
cgit 1.4.1-2-gfad0