From 1c6ef1d4d5fcc6798ea5539de1517306cbf6e054 Mon Sep 17 00:00:00 2001 From: Luna Date: Tue, 22 Oct 2019 19:08:38 -0300 Subject: [PATCH] Revert "use sf_open_fd" This reverts commit 6e66850d905c3aaf646d8add316c78e591183f59. --- examples/embed.scri | 2 +- src/image.zig | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/examples/embed.scri b/examples/embed.scri index eb26536..d9c7efa 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 4b275f9..3badd58 100644 --- a/src/image.zig +++ b/src/image.zig @@ -31,17 +31,14 @@ pub fn sopen( var cstr_path = try std.cstr.addNullByte(allocator, path); defer allocator.free(cstr_path); - var fs_file = try std.fs.File.openRead(path); - - var file = c.sf_open_fd(fs_file.handle, mode, fmt, 1); + var file = c.sf_open(cstr_path.ptr, mode, fmt); 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, - msg[0..std.mem.len(u8, msg)], + c.sf_error_number(st), ); return ImageError.OpenFail;