srctree

Andrew Kelley parent 4559152b eb3c4def
update to zig 0.13.0-dev.68+b86c4bde6

build.zig.zon added: 29, removed: 29, total 0

@@ -1,7 +1,7 @@

.name = "player",

.version = "0.0.0",

.minimum_zig_version = "0.13.0-dev.33+8af59d1f9",

.minimum_zig_version = "0.13.0-dev.68+b86c4bde6",

.dependencies = .{

.ffmpeg = .{

.url = "https://github.com/andrewrk/ffmpeg/archive/refs/tags/7.0.1-3.tar.gz",

example/analyze.zig added: 29, removed: 29, total 0

@@ -36,9 +36,9 @@ pub fn main() !void {

const min_array = std.mem.sliceAsBytes(result.twi.slices.items(.min));

const rms_array = std.mem.sliceAsBytes(result.twi.slices.items(.rms));

var iovs = [_]std.posix.iovec_const{

.{ .iov_base = max_array.ptr, .iov_len = max_array.len },

.{ .iov_base = min_array.ptr, .iov_len = min_array.len },

.{ .iov_base = rms_array.ptr, .iov_len = rms_array.len },

.{ .base = max_array.ptr, .len = max_array.len },

.{ .base = min_array.ptr, .len = min_array.len },

.{ .base = rms_array.ptr, .len = rms_array.len },

};

try stdout.writevAll(&iovs);

}

server/WebSocket.zig added: 29, removed: 29, total 0

@@ -182,7 +182,7 @@ pub const WriteError = std.http.Server.Response.WriteError;

pub fn writeMessage(ws: *WebSocket, message: []const u8) WriteError!void {

const iovecs: [1]std.posix.iovec_const = .{

.{ .iov_base = message.ptr, .iov_len = message.len },

.{ .base = message.ptr, .len = message.len },

};

return writeMessagev(ws, &iovecs);

}

@@ -190,7 +190,7 @@ pub fn writeMessage(ws: *WebSocket, message: []const u8) WriteError!void {

pub fn writeMessagev(ws: *WebSocket, message: []const std.posix.iovec_const) WriteError!void {

const total_len = l: {

var total_len: u64 = 0;

for (message) |iovec| total_len += iovec.iov_len;

for (message) |iovec| total_len += iovec.len;

break :l total_len;

};

@@ -228,6 +228,6 @@ pub fn writeMessagev(ws: *WebSocket, message: []const std.posix.iovec_const) Wri

const response = &ws.response;

try response.writeAll(header);

for (message) |iovec|

try response.writeAll(iovec.iov_base[0..iovec.iov_len]);

try response.writeAll(iovec.base[0..iovec.len]);

try response.flush();

}

server/main.zig added: 29, removed: 29, total 0

@@ -287,17 +287,17 @@ pub const Server = struct {

{

const iovecs = [_]std.posix.iovec_const{

.{ .iov_base = std.mem.asBytes(&header), .iov_len = @sizeOf(Header) },

.{ .iov_base = files.ptr, .iov_len = files.len },

.{ .iov_base = directories.ptr, .iov_len = directories.len },

.{ .iov_base = albums.ptr, .iov_len = albums.len },

.{ .iov_base = string_bytes.ptr, .iov_len = string_bytes.len },

.{ .base = std.mem.asBytes(&header), .len = @sizeOf(Header) },

.{ .base = files.ptr, .len = files.len },

.{ .base = directories.ptr, .len = directories.len },

.{ .base = albums.ptr, .len = albums.len },

.{ .base = string_bytes.ptr, .len = string_bytes.len },

};

try ws.writeMessagev(&iovecs);

}

var iovecs_buf: [3]std.posix.iovec_const = .{

.{ .iov_base = std.mem.asBytes(&play_queue_header), .iov_len = @sizeOf(protocol.PlayQueueHeader) },

.{ .base = std.mem.asBytes(&play_queue_header), .len = @sizeOf(protocol.PlayQueueHeader) },

undefined,

};

@@ -310,12 +310,12 @@ pub const Server = struct {

.timestamp = s.db.state.seek_timestamp,

};

iovecs_buf[iovecs_n] = .{ .iov_base = queue_items.ptr, .iov_len = queue_items.len };

iovecs_buf[iovecs_n] = .{ .base = queue_items.ptr, .len = queue_items.len };

iovecs_n += 1;

iovecs_buf[iovecs_n] = .{

.iov_base = std.mem.asBytes(&seek),

.iov_len = @sizeOf(protocol.PlayQueueHeader.Seek),

.base = std.mem.asBytes(&seek),

.len = @sizeOf(protocol.PlayQueueHeader.Seek),

};

iovecs_n += 1;

}

@@ -749,11 +749,11 @@ fn saveDb(db: *const Db, install_directory: Directory, db_path: []const u8) !voi

};

var iovecs = [_]std.posix.iovec_const{

.{ .iov_base = std.mem.asBytes(&header), .iov_len = @sizeOf(DbFileHeader) },

.{ .iov_base = files.ptr, .iov_len = files.len },

.{ .iov_base = directories.ptr, .iov_len = directories.len },

.{ .iov_base = albums.ptr, .iov_len = albums.len },

.{ .iov_base = string_bytes.ptr, .iov_len = string_bytes.len },

.{ .base = std.mem.asBytes(&header), .len = @sizeOf(DbFileHeader) },

.{ .base = files.ptr, .len = files.len },

.{ .base = directories.ptr, .len = directories.len },

.{ .base = albums.ptr, .len = albums.len },

.{ .base = string_bytes.ptr, .len = string_bytes.len },

};

var atomic_file = try install_directory.handle.atomicFile(db_path, .{});

@@ -788,10 +788,10 @@ fn loadDb(gpa: Allocator, db: *Db, install_directory: Directory, db_path: []cons

const string_bytes = db.string_bytes.items;

var iovecs = [_]std.posix.iovec{

.{ .iov_base = files.ptr, .iov_len = files.len },

.{ .iov_base = directories.ptr, .iov_len = directories.len },

.{ .iov_base = albums.ptr, .iov_len = albums.len },

.{ .iov_base = string_bytes.ptr, .iov_len = string_bytes.len },

.{ .base = files.ptr, .len = files.len },

.{ .base = directories.ptr, .len = directories.len },

.{ .base = albums.ptr, .len = albums.len },

.{ .base = string_bytes.ptr, .len = string_bytes.len },

};

const amt_read = try file.readvAll(&iovecs);

const amt_expected = files.len + directories.len + albums.len + string_bytes.len;