Android: Force first mic to always be port A-2

skmp · Aug 22, 2018 · fa3c3cd · fa3c3cd
1 parent c922d5b
commit fa3c3cd
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/shell/android-studio/reicast/src/main/jni/src/Android.cpp b/shell/android-studio/reicast/src/main/jni/src/Android.cpp
@@ -402,6 +402,12 @@ JNIEXPORT void JNICALL Java_com_reicast_emulator_emu_JNIdc_setupMic(JNIEnv *env,
 {
     sipemu = env->NewGlobalRef(sip);
     getmicdata = env->GetMethodID(env->GetObjectClass(sipemu),"getData","()[B");
+
+    // Obligatory microphone for controller A-2
+    delete MapleDevices[0][1];
+    mcfg_Create(MDT_Microphone, 0, 1);
+
+    // Allow additional microphones, if desired
     for (int i = 0; i < 3; i++)
     {
         if (controller_periphs[i + 1][0] == MDT_Microphone) {

diff --git a/shell/android-studio/reicast/src/main/res/values/strings.xml b/shell/android-studio/reicast/src/main/res/values/strings.xml
@@ -95,7 +95,7 @@
     <string name="controller_compat">Enable Compatibility Mode</string>
     <string name="controller_unavailable">Gamepad IME detected!\nPlease disable native interface</string>
     <string name="enable_microphone">Enable Microphone(s)</string>
-    <string name="controller_1_vmu">Includes 2 VMUs (Cannot be modified)</string>
+    <string name="controller_1_vmu">Includes 2 VMUs (or 1 VMU / 1 Mic)</string>
 
     <string name="customize_physical_controls">Customize Physical Controls</string>
     <string name="map_keycode_title">Modify Controller</string>