From ef4b9841c99d9ecad38777feb1d9f8b85d13f171 Mon Sep 17 00:00:00 2001 From: Lenni0451 <20379977+Lenni0451@users.noreply.github.com> Date: Mon, 13 May 2024 21:46:41 +0200 Subject: [PATCH] Print BASS version --- .../noteblocktool/audio/soundsystem/BassLibrary.java | 2 +- .../audio/soundsystem/impl/BassSoundSystem.java | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/main/java/net/raphimc/noteblocktool/audio/soundsystem/BassLibrary.java b/src/main/java/net/raphimc/noteblocktool/audio/soundsystem/BassLibrary.java index 359df0a..4129777 100644 --- a/src/main/java/net/raphimc/noteblocktool/audio/soundsystem/BassLibrary.java +++ b/src/main/java/net/raphimc/noteblocktool/audio/soundsystem/BassLibrary.java @@ -30,7 +30,7 @@ public interface BassLibrary extends Library { BassLibrary INSTANCE = loadNative(); - int BASSVERSION = 0x02041100; // 2.4.17 + int BASSVERSION = 0x204; // BASS_Init flags int BASS_DEVICE_8BITS = 1; // unused diff --git a/src/main/java/net/raphimc/noteblocktool/audio/soundsystem/impl/BassSoundSystem.java b/src/main/java/net/raphimc/noteblocktool/audio/soundsystem/impl/BassSoundSystem.java index c87e052..029a4ad 100644 --- a/src/main/java/net/raphimc/noteblocktool/audio/soundsystem/impl/BassSoundSystem.java +++ b/src/main/java/net/raphimc/noteblocktool/audio/soundsystem/impl/BassSoundSystem.java @@ -65,7 +65,8 @@ public static BassSoundSystem createCapture(final int maxSounds, final AudioForm private BassSoundSystem(final int maxSounds) { super(0); - if (BassLibrary.INSTANCE.BASS_GetVersion() != BassLibrary.BASSVERSION) { + final int version = BassLibrary.INSTANCE.BASS_GetVersion(); + if (((version >> 16) & 0xFFFF) != BassLibrary.BASSVERSION) { throw new RuntimeException("BASS version is not correct"); } if (!BassLibrary.INSTANCE.BASS_Init(-1, 44100, 0, 0, null)) { @@ -92,7 +93,8 @@ private BassSoundSystem(final int maxSounds) { this.close(); })); - System.out.println("Initialized BASS on " + deviceInfo.name); + final String versionString = "v" + ((version >> 24) & 0xFF) + "." + ((version >> 16) & 0xFF) + "." + ((version >> 8) & 0xFF) + "." + (version & 0xFF); + System.out.println("Initialized BASS " + versionString + " on " + deviceInfo.name); } @Override