anod/Luma3DS-autorun
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Hide "force audio output" option

Browse Source
This commit is contained in:
TuxSH 2023-03-28 00:40:30 +02:00
parent 4025f252c7
commit 3e6399490c
5 changed files with 25 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
arm9/data/config_template.ini
View File

Binary file not shown.

45
arm9/source/config.c
View File

@ -446,19 +446,6 @@ static int configIniHandler(void* user, const char* section, const char* name, c
} else { } else {
CHECK_PARSE_OPTION(-1); CHECK_PARSE_OPTION(-1);
} }
} else if (strcmp(name, "force_audio_output") == 0) {
if (strcasecmp(value, "off") == 0) {
cfg->multiConfig |= 0 << (2 * (u32)FORCEAUDIOOUTPUT);
return 1;
} else if (strcasecmp(value, "headphones") == 0) {
cfg->multiConfig |= 1 << (2 * (u32)FORCEAUDIOOUTPUT);
return 1;
} else if (strcasecmp(value, "speakers") == 0) {
cfg->multiConfig |= 2 << (2 * (u32)FORCEAUDIOOUTPUT);
return 1;
} else {
CHECK_PARSE_OPTION(-1);
}
} else { } else {
CHECK_PARSE_OPTION(-1); CHECK_PARSE_OPTION(-1);
} }
@ -559,7 +546,23 @@ static int configIniHandler(void* user, const char* section, const char* name, c
return 1; return 1;
} }
} }
if (strcmp(name, "force_audio_output") == 0) {
if (strcasecmp(value, "off") == 0) {
cfg->multiConfig |= 0 << (2 * (u32)FORCEAUDIOOUTPUT);
return 1;
} else if (strcasecmp(value, "headphones") == 0) {
cfg->multiConfig |= 1 << (2 * (u32)FORCEAUDIOOUTPUT);
return 1;
} else if (strcasecmp(value, "speakers") == 0) {
cfg->multiConfig |= 2 << (2 * (u32)FORCEAUDIOOUTPUT);
return 1;
} else {
CHECK_PARSE_OPTION(-1); CHECK_PARSE_OPTION(-1);
}
} else {
CHECK_PARSE_OPTION(-1);
}
} else { } else {
CHECK_PARSE_OPTION(-1); CHECK_PARSE_OPTION(-1);
} }
@ -647,7 +650,7 @@ static size_t saveLumaIniConfigToStr(char *out)
1 + (int)MULTICONFIG(DEFAULTEMU), 4 - (int)MULTICONFIG(BRIGHTNESS), 1 + (int)MULTICONFIG(DEFAULTEMU), 4 - (int)MULTICONFIG(BRIGHTNESS),
splashPosStr, (unsigned int)cfg->splashDurationMsec, splashPosStr, (unsigned int)cfg->splashDurationMsec,
pinNumDigits, n3dsCpuStr, pinNumDigits, n3dsCpuStr,
autobootModeStr, forceAudioOutputStr, autobootModeStr,
cfg->hbldr3dsxTitleId, rosalinaMenuComboStr, cfg->hbldr3dsxTitleId, rosalinaMenuComboStr,
(int)cfg->ntpTzOffetMinutes, (int)cfg->ntpTzOffetMinutes,
@ -660,6 +663,8 @@ static size_t saveLumaIniConfigToStr(char *out)
cfg->autobootTwlTitleId, (int)cfg->autobootCtrAppmemtype, cfg->autobootTwlTitleId, (int)cfg->autobootCtrAppmemtype,
forceAudioOutputStr,
(int)CONFIG(PATCHUNITINFO), (int)CONFIG(DISABLEARM11EXCHANDLERS), (int)CONFIG(PATCHUNITINFO), (int)CONFIG(DISABLEARM11EXCHANDLERS),
(int)CONFIG(ENABLESAFEFIRMROSALINA) (int)CONFIG(ENABLESAFEFIRMROSALINA)
); );
@ -812,7 +817,6 @@ void configMenu(bool oldPinStatus, u32 oldPinMode)
"PIN lock: Off( ) 4( ) 6( ) 8( ) digits", "PIN lock: Off( ) 4( ) 6( ) 8( ) digits",
"New 3DS CPU: Off( ) Clock( ) L2( ) Clock+L2( )", "New 3DS CPU: Off( ) Clock( ) L2( ) Clock+L2( )",
"Hbmenu autoboot: Off( ) 3DS( ) DSi( )", "Hbmenu autoboot: Off( ) 3DS( ) DSi( )",
"Force audio: Off( ) Headphones( ) Speakers( )"
}; };
static const char *singleOptionsText[] = { "( ) Autoboot EmuNAND", static const char *singleOptionsText[] = { "( ) Autoboot EmuNAND",
@ -864,15 +868,6 @@ void configMenu(bool oldPinStatus, u32 oldPinMode)
"configuration file to configure\n" "configuration file to configure\n"
"this feature.", "this feature.",
"Force audio output to HPs or speakers.\n\n"
"Currently only for NATIVE_FIRM.\n\n"
"Due to software limitations, this gets\n"
"undone if you actually insert then\n"
"remove HPs (just enter then exit sleep\n"
"mode if this happens).\n\n"
"Also gets bypassed for camera shutter\n"
"sound.",
"If enabled, an EmuNAND\n" "If enabled, an EmuNAND\n"
"will be launched on boot.\n\n" "will be launched on boot.\n\n"
"Otherwise, SysNAND will.\n\n" "Otherwise, SysNAND will.\n\n"
@ -951,7 +946,7 @@ void configMenu(bool oldPinStatus, u32 oldPinMode)
{ .visible = true }, { .visible = true },
{ .visible = ISN3DS }, { .visible = ISN3DS },
{ .visible = true }, { .visible = true },
{ .visible = true }, // { .visible = true }, audio rerouting, hidden
}; };
struct singleOption { struct singleOption {

2
arm9/source/config.h
View File

@ -36,7 +36,7 @@
#define CONFIG_FILE "config.ini" #define CONFIG_FILE "config.ini"
#define CONFIG_VERSIONMAJOR 3 #define CONFIG_VERSIONMAJOR 3
#define CONFIG_VERSIONMINOR 6 #define CONFIG_VERSIONMINOR 7
#define BOOTCFG_NAND BOOTCONFIG(0, 7) #define BOOTCFG_NAND BOOTCONFIG(0, 7)
#define BOOTCFG_FIRM BOOTCONFIG(3, 7) #define BOOTCFG_FIRM BOOTCONFIG(3, 7)

BIN
sysmodules/rosalina/data/config_template.ini
View File

Binary file not shown.

4
sysmodules/rosalina/source/luma_config.c
View File

@ -169,7 +169,7 @@ static size_t LumaConfig_SaveLumaIniConfigToStr(char *out, const CfgData *cfg)
1 + (int)MULTICONFIG(DEFAULTEMU), 4 - (int)MULTICONFIG(BRIGHTNESS), 1 + (int)MULTICONFIG(DEFAULTEMU), 4 - (int)MULTICONFIG(BRIGHTNESS),
splashPosStr, (unsigned int)cfg->splashDurationMsec, splashPosStr, (unsigned int)cfg->splashDurationMsec,
pinNumDigits, n3dsCpuStr, pinNumDigits, n3dsCpuStr,
autobootModeStr, forceAudioOutputStr, autobootModeStr,
cfg->hbldr3dsxTitleId, rosalinaMenuComboStr, cfg->hbldr3dsxTitleId, rosalinaMenuComboStr,
(int)cfg->ntpTzOffetMinutes, (int)cfg->ntpTzOffetMinutes,
@ -182,6 +182,8 @@ static size_t LumaConfig_SaveLumaIniConfigToStr(char *out, const CfgData *cfg)
cfg->autobootTwlTitleId, (int)cfg->autobootCtrAppmemtype, cfg->autobootTwlTitleId, (int)cfg->autobootCtrAppmemtype,
forceAudioOutputStr,
(int)CONFIG(PATCHUNITINFO), (int)CONFIG(DISABLEARM11EXCHANDLERS), (int)CONFIG(PATCHUNITINFO), (int)CONFIG(DISABLEARM11EXCHANDLERS),
(int)CONFIG(ENABLESAFEFIRMROSALINA) (int)CONFIG(ENABLESAFEFIRMROSALINA)
); );