piwalker/melonDS
1
0
Fork 0
mirror of https://github.com/melonDS-emu/melonDS.git synced 2025-07-25 07:10:00 -06:00
Code Issues Packages Projects Releases Wiki Activity

decouple more config shit from the core. bahahah

Browse Source
This commit is contained in:
Arisotura
2021-11-17 21:44:49 +01:00
parent 13afaa0303
commit d5b248bb86
8 changed files with 58 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/frontend/qt_sdl/FirmwareSettingsDialog.cpp
View File

@ -16,7 +16,7 @@
with melonDS. If not, see http://www.gnu.org/licenses/.
*/
#include "Config.h"
#include "PlatformConfig.h"
#include "FirmwareSettingsDialog.h"
#include "ui_FirmwareSettingsDialog.h"

11
src/frontend/qt_sdl/Platform.cpp
View File

@ -135,6 +135,11 @@ int GetConfigInt(ConfigEntry entry)
case DLDI_ImageSize: return imgsizes[Config::DLDISize];
case DSiSD_ImageSize: return imgsizes[Config::DSiSDSize];
case Firm_Language: return Config::FirmwareLanguage;
case Firm_BirthdayMonth: return Config::FirmwareBirthdayMonth;
case Firm_BirthdayDay: return Config::FirmwareBirthdayDay;
case Firm_Color: return Config::FirmwareFavouriteColour;
}
return 0;
@ -160,6 +165,9 @@ bool GetConfigBool(ConfigEntry entry)
case DSiSD_Enable: return Config::DSiSDEnable != 0;
case DSiSD_ReadOnly: return Config::DSiSDReadOnly != 0;
case DSiSD_FolderSync: return Config::DSiSDFolderSync != 0;
case Firm_RandomizeMAC: return Config::RandomizeMAC != 0;
case Firm_OverrideSettings: return Config::FirmwareOverrideSettings != 0;
}
return false;
@ -183,6 +191,9 @@ std::string GetConfigString(ConfigEntry entry)
case DSiSD_ImagePath: return Config::DSiSDPath;
case DSiSD_FolderPath: return Config::DSiSDFolderPath;
case Firm_Username: return Config::FirmwareUsername;
case Firm_Message: return Config::FirmwareMessage;
}
return "";

18
src/frontend/qt_sdl/PlatformConfig.cpp
View File

@ -96,6 +96,15 @@ int DSiSDReadOnly;
int DSiSDFolderSync;
char DSiSDFolderPath[1024];
int RandomizeMAC;
bool FirmwareOverrideSettings;
char FirmwareUsername[64];
int FirmwareLanguage;
int FirmwareBirthdayMonth;
int FirmwareBirthdayDay;
int FirmwareFavouriteColour;
char FirmwareMessage[1024];
int SocketBindAnyAddr;
char LANDevice[128];
int DirectLAN;
@ -242,6 +251,15 @@ ConfigEntry PlatformConfigFile[] =
{"DSiSDFolderSync", 0, &DSiSDFolderSync, 0, NULL, 0},
{"DSiSDFolderPath", 1, DSiSDFolderPath, 0, "", 1023},
{"RandomizeMAC", 0, &RandomizeMAC, 0, NULL, 0},
{"FirmwareOverrideSettings", 0, &FirmwareOverrideSettings, false, NULL, 0},
{"FirmwareUsername", 1, FirmwareUsername, 0, "melonDS", 63},
{"FirmwareLanguage", 0, &FirmwareLanguage, 1, NULL, 0},
{"FirmwareBirthdayMonth", 0, &FirmwareBirthdayMonth, 0, NULL, 0},
{"FirmwareBirthdayDay", 0, &FirmwareBirthdayDay, 0, NULL, 0},
{"FirmwareFavouriteColour", 0, &FirmwareFavouriteColour, 0, NULL, 0},
{"FirmwareMessage", 1, FirmwareMessage, 0, "", 1023},
{"SockBindAnyAddr", 0, &SocketBindAnyAddr, 0, NULL, 0},
{"LANDevice", 1, LANDevice, 0, "", 127},
{"DirectLAN", 0, &DirectLAN, 0, NULL, 0},

9
src/frontend/qt_sdl/PlatformConfig.h
View File

@ -112,6 +112,15 @@ extern int DSiSDReadOnly;
extern int DSiSDFolderSync;
extern char DSiSDFolderPath[1024];
extern int RandomizeMAC;
extern bool FirmwareOverrideSettings;
extern char FirmwareUsername[64];
extern int FirmwareLanguage;
extern int FirmwareBirthdayMonth;
extern int FirmwareBirthdayDay;
extern int FirmwareFavouriteColour;
extern char FirmwareMessage[1024];
extern int SocketBindAnyAddr;
extern char LANDevice[128];
extern int DirectLAN;