From 894f2bf4104fba8715c64321df949de1acd25d42 Mon Sep 17 00:00:00 2001 From: Kendall Garner <17521368+kgarner7@users.noreply.github.com> Date: Sun, 3 Dec 2023 16:47:59 -0800 Subject: [PATCH] use int instead for windows --- scanner/metadata/taglib/taglib_wrapper.cpp | 2 +- scanner/metadata/taglib/taglib_wrapper.go | 4 ++-- scanner/metadata/taglib/taglib_wrapper.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/scanner/metadata/taglib/taglib_wrapper.cpp b/scanner/metadata/taglib/taglib_wrapper.cpp index 3360a4ee5..00fd00d2a 100644 --- a/scanner/metadata/taglib/taglib_wrapper.cpp +++ b/scanner/metadata/taglib/taglib_wrapper.cpp @@ -138,7 +138,7 @@ int taglib_read(const FILENAME_CHAR_T *filename, unsigned long id) { if (sampleRate != 0) { hasLyrics = true; for (const auto &line: frame->synchedText()) { - const uint timeInMs = (line.time * 1000) / sampleRate; + const int timeInMs = (line.time * 1000) / sampleRate; char *text = (char *)line.text.toCString(true); go_map_put_lyric_line(id, lang, text, timeInMs); } diff --git a/scanner/metadata/taglib/taglib_wrapper.go b/scanner/metadata/taglib/taglib_wrapper.go index aaddbe165..44c0ccd46 100644 --- a/scanner/metadata/taglib/taglib_wrapper.go +++ b/scanner/metadata/taglib/taglib_wrapper.go @@ -118,10 +118,10 @@ func go_map_put_int(id C.ulong, key *C.char, val C.int) { } //export go_map_put_lyric_line -func go_map_put_lyric_line(id C.ulong, lang *C.char, text *C.char, time C.uint) { +func go_map_put_lyric_line(id C.ulong, lang *C.char, text *C.char, time C.int) { language := C.GoString(lang) line := C.GoString(text) - timeGo := uint64(time) + timeGo := int64(time) ms := timeGo % 1000 timeGo /= 1000 diff --git a/scanner/metadata/taglib/taglib_wrapper.h b/scanner/metadata/taglib/taglib_wrapper.h index 2f1592900..17743dd32 100644 --- a/scanner/metadata/taglib/taglib_wrapper.h +++ b/scanner/metadata/taglib/taglib_wrapper.h @@ -14,7 +14,7 @@ extern "C" { extern void go_map_put_m4a_str(unsigned long id, char *key, char *val); extern void go_map_put_str(unsigned long id, char *key, char *val); extern void go_map_put_int(unsigned long id, char *key, int val); -extern void go_map_put_lyric_line(unsigned long id, char *lang, char *text, uint time); +extern void go_map_put_lyric_line(unsigned long id, char *lang, char *text, int time); int taglib_read(const FILENAME_CHAR_T *filename, unsigned long id); #ifdef __cplusplus