From 6e66850d905c3aaf646d8add316c78e591183f59 Mon Sep 17 00:00:00 2001 From: Luna Date: Tue, 22 Oct 2019 18:57:36 -0300 Subject: [PATCH] use sf_open_fd --- examples/embed.scri | 2 +- src/image.zig | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/examples/embed.scri b/examples/embed.scri index d9c7efa..eb26536 100644 --- a/examples/embed.scri +++ b/examples/embed.scri @@ -1,3 +1,3 @@ load :0; -embed 3 1 ./file.mp3 +embed 3 1 file.mp3 quicksave; diff --git a/src/image.zig b/src/image.zig index 3badd58..4b275f9 100644 --- a/src/image.zig +++ b/src/image.zig @@ -31,14 +31,17 @@ pub fn sopen( var cstr_path = try std.cstr.addNullByte(allocator, path); defer allocator.free(cstr_path); - var file = c.sf_open(cstr_path.ptr, mode, fmt); + var fs_file = try std.fs.File.openRead(path); + + var file = c.sf_open_fd(fs_file.handle, mode, fmt, 1); const st: i32 = c.sf_error(file); if (st != 0) { + var msg = c.sf_error_number(st); std.debug.warn( "Failed to open {} ({})\n", path, - c.sf_error_number(st), + msg[0..std.mem.len(u8, msg)], ); return ImageError.OpenFail;