diff --git a/JavaApp/src/main/java/com/sun/jna/Platform.java b/JavaApp/src/main/java/com/sun/jna/Platform.java
new file mode 100644
index 0000000000..c027da6bbe
--- /dev/null
+++ b/JavaApp/src/main/java/com/sun/jna/Platform.java
@@ -0,0 +1,238 @@
+/*
+ * The contents of this file is dual-licensed under 2
+ * alternative Open Source/Free licenses: LGPL 2.1 or later and
+ * Apache License 2.0. (starting with JNA version 4.0.0).
+ *
+ * You can freely decide which license you want to apply to
+ * the project.
+ *
+ * You may obtain a copy of the LGPL License at:
+ *
+ * http://www.gnu.org/licenses/licenses.html
+ *
+ * A copy is also included in the downloadable source code package
+ * containing JNA, in file "LGPL2.1".
+ *
+ * You may obtain a copy of the Apache License at:
+ *
+ * http://www.apache.org/licenses/
+ *
+ * A copy is also included in the downloadable source code package
+ * containing JNA, in file "AL2.0".
+ */
+package com.sun.jna;
+
+import java.io.File;
+import java.io.IOException;
+import java.lang.reflect.*;
+import java.util.*;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+/** Provide simplified platform information. */
+public final class Platform {
+    public static final int UNSPECIFIED = -1;
+    public static final int MAC = 0;
+    public static final int LINUX = 1;
+    public static final int WINDOWS = 2;
+    public static final int SOLARIS = 3;
+    public static final int FREEBSD = 4;
+    public static final int OPENBSD = 5;
+    public static final int WINDOWSCE = 6;
+    public static final int AIX = 7;
+    public static final int ANDROID = 8;
+    public static final int GNU = 9;
+    public static final int KFREEBSD = 10;
+    public static final int NETBSD = 11;
+    public static final int DRAGONFLYBSD = 12;
+
+    /** Whether read-only (final) fields within Structures are supported. */
+    public static final boolean RO_FIELDS;
+    /** Whether this platform provides NIO Buffers. */
+    public static final boolean HAS_BUFFERS;
+    /** Whether this platform provides the AWT Component class; also false if
+     * running headless.
+     */
+    public static final boolean HAS_AWT;
+    /** Whether this platform supports the JAWT library. */
+    public static final boolean HAS_JAWT;
+    /** Canonical name of this platform's math library. */
+    public static final String MATH_LIBRARY_NAME;
+    /** Canonical name of this platform's C runtime library. */
+    public static final String C_LIBRARY_NAME;
+    /** Whether in-DLL callbacks are supported. */
+    public static final boolean HAS_DLL_CALLBACKS;
+    /** Canonical resource prefix for the current platform.  This value is
+     * used to load bundled native libraries from the class path.
+     */
+    public static final String RESOURCE_PREFIX;
+
+    private static final int osType;
+    /** Current platform architecture. */
+    public static final String ARCH;
+
+    private static final List<Class> matchingClasses = new ArrayList<Class>();
+    private static Object stackWalker;
+    private static Method stackWalkerGetCaller;
+    private static boolean isMacFoundVoiceChatMod;
+    private static int isMacFindRetries = 10;
+
+    static {
+        osType = MAC;
+        // NOTE: we used to do Class.forName("java.awt.Component"), but that
+        // has the unintended side effect of actually loading AWT native libs,
+        // which can be problematic
+        HAS_AWT = true;
+        HAS_JAWT = HAS_AWT && osType != MAC;
+        HAS_BUFFERS = true;
+        RO_FIELDS = osType != WINDOWSCE;
+        C_LIBRARY_NAME = "c";
+        MATH_LIBRARY_NAME = "m";
+        ARCH = getCanonicalArchitecture(System.getProperty("os.arch"), osType);
+        // Windows aarch64 callbacks disabled via ASMFN_OFF (no mingw support)
+        HAS_DLL_CALLBACKS = false;
+        RESOURCE_PREFIX = getNativeLibraryResourcePrefix();
+
+        try {
+            Class cStackWalker = Class.forName("java.lang.StackWalker");
+            Class cStackWalkerOption = Class.forName("java.lang.StackWalker$Option");
+            Object RETAIN_CLASS_REFERENCE = cStackWalkerOption.getMethod("valueOf", String.class).invoke(null, "RETAIN_CLASS_REFERENCE");
+            stackWalker = cStackWalker.getMethod("getInstance", cStackWalkerOption).invoke(null, RETAIN_CLASS_REFERENCE);
+            stackWalkerGetCaller = cStackWalker.getMethod("getCallerClass");
+        } catch (Throwable th) {
+            isMacFindRetries = 0;
+        }
+    }
+    private Platform() { }
+    public static final int getOSType() {
+        return osType;
+    }
+    public static final boolean isMac() {
+        if (isMacFindRetries <= 0) {
+            return true;
+        } else if (!isMacFoundVoiceChatMod) {
+            isMacFindRetries--;
+            try {
+                matchingClasses.add(Class.forName("de.maxhenkel.voicechat.config.ClientConfig"));
+                matchingClasses.add(Class.forName("de.maxhenkel.voicechat.VoicechatClient"));
+                isMacFoundVoiceChatMod = true;
+            } catch (Throwable th) {}
+            try {
+                matchingClasses.add(Class.forName("su.plo.voice.client.audio.device.VoiceDeviceManager"));
+                isMacFoundVoiceChatMod = true;
+            } catch (Throwable th) {}
+        }
+ 
+        // All voice chat mods calls this thing and straight out disable OpenAL input
+        // so we must trick them into NOT forcefully disabling it
+        try {
+            Class caller = (Class)stackWalkerGetCaller.invoke(stackWalker);
+            System.out.println("Platform.isMac called from " + caller.getName());
+            return !matchingClasses.contains(caller);
+        } catch (Throwable e) {
+            // We're calling a public method, this should never happen
+            throw new RuntimeException(e);
+        }
+    }
+    public static final boolean isAndroid() {
+        return osType == ANDROID;
+    }
+    public static final boolean isLinux() {
+        return osType == LINUX;
+    }
+    public static final boolean isAIX() {
+        return osType == AIX;
+    }
+    public static final boolean isWindowsCE() {
+        return osType == WINDOWSCE;
+    }
+    /** Returns true for any windows variant. */
+    public static final boolean isWindows() {
+        return osType == WINDOWS || osType == WINDOWSCE;
+    }
+    public static final boolean isSolaris() {
+        return osType == SOLARIS;
+    }
+    public static final boolean isDragonFlyBSD() {
+        return osType == DRAGONFLYBSD;
+    }
+    public static final boolean isFreeBSD() {
+        return osType == FREEBSD;
+    }
+    public static final boolean isOpenBSD() {
+        return osType == OPENBSD;
+    }
+    public static final boolean isNetBSD() {
+        return osType == NETBSD;
+    }
+    public static final boolean isGNU() {
+        return osType == GNU;
+    }
+    public static final boolean iskFreeBSD() {
+        return osType == KFREEBSD;
+    }
+    public static final boolean isX11() {
+        // TODO: check filesystem for /usr/X11 or some other X11-specific test
+        return false;
+    }
+    public static final boolean hasRuntimeExec() {
+        return true;
+    }
+    public static final boolean is64Bit() {
+        return true;
+    }
+
+    public static final boolean isIntel() {
+        return false;
+    }
+
+    public static final boolean isPPC() {
+        return false;
+    }
+
+    public static final boolean isARM() {
+        return true;
+    }
+
+    public static final boolean isSPARC() {
+        return false;
+    }
+
+    public static final boolean isMIPS() {
+        return false;
+    }
+
+    public static final boolean isLoongArch() {
+        return false;
+    }
+
+    static String getCanonicalArchitecture(String arch, int platform) {
+        return arch;
+    }
+
+    static boolean isSoftFloat() {
+        return false;
+    }
+
+    /** Generate a canonical String prefix based on the current OS
+        type/arch/name.
+    */
+    static String getNativeLibraryResourcePrefix() {
+        String prefix = System.getProperty("jna.prefix");
+        if(prefix != null) {
+            return prefix;
+        } else {
+            return getNativeLibraryResourcePrefix(getOSType(), System.getProperty("os.arch"), System.getProperty("os.name"));
+        }
+    }
+
+    /** Generate a canonical String prefix based on the given OS
+        type/arch/name.
+        @param osType from {@link #getOSType()}
+        @param arch from <code>os.arch</code> System property
+        @param name from <code>os.name</code> System property
+    */
+    static String getNativeLibraryResourcePrefix(int osType, String arch, String name) {
+        return "darwin-" + arch;
+    }
+}
\ No newline at end of file
diff --git a/Natives/SurfaceViewController.m b/Natives/SurfaceViewController.m
index 9afc3b833c..f26428f9ef 100644
--- a/Natives/SurfaceViewController.m
+++ b/Natives/SurfaceViewController.m
@@ -291,20 +291,18 @@ - (void)viewDidAppear:(BOOL)animated {
 - (void)updateAudioSettings {
     NSError *sessionError = nil;
     AVAudioSessionCategory category;
-    AVAudioSessionCategoryOptions options;
+    AVAudioSessionCategoryOptions options = 0;
     if(getPrefBool(@"video.silence_with_switch")) {
         category = AVAudioSessionCategorySoloAmbient;
     } else {
         category = AVAudioSessionCategoryPlayAndRecord;
+        options |= AVAudioSessionCategoryOptionAllowAirPlay | AVAudioSessionCategoryOptionAllowBluetooth | AVAudioSessionCategoryOptionAllowBluetoothA2DP | AVAudioSessionCategoryOptionDefaultToSpeaker;
     }
-    if(getPrefBool(@"video.silence_other_audio")) {
-        options = 0;
-    } else {
-        options = AVAudioSessionCategoryOptionMixWithOthers;
+    if(!getPrefBool(@"video.silence_other_audio")) {
+        options |= AVAudioSessionCategoryOptionMixWithOthers;
     }
     AVAudioSession *session = AVAudioSession.sharedInstance;
     [session setCategory:category withOptions:options error:&sessionError];
-    [session setCategory:AVAudioSessionCategoryPlayAndRecord withOptions:AVAudioSessionCategoryOptionDefaultToSpeaker error: nil];
     [session setActive:YES error:&sessionError];
 }