Fade out Audio when opening the AutobootModule menu

This commit is contained in:
Maschell 2024-07-04 17:24:12 +02:00
parent ca588cb0e5
commit 469e1d15f6
3 changed files with 18 additions and 3 deletions

View File

@ -1,6 +1,5 @@
#include "BootUtils.h" #include "BootUtils.h"
#include "ACTAccountInfo.h" #include "ACTAccountInfo.h"
#include "DrawUtils.h"
#include "MenuUtils.h" #include "MenuUtils.h"
#include "logger.h" #include "logger.h"
#include <codecvt> #include <codecvt>
@ -12,6 +11,7 @@
#include <nn/act.h> #include <nn/act.h>
#include <nn/cmpt/cmpt.h> #include <nn/cmpt/cmpt.h>
#include <padscore/kpad.h> #include <padscore/kpad.h>
#include <sndcore2/core.h>
#include <string> #include <string>
#include <sysapp/launch.h> #include <sysapp/launch.h>
#include <sysapp/title.h> #include <sysapp/title.h>
@ -74,6 +74,9 @@ void handleAccountSelection() {
} }
if (accountInfoList.size() > 0) { if (accountInfoList.size() > 0) {
if (!AXIsInit()) {
AXInit();
}
auto slot = handleAccountSelectScreen(accountInfoList); auto slot = handleAccountSelectScreen(accountInfoList);
DEBUG_FUNCTION_LINE("Load slot %d", slot); DEBUG_FUNCTION_LINE("Load slot %d", slot);

View File

@ -16,6 +16,7 @@
#include <malloc.h> #include <malloc.h>
#include <memory> #include <memory>
#include <mocha/mocha.h> #include <mocha/mocha.h>
#include <sndcore2/core.h>
#include <string> #include <string>
#include <sysapp/title.h> #include <sysapp/title.h>
#include <vector> #include <vector>
@ -528,6 +529,9 @@ bool handleDiscInsertScreen(uint64_t expectedTitleId, uint64_t *titleIdToLaunch)
return true; return true;
} }
if (!AXIsInit()) {
AXInit();
}
// When an unexpected disc was inserted we need to eject it first. // When an unexpected disc was inserted we need to eject it first.
bool allowDisc = !wrongDiscInserted; bool allowDisc = !wrongDiscInserted;

View File

@ -36,8 +36,6 @@ bool gUpdatesBlocked = false;
int32_t main(int32_t argc, char **argv) { int32_t main(int32_t argc, char **argv) {
initLogging(); initLogging();
DEBUG_FUNCTION_LINE("Hello from Autoboot Module"); DEBUG_FUNCTION_LINE("Hello from Autoboot Module");
AXInit();
AXQuit();
InputUtils::Init(); InputUtils::Init();
@ -79,6 +77,9 @@ int32_t main(int32_t argc, char **argv) {
if (FSAOpenDir(client, "/vol/storage_mlc01/sys/update", &dirHandle) >= 0) { if (FSAOpenDir(client, "/vol/storage_mlc01/sys/update", &dirHandle) >= 0) {
FSACloseDir(client, dirHandle); FSACloseDir(client, dirHandle);
gUpdatesBlocked = false; gUpdatesBlocked = false;
if (!AXIsInit()) {
AXInit();
}
handleUpdateWarningScreen(); handleUpdateWarningScreen();
} else { } else {
FSAStat st{}; FSAStat st{};
@ -127,6 +128,9 @@ int32_t main(int32_t argc, char **argv) {
(bootSelection == BOOT_OPTION_HOMEBREW_LAUNCHER && !showHBL) || (bootSelection == BOOT_OPTION_HOMEBREW_LAUNCHER && !showHBL) ||
(bootSelection == BOOT_OPTION_VWII_HOMEBREW_CHANNEL && !showvHBL) || (bootSelection == BOOT_OPTION_VWII_HOMEBREW_CHANNEL && !showvHBL) ||
(buttons.hold & VPAD_BUTTON_PLUS)) { (buttons.hold & VPAD_BUTTON_PLUS)) {
if (!AXIsInit()) {
AXInit();
}
bootSelection = handleMenuScreen(configPath, bootSelection, menu); bootSelection = handleMenuScreen(configPath, bootSelection, menu);
} }
@ -163,6 +167,10 @@ int32_t main(int32_t argc, char **argv) {
InputUtils::DeInit(); InputUtils::DeInit();
Mocha_DeInitLibrary(); Mocha_DeInitLibrary();
deinitLogging(); deinitLogging();
if (AXIsInit()) {
AXQuit();
}
return 0; return 0;
} }