mirror/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-04-10 21:44:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add Wiimote Speaker option

Browse Source
This commit is contained in:
sigmabeta 2016-02-06 18:36:08 -05:00
parent 85cf07e87e
commit dd4082f216
3 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/settings/SettingsFragmentPresenter.java
View File

@ -138,6 +138,7 @@ public final class SettingsFragmentPresenter
Setting overclockEnable = null; Setting overclockEnable = null;
Setting overclock = null; Setting overclock = null;
Setting continuousScan = null; Setting continuousScan = null;
Setting wiimoteSpeaker = null;
if (mSettings != null) if (mSettings != null)
{ {
@ -146,6 +147,7 @@ public final class SettingsFragmentPresenter
overclockEnable = mSettings.get(SettingsFile.SECTION_CORE).getSetting(SettingsFile.KEY_OVERCLOCK_ENABLE); overclockEnable = mSettings.get(SettingsFile.SECTION_CORE).getSetting(SettingsFile.KEY_OVERCLOCK_ENABLE);
overclock = mSettings.get(SettingsFile.SECTION_CORE).getSetting(SettingsFile.KEY_OVERCLOCK_PERCENT); overclock = mSettings.get(SettingsFile.SECTION_CORE).getSetting(SettingsFile.KEY_OVERCLOCK_PERCENT);
continuousScan = mSettings.get(SettingsFile.SECTION_CORE).getSetting(SettingsFile.KEY_WIIMOTE_SCAN); continuousScan = mSettings.get(SettingsFile.SECTION_CORE).getSetting(SettingsFile.KEY_WIIMOTE_SCAN);
wiimoteSpeaker = mSettings.get(SettingsFile.SECTION_CORE).getSetting(SettingsFile.KEY_WIIMOTE_SPEAKER);
} }
else 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 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 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_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) private void addGcPadSettings(ArrayList<SettingsItem> sl)

1
Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/SettingsFile.java
View File

@ -83,6 +83,7 @@ public final class SettingsFile
public static final String KEY_WIIMOTE_TYPE = "Source"; public static final String KEY_WIIMOTE_TYPE = "Source";
public static final String KEY_WIIMOTE_SCAN = "WiimoteContinuousScanning"; public static final String KEY_WIIMOTE_SCAN = "WiimoteContinuousScanning";
public static final String KEY_WIIMOTE_SPEAKER = "WiimoteEnableSpeaker";
// Internal only, not actually found in settings file. // Internal only, not actually found in settings file.
public static final String KEY_XFB_METHOD = "XFBMethod"; public static final String KEY_XFB_METHOD = "XFBMethod";

8
Source/Android/app/src/main/res/values/strings.xml
View File

@ -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="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">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_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 --> <!-- 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_rumble_description">Enable the vibration function for this GameCube controller.</string>
<string name="gc_adapter_bongos">Bongo 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> <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--> <!-- Package Names-->
<string name="application_id">org.dolphinemu.dolphinemu</string> <string name="application_id">org.dolphinemu.dolphinemu</string>
</resources> </resources>