From a53bf3359fd4117ef3a0ddafee7041c1e03e6a05 Mon Sep 17 00:00:00 2001 From: mac Date: Mon, 16 Nov 2026 14:57:10 +1100 Subject: [PATCH] fix hd haptic clip length rounding, off-thread playback and skipped stream ticks --- .../controller/haptic/HDHapticComponent.java | 12 ++++++++++-- .../controlify/driver/sdl/SDLCommonDriver.java | 11 +++++++---- 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/src/main/java/dev/isxander/controlify/controller/haptic/HDHapticComponent.java b/src/main/java/dev/isxander/controlify/controller/haptic/HDHapticComponent.java index 08d072574..a26e5fb46 100644 --- a/src/main/java/dev/isxander/controlify/controller/haptic/HDHapticComponent.java +++ b/src/main/java/dev/isxander/controlify/controller/haptic/HDHapticComponent.java @@ -47,7 +47,7 @@ public void playHaptic(Identifier haptic) { if (!settings().enabled || playHapticConsumer == null) return; getSoundData(haptic, hapticBufferLibrary.getCompleteBuffer(haptic)) - .thenAccept(playHapticConsumer) + .thenAccept(this::acceptOnClientThread) .exceptionally(throwable -> { throwable.printStackTrace(); return null; @@ -66,13 +66,21 @@ public void playHaptic(SoundEvent sound) { Identifier soundId = location.withPrefix("sounds/").withSuffix(".ogg"); getSoundData(soundId, bufferLibrary.getCompleteBuffer(soundId)) - .thenAccept(playHapticConsumer) + .thenAccept(this::acceptOnClientThread) .exceptionally(throwable -> { throwable.printStackTrace(); return null; }); } + // uncached buffers load off-thread, but the driver must only be used from the client thread + private void acceptOnClientThread(CompleteSoundData data) { + Minecraft.getInstance().execute(() -> { + Consumer consumer = this.playHapticConsumer; + if (consumer != null) consumer.accept(data); + }); + } + public void acceptPlayHaptic(Consumer consumer) { this.playHapticConsumer = consumer; } diff --git a/src/main/java/dev/isxander/controlify/driver/sdl/SDLCommonDriver.java b/src/main/java/dev/isxander/controlify/driver/sdl/SDLCommonDriver.java index 1e75f2c6c..fe796147b 100644 --- a/src/main/java/dev/isxander/controlify/driver/sdl/SDLCommonDriver.java +++ b/src/main/java/dev/isxander/controlify/driver/sdl/SDLCommonDriver.java @@ -39,6 +39,7 @@ import java.lang.foreign.ValueLayout; import java.nio.ByteBuffer; import java.util.ArrayList; +import java.util.Iterator; import java.util.List; import java.util.Optional; @@ -303,11 +304,11 @@ private void updateDualSense() { } private void updateHDHaptic() { - for (int i = 0; i < dualsenseAudioHandles.size(); i++) { - AudioStreamHandle handle = dualsenseAudioHandles.get(i); + for (Iterator it = dualsenseAudioHandles.iterator(); it.hasNext(); ) { + AudioStreamHandle handle = it.next(); if (handle.isTimedOut()) { handle.close(); - dualsenseAudioHandles.remove(handle); + it.remove(); } else { handle.tick(); } @@ -357,7 +358,9 @@ private void playHaptic(CompleteSoundData sound) { break; } } - int length = sound.audio().length / spec.frequency() / spec.channels() / byteSs * 20; + // in ticks, rounded up so a clip shorter than a second isn't 0 + int byteRate = spec.frequency() * spec.channels() * byteSs; + int length = Math.max(1, (int) Math.ceil(sound.audio().length * 20.0 / byteRate)); if (handle != null) { handle.queueAudio(sound.audio(), length);