From 7882e78ac8a7da94780d2a468f89ecb006b856e6 Mon Sep 17 00:00:00 2001 From: yvain Date: Wed, 31 Jan 2024 23:19:56 +0100 Subject: [PATCH 1/3] fix audio callback init. --- Backends/Kinc-HL/kinc-bridge/kinc.c.h | 2 +- Tools/linux_arm64 | 2 +- Tools/linux_x64 | 2 +- Tools/macos | 2 +- Tools/windows_x64 | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Backends/Kinc-HL/kinc-bridge/kinc.c.h b/Backends/Kinc-HL/kinc-bridge/kinc.c.h index f452ac0b0..fb9ebd1f4 100644 --- a/Backends/Kinc-HL/kinc-bridge/kinc.c.h +++ b/Backends/Kinc-HL/kinc-bridge/kinc.c.h @@ -92,7 +92,7 @@ void hl_init_kore(vbyte *title, int width, int height, int samplesPerPixel, bool void hl_kinc_init_audio(vclosure *callCallback, vclosure *readSample, int *outSamplesPerSecond) { audioCallCallback = *((FN_AUDIO_CALL_CALLBACK *)(&callCallback->fun)); audioReadSample = *((FN_AUDIO_READ_SAMPLE *)(&readSample->fun)); - kinc_a2_set_callback(mix); + kinc_a2_set_callback(mix, NULL); kinc_a2_init(); *outSamplesPerSecond = kinc_a2_samples_per_second; } diff --git a/Tools/linux_arm64 b/Tools/linux_arm64 index 7073444bb..90f0e0717 160000 --- a/Tools/linux_arm64 +++ b/Tools/linux_arm64 @@ -1 +1 @@ -Subproject commit 7073444bb897a16e2d4fb1f1fec8ce5d95f3900e +Subproject commit 90f0e0717f08ff5bd7883ccd55cb414b192efd68 diff --git a/Tools/linux_x64 b/Tools/linux_x64 index e9c7e8d8c..61a4aa98d 160000 --- a/Tools/linux_x64 +++ b/Tools/linux_x64 @@ -1 +1 @@ -Subproject commit e9c7e8d8c87d83291a962651e4a7c47672f0dd02 +Subproject commit 61a4aa98d349895d1e36b879edff9a5472c162f6 diff --git a/Tools/macos b/Tools/macos index 85e6a8a7c..459700acc 160000 --- a/Tools/macos +++ b/Tools/macos @@ -1 +1 @@ -Subproject commit 85e6a8a7cd98dfb85543108224fdbad3763aa226 +Subproject commit 459700accdeda95ed9555b005ecb36ae809c6eff diff --git a/Tools/windows_x64 b/Tools/windows_x64 index a6eb10dc7..82dc965e9 160000 --- a/Tools/windows_x64 +++ b/Tools/windows_x64 @@ -1 +1 @@ -Subproject commit a6eb10dc73f11747881b9aaa5222c6e072278b26 +Subproject commit 82dc965e9294d66f37ffcd2af3f18be03852d2c6 From 7b9e9db7a317f4699eac45e470310f59e93eec1c Mon Sep 17 00:00:00 2001 From: yvain Date: Wed, 31 Jan 2024 23:46:30 +0100 Subject: [PATCH 2/3] restore Tools --- Kinc | 2 +- Tools/linux_arm64 | 2 +- Tools/linux_x64 | 2 +- Tools/macos | 2 +- Tools/windows_x64 | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Kinc b/Kinc index 83af1a742..10622ca13 160000 --- a/Kinc +++ b/Kinc @@ -1 +1 @@ -Subproject commit 83af1a7421465c4d904ba31c8ba6433e2c35d65f +Subproject commit 10622ca13d7440fc3963ecb0b7c41da79202f299 diff --git a/Tools/linux_arm64 b/Tools/linux_arm64 index 90f0e0717..7073444bb 160000 --- a/Tools/linux_arm64 +++ b/Tools/linux_arm64 @@ -1 +1 @@ -Subproject commit 90f0e0717f08ff5bd7883ccd55cb414b192efd68 +Subproject commit 7073444bb897a16e2d4fb1f1fec8ce5d95f3900e diff --git a/Tools/linux_x64 b/Tools/linux_x64 index 61a4aa98d..e9c7e8d8c 160000 --- a/Tools/linux_x64 +++ b/Tools/linux_x64 @@ -1 +1 @@ -Subproject commit 61a4aa98d349895d1e36b879edff9a5472c162f6 +Subproject commit e9c7e8d8c87d83291a962651e4a7c47672f0dd02 diff --git a/Tools/macos b/Tools/macos index 459700acc..85e6a8a7c 160000 --- a/Tools/macos +++ b/Tools/macos @@ -1 +1 @@ -Subproject commit 459700accdeda95ed9555b005ecb36ae809c6eff +Subproject commit 85e6a8a7cd98dfb85543108224fdbad3763aa226 diff --git a/Tools/windows_x64 b/Tools/windows_x64 index 82dc965e9..a6eb10dc7 160000 --- a/Tools/windows_x64 +++ b/Tools/windows_x64 @@ -1 +1 @@ -Subproject commit 82dc965e9294d66f37ffcd2af3f18be03852d2c6 +Subproject commit a6eb10dc73f11747881b9aaa5222c6e072278b26 From e3a8978f1f788bb2cfa3d6a4c75af255d07601e3 Mon Sep 17 00:00:00 2001 From: yvain Date: Wed, 31 Jan 2024 23:48:20 +0100 Subject: [PATCH 3/3] checkout Kinc to 830af1. --- Kinc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Kinc b/Kinc index 10622ca13..83af1a742 160000 --- a/Kinc +++ b/Kinc @@ -1 +1 @@ -Subproject commit 10622ca13d7440fc3963ecb0b7c41da79202f299 +Subproject commit 83af1a7421465c4d904ba31c8ba6433e2c35d65f