The-Homebrew-Cloud/hid_to_vpad
2
0
Fork 0
mirror of https://github.com/Maschell/hid_to_vpad.git synced 2024-09-19 18:29:57 +02:00
Code Issues Packages Projects Releases Wiki Activity

Now you can disable the network controller. In some games (e.g. splatoon) the network thread causes disconnects. This will hopefully fix this

Browse Source
This commit is contained in:
Maschell 2017-07-20 17:29:39 +02:00
parent f7ccd7d58d
commit c6ddfdc86f
12 changed files with 111 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
languages/BR_Portuguese.lang
View File

@ -71,7 +71,7 @@ msgstr "Ajuda"
msgid "Network Client" msgid "Network Client"
msgstr "" msgstr ""
#: src/menu/drc/MenuListDRC.cpp:42 src/menu/drc/content/ContentSettings.cpp:32 #: src/menu/drc/MenuListDRC.cpp:42 src/menu/drc/content/ContentSettings.cpp:33
msgid "Settings" msgid "Settings"
msgstr "" msgstr ""
@ -247,22 +247,28 @@ msgstr "É de código aberto e pode encontrar aquí:"
msgid "https://github.com/QuarkTheAwesome/HIDtoVPADNetworkClient" msgid "https://github.com/QuarkTheAwesome/HIDtoVPADNetworkClient"
msgstr "" msgstr ""
#: src/menu/drc/content/ContentSettings.cpp:44 #: src/menu/drc/content/ContentSettings.cpp:45
#: src/menu/drc/content/ContentSettings.cpp:48 #: src/menu/drc/content/ContentSettings.cpp:50
msgid "Language" msgid "Language"
msgstr "" msgstr ""
#: src/menu/drc/content/ContentSettings.cpp:45 #: src/menu/drc/content/ContentSettings.cpp:46
#: src/menu/drc/content/ContentSettings.cpp:49 #: src/menu/drc/content/ContentSettings.cpp:51
msgid "Rumble" msgid "Rumble"
msgstr "" msgstr ""
#: src/menu/drc/content/ContentSettings.cpp:46 #: src/menu/drc/content/ContentSettings.cpp:47
#: src/menu/drc/content/ContentSettings.cpp:50 #: src/menu/drc/content/ContentSettings.cpp:52
msgid "Music" msgid "Music"
msgstr "" msgstr ""
#: src/menu/drc/content/ContentSettings.cpp:66 #: src/menu/drc/content/ContentSettings.cpp:48
#: src/menu/drc/content/ContentSettings.cpp:53
#, fuzzy
msgid "Network Controller"
msgstr ""
#: src/menu/drc/content/ContentSettings.cpp:74
msgid "<Default>" msgid "<Default>"
msgstr "" msgstr ""

21
languages/english.lang
View File

@ -70,7 +70,7 @@ msgstr ""
msgid "Network Client" msgid "Network Client"
msgstr "" msgstr ""
#: src/menu/drc/MenuListDRC.cpp:42 src/menu/drc/content/ContentSettings.cpp:32 #: src/menu/drc/MenuListDRC.cpp:42 src/menu/drc/content/ContentSettings.cpp:33
msgid "Settings" msgid "Settings"
msgstr "" msgstr ""
@ -246,22 +246,27 @@ msgstr ""
msgid "https://github.com/QuarkTheAwesome/HIDtoVPADNetworkClient" msgid "https://github.com/QuarkTheAwesome/HIDtoVPADNetworkClient"
msgstr "" msgstr ""
#: src/menu/drc/content/ContentSettings.cpp:44 #: src/menu/drc/content/ContentSettings.cpp:45
#: src/menu/drc/content/ContentSettings.cpp:48 #: src/menu/drc/content/ContentSettings.cpp:50
msgid "Language" msgid "Language"
msgstr "" msgstr ""
#: src/menu/drc/content/ContentSettings.cpp:45 #: src/menu/drc/content/ContentSettings.cpp:46
#: src/menu/drc/content/ContentSettings.cpp:49 #: src/menu/drc/content/ContentSettings.cpp:51
msgid "Rumble" msgid "Rumble"
msgstr "" msgstr ""
#: src/menu/drc/content/ContentSettings.cpp:46 #: src/menu/drc/content/ContentSettings.cpp:47
#: src/menu/drc/content/ContentSettings.cpp:50 #: src/menu/drc/content/ContentSettings.cpp:52
msgid "Music" msgid "Music"
msgstr "" msgstr ""
#: src/menu/drc/content/ContentSettings.cpp:66 #: src/menu/drc/content/ContentSettings.cpp:48
#: src/menu/drc/content/ContentSettings.cpp:53
msgid "Network Controller"
msgstr ""
#: src/menu/drc/content/ContentSettings.cpp:74
msgid "<Default>" msgid "<Default>"
msgstr "" msgstr ""

22
languages/french.lang
View File

@ -70,7 +70,7 @@ msgstr "Aide"
msgid "Network Client" msgid "Network Client"
msgstr "Client réseau" msgstr "Client réseau"
#: src/menu/drc/MenuListDRC.cpp:42 src/menu/drc/content/ContentSettings.cpp:32 #: src/menu/drc/MenuListDRC.cpp:42 src/menu/drc/content/ContentSettings.cpp:33
msgid "Settings" msgid "Settings"
msgstr "Paramètres" msgstr "Paramètres"
@ -246,22 +246,28 @@ msgstr "Il est Open source et peut être trouvé ici: "
msgid "https://github.com/QuarkTheAwesome/HIDtoVPADNetworkClient" msgid "https://github.com/QuarkTheAwesome/HIDtoVPADNetworkClient"
msgstr "https://github.com/QuarkTheAwesome/HIDtoVPADNetworkClient" msgstr "https://github.com/QuarkTheAwesome/HIDtoVPADNetworkClient"
#: src/menu/drc/content/ContentSettings.cpp:44 #: src/menu/drc/content/ContentSettings.cpp:45
#: src/menu/drc/content/ContentSettings.cpp:48 #: src/menu/drc/content/ContentSettings.cpp:50
msgid "Language" msgid "Language"
msgstr "Langue" msgstr "Langue"
#: src/menu/drc/content/ContentSettings.cpp:45 #: src/menu/drc/content/ContentSettings.cpp:46
#: src/menu/drc/content/ContentSettings.cpp:49 #: src/menu/drc/content/ContentSettings.cpp:51
msgid "Rumble" msgid "Rumble"
msgstr "Vibration" msgstr "Vibration"
#: src/menu/drc/content/ContentSettings.cpp:46 #: src/menu/drc/content/ContentSettings.cpp:47
#: src/menu/drc/content/ContentSettings.cpp:50 #: src/menu/drc/content/ContentSettings.cpp:52
msgid "Music" msgid "Music"
msgstr "Musique" msgstr "Musique"
#: src/menu/drc/content/ContentSettings.cpp:66 #: src/menu/drc/content/ContentSettings.cpp:48
#: src/menu/drc/content/ContentSettings.cpp:53
#, fuzzy
msgid "Network Controller"
msgstr ""
#: src/menu/drc/content/ContentSettings.cpp:74
msgid "<Default>" msgid "<Default>"
msgstr "<Défaut>" msgstr "<Défaut>"

22
languages/german.lang
View File

@ -71,7 +71,7 @@ msgstr "Hilfe"
msgid "Network Client" msgid "Network Client"
msgstr "Network Client" msgstr "Network Client"
#: src/menu/drc/MenuListDRC.cpp:42 src/menu/drc/content/ContentSettings.cpp:32 #: src/menu/drc/MenuListDRC.cpp:42 src/menu/drc/content/ContentSettings.cpp:33
msgid "Settings" msgid "Settings"
msgstr "Einstellungen" msgstr "Einstellungen"
@ -247,22 +247,28 @@ msgstr "Es ist Open-Source und kann hier geladen werden:"
msgid "https://github.com/QuarkTheAwesome/HIDtoVPADNetworkClient" msgid "https://github.com/QuarkTheAwesome/HIDtoVPADNetworkClient"
msgstr "" msgstr ""
#: src/menu/drc/content/ContentSettings.cpp:44 #: src/menu/drc/content/ContentSettings.cpp:45
#: src/menu/drc/content/ContentSettings.cpp:48 #: src/menu/drc/content/ContentSettings.cpp:50
msgid "Language" msgid "Language"
msgstr "Sprache" msgstr "Sprache"
#: src/menu/drc/content/ContentSettings.cpp:45 #: src/menu/drc/content/ContentSettings.cpp:46
#: src/menu/drc/content/ContentSettings.cpp:49 #: src/menu/drc/content/ContentSettings.cpp:51
msgid "Rumble" msgid "Rumble"
msgstr "" msgstr ""
#: src/menu/drc/content/ContentSettings.cpp:46 #: src/menu/drc/content/ContentSettings.cpp:47
#: src/menu/drc/content/ContentSettings.cpp:50 #: src/menu/drc/content/ContentSettings.cpp:52
msgid "Music" msgid "Music"
msgstr "Musik" msgstr "Musik"
#: src/menu/drc/content/ContentSettings.cpp:66 #: src/menu/drc/content/ContentSettings.cpp:48
#: src/menu/drc/content/ContentSettings.cpp:53
#, fuzzy
msgid "Network Controller"
msgstr ""
#: src/menu/drc/content/ContentSettings.cpp:74
msgid "<Default>" msgid "<Default>"
msgstr "" msgstr ""

22
languages/italian.lang
View File

@ -70,7 +70,7 @@ msgstr "Aiuto"
msgid "Network Client" msgid "Network Client"
msgstr "Network Client" msgstr "Network Client"
#: src/menu/drc/MenuListDRC.cpp:42 src/menu/drc/content/ContentSettings.cpp:32 #: src/menu/drc/MenuListDRC.cpp:42 src/menu/drc/content/ContentSettings.cpp:33
msgid "Settings" msgid "Settings"
msgstr "Impostazioni" msgstr "Impostazioni"
@ -246,22 +246,28 @@ msgstr "È open source e puoi trovarlo qui:"
msgid "https://github.com/QuarkTheAwesome/HIDtoVPADNetworkClient" msgid "https://github.com/QuarkTheAwesome/HIDtoVPADNetworkClient"
msgstr "https://github.com/QuarkTheAwesome/HIDtoVPADNetworkClient" msgstr "https://github.com/QuarkTheAwesome/HIDtoVPADNetworkClient"
#: src/menu/drc/content/ContentSettings.cpp:44 #: src/menu/drc/content/ContentSettings.cpp:45
#: src/menu/drc/content/ContentSettings.cpp:48 #: src/menu/drc/content/ContentSettings.cpp:50
msgid "Language" msgid "Language"
msgstr "Lingua" msgstr "Lingua"
#: src/menu/drc/content/ContentSettings.cpp:45 #: src/menu/drc/content/ContentSettings.cpp:46
#: src/menu/drc/content/ContentSettings.cpp:49 #: src/menu/drc/content/ContentSettings.cpp:51
msgid "Rumble" msgid "Rumble"
msgstr "Vibrazione" msgstr "Vibrazione"
#: src/menu/drc/content/ContentSettings.cpp:46 #: src/menu/drc/content/ContentSettings.cpp:47
#: src/menu/drc/content/ContentSettings.cpp:50 #: src/menu/drc/content/ContentSettings.cpp:52
msgid "Music" msgid "Music"
msgstr "Musica" msgstr "Musica"
#: src/menu/drc/content/ContentSettings.cpp:66 #: src/menu/drc/content/ContentSettings.cpp:48
#: src/menu/drc/content/ContentSettings.cpp:53
#, fuzzy
msgid "Network Controller"
msgstr ""
#: src/menu/drc/content/ContentSettings.cpp:74
msgid "<Default>" msgid "<Default>"
msgstr "<Default>" msgstr "<Default>"

22
languages/spanish.lang
View File

@ -71,7 +71,7 @@ msgstr "Ayuda"
msgid "Network Client" msgid "Network Client"
msgstr "" msgstr ""
#: src/menu/drc/MenuListDRC.cpp:42 src/menu/drc/content/ContentSettings.cpp:32 #: src/menu/drc/MenuListDRC.cpp:42 src/menu/drc/content/ContentSettings.cpp:33
msgid "Settings" msgid "Settings"
msgstr "" msgstr ""
@ -247,22 +247,28 @@ msgstr "Es de código abierto y puedes encontrarlo aquí:"
msgid "https://github.com/QuarkTheAwesome/HIDtoVPADNetworkClient" msgid "https://github.com/QuarkTheAwesome/HIDtoVPADNetworkClient"
msgstr "" msgstr ""
#: src/menu/drc/content/ContentSettings.cpp:44 #: src/menu/drc/content/ContentSettings.cpp:45
#: src/menu/drc/content/ContentSettings.cpp:48 #: src/menu/drc/content/ContentSettings.cpp:50
msgid "Language" msgid "Language"
msgstr "" msgstr ""
#: src/menu/drc/content/ContentSettings.cpp:45 #: src/menu/drc/content/ContentSettings.cpp:46
#: src/menu/drc/content/ContentSettings.cpp:49 #: src/menu/drc/content/ContentSettings.cpp:51
msgid "Rumble" msgid "Rumble"
msgstr "" msgstr ""
#: src/menu/drc/content/ContentSettings.cpp:46 #: src/menu/drc/content/ContentSettings.cpp:47
#: src/menu/drc/content/ContentSettings.cpp:50 #: src/menu/drc/content/ContentSettings.cpp:52
msgid "Music" msgid "Music"
msgstr "" msgstr ""
#: src/menu/drc/content/ContentSettings.cpp:66 #: src/menu/drc/content/ContentSettings.cpp:48
#: src/menu/drc/content/ContentSettings.cpp:53
#, fuzzy
msgid "Network Controller"
msgstr ""
#: src/menu/drc/content/ContentSettings.cpp:74
msgid "<Default>" msgid "<Default>"
msgstr "" msgstr ""

2
src/controller_patcher

@ -1 +1 @@
Subproject commit f8aa5558cdb6bf8a50da0cae0c340555994800a4 Subproject commit 718ac61d77c076900a5e59c93892f94f9fe354a3

2
src/main.cpp
View File

@ -106,6 +106,8 @@ extern "C" s32 Menu_Main(void){
bool rumble = CSettings::instance()->getValueAsBool(CSettings::RumbleActivated); bool rumble = CSettings::instance()->getValueAsBool(CSettings::RumbleActivated);
log_printf("Menu_Main (line %d): Setting rumble to: %d\n",__LINE__,rumble); log_printf("Menu_Main (line %d): Setting rumble to: %d\n",__LINE__,rumble);
ControllerPatcher::setRumbleActivated(rumble); ControllerPatcher::setRumbleActivated(rumble);
bool networkController = CSettings::instance()->getValueAsBool(CSettings::NetworkControllerActivated);
ControllerPatcher::setNetworkControllerActivated(networkController);
log_printf("Menu_Main (line %d): Unmount SD\n",__LINE__); log_printf("Menu_Main (line %d): Unmount SD\n",__LINE__);
unmount_sd_fat("sd"); unmount_sd_fat("sd");
log_printf("Menu_Main (line %d): Release memory\n",__LINE__); log_printf("Menu_Main (line %d): Release memory\n",__LINE__);

18
src/menu/drc/content/ContentSettings.cpp
View File

@ -27,6 +27,7 @@ ContentSettings::ContentSettings():ContentTemplate()
, languageSelectBox("",NULL) , languageSelectBox("",NULL)
, rumbleSwitch(CSettings::instance()->getValueAsBool(CSettings::RumbleActivated)) , rumbleSwitch(CSettings::instance()->getValueAsBool(CSettings::RumbleActivated))
, musicSwitch(CSettings::instance()->getValueAsBool(CSettings::MusicActivated)) , musicSwitch(CSettings::instance()->getValueAsBool(CSettings::MusicActivated))
, networkControllerSwitch(CSettings::instance()->getValueAsBool(CSettings::NetworkControllerActivated))
, buttonClickSound(Resources::GetSound("settings_click_2.mp3")) , buttonClickSound(Resources::GetSound("settings_click_2.mp3"))
{ {
headLine.setText(gettext("Settings")); headLine.setText(gettext("Settings"));
@ -44,10 +45,12 @@ ContentSettings::ContentSettings():ContentTemplate()
settings[gettext("Language")] = &languageSelectBox; settings[gettext("Language")] = &languageSelectBox;
settings[gettext("Rumble")] = &rumbleSwitch; settings[gettext("Rumble")] = &rumbleSwitch;
settings[gettext("Music")] = &musicSwitch; settings[gettext("Music")] = &musicSwitch;
settings[gettext("Network Controller")] = &networkControllerSwitch;
settingsOrder.push_back(gettext("Language")); settingsOrder.push_back(gettext("Language"));
settingsOrder.push_back(gettext("Rumble")); settingsOrder.push_back(gettext("Rumble"));
settingsOrder.push_back(gettext("Music")); settingsOrder.push_back(gettext("Music"));
settingsOrder.push_back(gettext("Network Controller"));
rumbleSwitch.setTrigger(&touchTrigger); rumbleSwitch.setTrigger(&touchTrigger);
rumbleSwitch.setTrigger(&wpadTouchTrigger); rumbleSwitch.setTrigger(&wpadTouchTrigger);
@ -59,6 +62,11 @@ ContentSettings::ContentSettings():ContentTemplate()
musicSwitch.setSoundClick(buttonClickSound); musicSwitch.setSoundClick(buttonClickSound);
musicSwitch.valueChanged.connect(this, &ContentSettings::OnMusicValueChanged); musicSwitch.valueChanged.connect(this, &ContentSettings::OnMusicValueChanged);
networkControllerSwitch.setTrigger(&touchTrigger);
networkControllerSwitch.setTrigger(&wpadTouchTrigger);
networkControllerSwitch.setSoundClick(buttonClickSound);
networkControllerSwitch.valueChanged.connect(this, &ContentSettings::OnNetworkControllerValueChanged);
DirList dirList(DEFAULT_LANG_PATH, LANGUAGE_FILE_EXT, DirList::Files); DirList dirList(DEFAULT_LANG_PATH, LANGUAGE_FILE_EXT, DirList::Files);
dirList.SortList(); dirList.SortList();
@ -156,3 +164,13 @@ void ContentSettings::OnRumbleValueChanged(GuiToggle * toggle,bool value){
bChanged = true; bChanged = true;
} }
void ContentSettings::OnNetworkControllerValueChanged(GuiToggle * toggle,bool value){
CSettings::setValueAsBool(CSettings::NetworkControllerActivated,value);
ControllerPatcher::setNetworkControllerActivated(value);
if(!value){
ControllerPatcher::stopNetworkServer();
}else{
ControllerPatcher::startNetworkServer();
}
bChanged = true;
}

2
src/menu/drc/content/ContentSettings.h
View File

@ -40,6 +40,7 @@ private:
GuiText headLine; GuiText headLine;
GuiSwitch rumbleSwitch; GuiSwitch rumbleSwitch;
GuiSwitch musicSwitch; GuiSwitch musicSwitch;
GuiSwitch networkControllerSwitch;
GuiSound *buttonClickSound; GuiSound *buttonClickSound;
std::map<std::string,GuiElement*> settings; std::map<std::string,GuiElement*> settings;
@ -54,6 +55,7 @@ private:
void OnMusicValueChanged(GuiToggle * toggle,bool value); void OnMusicValueChanged(GuiToggle * toggle,bool value);
void OnRumbleValueChanged(GuiToggle * toggle,bool value); void OnRumbleValueChanged(GuiToggle * toggle,bool value);
void OnNetworkControllerValueChanged(GuiToggle * toggle,bool value);
}; };

4
src/settings/CSettings.cpp
View File

@ -72,6 +72,10 @@ void CSettings::SetDefault()
settingsNames[MusicActivated] = "MusicActivated"; settingsNames[MusicActivated] = "MusicActivated";
settingsValues[MusicActivated].dataType = TypeBool; settingsValues[MusicActivated].dataType = TypeBool;
settingsValues[MusicActivated].ucValue = SETTING_ON; settingsValues[MusicActivated].ucValue = SETTING_ON;
settingsNames[NetworkControllerActivated] = "NetworkControllerActivated";
settingsValues[NetworkControllerActivated].dataType = TypeBool;
settingsValues[NetworkControllerActivated].ucValue = SETTING_ON;
} }
bool CSettings::Load(){ bool CSettings::Load(){

1
src/settings/CSettings.h
View File

@ -70,6 +70,7 @@ public:
AppLanguage, AppLanguage,
RumbleActivated, RumbleActivated,
MusicActivated, MusicActivated,
NetworkControllerActivated,
MAX_VALUE MAX_VALUE
}; };