diff options
| author | sigmabeta <sigmabeta@users.noreply.github.com> | 2016-02-06 18:36:08 -0500 |
|---|---|---|
| committer | sigmabeta <sigmabeta@users.noreply.github.com> | 2016-02-08 21:23:16 -0500 |
| commit | dd4082f21637d93edc1a8271c4a6d993fb90ca35 (patch) | |
| tree | 2c8c3ee6b1a3904590befefd51824ac2f759c903 /Source/Android/app/src | |
| parent | 85cf07e87e4d472bb83a736d5c4420918cc24469 (diff) | |
Add Wiimote Speaker option
Diffstat (limited to 'Source/Android/app/src')
3 files changed, 11 insertions, 1 deletions
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/settings/SettingsFragmentPresenter.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/settings/SettingsFragmentPresenter.java index 01fad9d322..9c5cc0f400 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/settings/SettingsFragmentPresenter.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/settings/SettingsFragmentPresenter.java @@ -138,6 +138,7 @@ public final class SettingsFragmentPresenter Setting overclockEnable = null; Setting overclock = null; Setting continuousScan = null; + Setting wiimoteSpeaker = null; if (mSettings != null) { @@ -146,6 +147,7 @@ public final class SettingsFragmentPresenter overclockEnable = mSettings.get(SettingsFile.SECTION_CORE).getSetting(SettingsFile.KEY_OVERCLOCK_ENABLE); overclock = mSettings.get(SettingsFile.SECTION_CORE).getSetting(SettingsFile.KEY_OVERCLOCK_PERCENT); continuousScan = mSettings.get(SettingsFile.SECTION_CORE).getSetting(SettingsFile.KEY_WIIMOTE_SCAN); + wiimoteSpeaker = mSettings.get(SettingsFile.SECTION_CORE).getSetting(SettingsFile.KEY_WIIMOTE_SPEAKER); } else { @@ -161,6 +163,7 @@ public final class SettingsFragmentPresenter sl.add(new CheckBoxSetting(SettingsFile.KEY_OVERCLOCK_ENABLE, SettingsFile.SECTION_CORE, R.string.overclock_enable, R.string.overclock_enable_description, false, overclockEnable)); sl.add(new SliderSetting(SettingsFile.KEY_OVERCLOCK_PERCENT, SettingsFile.SECTION_CORE, R.string.overclock_title, 0, 400, "%", 100, overclock)); sl.add(new CheckBoxSetting(SettingsFile.KEY_WIIMOTE_SCAN, SettingsFile.SECTION_CORE, R.string.wiimote_scanning, R.string.wiimote_scanning_description, true, continuousScan)); + sl.add(new CheckBoxSetting(SettingsFile.KEY_WIIMOTE_SPEAKER, SettingsFile.SECTION_CORE, R.string.wiimote_speaker, R.string.wiimote_speaker_description, true, wiimoteSpeaker)); } private void addGcPadSettings(ArrayList<SettingsItem> sl) diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/SettingsFile.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/SettingsFile.java index 22404d32d6..4d8e087596 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/SettingsFile.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/SettingsFile.java @@ -83,6 +83,7 @@ public final class SettingsFile public static final String KEY_WIIMOTE_TYPE = "Source"; public static final String KEY_WIIMOTE_SCAN = "WiimoteContinuousScanning"; + public static final String KEY_WIIMOTE_SPEAKER = "WiimoteEnableSpeaker"; // Internal only, not actually found in settings file. public static final String KEY_XFB_METHOD = "XFBMethod"; diff --git a/Source/Android/app/src/main/res/values/strings.xml b/Source/Android/app/src/main/res/values/strings.xml index fa2dcb7a00..60acc28c70 100644 --- a/Source/Android/app/src/main/res/values/strings.xml +++ b/Source/Android/app/src/main/res/values/strings.xml @@ -251,6 +251,8 @@ <string name="overclock_warning">WARNING: Changing this from the default (100%) WILL break games and cause glitches. Please do not report bugs that occur with a non-default clock.</string> <string name="wiimote_scanning">Wiimote Continuous Scanning</string> <string name="wiimote_scanning_description">Leave this on if you are using a DolphinBar for real Wiimote support.</string> + <string name="wiimote_speaker">Wiimote Speaker</string> + <string name="wiimote_speaker_description">Enable sound output through the speaker on a real Wiimote (DolphinBar required).</string> <!-- Video Preference Fragment --> @@ -361,7 +363,11 @@ <string name="gc_adapter_rumble_description">Enable the vibration function for this GameCube controller.</string> <string name="gc_adapter_bongos">Bongo Controller</string> <string name="gc_adapter_bongos_description">Enable this if you are using bongos on this port.</string> - + + <!-- Wiimote Input Menu--> + <string name="header_wiimote_general">General</string> + <string name="header_controllers">Controllers</string> + <!-- Package Names--> <string name="application_id">org.dolphinemu.dolphinemu</string> </resources> |