mirror of
https://github.com/asticode/go-astiav.git
synced 2025-10-19 06:24:34 +08:00
Added fmt to log callback
This commit is contained in:
10
log.go
10
log.go
@@ -3,7 +3,7 @@ package astiav
|
||||
//#cgo pkg-config: libavutil
|
||||
//#include <libavutil/log.h>
|
||||
/*
|
||||
extern void goAstiavLogCallback(int level, char* msg, char* parent);
|
||||
extern void goAstiavLogCallback(int level, char* fmt, char* msg, char* parent);
|
||||
|
||||
static inline void astiavLogCallback(void *avcl, int level, const char *fmt, va_list vl)
|
||||
{
|
||||
@@ -15,7 +15,7 @@ static inline void astiavLogCallback(void *avcl, int level, const char *fmt, va_
|
||||
}
|
||||
char msg[1024];
|
||||
vsprintf(msg, fmt, vl);
|
||||
goAstiavLogCallback(level, msg, parent);
|
||||
goAstiavLogCallback(level, (char*)(fmt), msg, parent);
|
||||
}
|
||||
static inline void astiavSetLogCallback()
|
||||
{
|
||||
@@ -51,7 +51,7 @@ func SetLogLevel(l LogLevel) {
|
||||
C.av_log_set_level(C.int(l))
|
||||
}
|
||||
|
||||
type LogCallback func(l LogLevel, msg, parent string)
|
||||
type LogCallback func(l LogLevel, fmt, msg, parent string)
|
||||
|
||||
var logCallback LogCallback
|
||||
|
||||
@@ -61,11 +61,11 @@ func SetLogCallback(c LogCallback) {
|
||||
}
|
||||
|
||||
//export goAstiavLogCallback
|
||||
func goAstiavLogCallback(level C.int, msg, parent *C.char) {
|
||||
func goAstiavLogCallback(level C.int, fmt, msg, parent *C.char) {
|
||||
if logCallback == nil {
|
||||
return
|
||||
}
|
||||
logCallback(LogLevel(level), C.GoString(msg), C.GoString(parent))
|
||||
logCallback(LogLevel(level), C.GoString(fmt), C.GoString(msg), C.GoString(parent))
|
||||
}
|
||||
|
||||
func ResetLogCallback() {
|
||||
|
Reference in New Issue
Block a user