* fix default for audio volume

* add default bools for battery settings
This commit is contained in:
Arisotura 2024-06-17 14:51:32 +02:00
parent eb2bd73c7d
commit 626d2379bc
3 changed files with 5 additions and 2 deletions

View File

@ -63,7 +63,7 @@ DefaultList<int> DefaultInts =
{"Instance*.Firmware.BirthdayDay", 1}, {"Instance*.Firmware.BirthdayDay", 1},
{"MP.AudioMode", 1}, {"MP.AudioMode", 1},
{"MP.RecvTimeout", 25}, {"MP.RecvTimeout", 25},
{"Audio.Volume", 256}, {"Instance*.Audio.Volume", 256},
{"Mic.InputType", 1}, {"Mic.InputType", 1},
{"Mouse.HideSeconds", 5}, {"Mouse.HideSeconds", 5},
{"Instance*.DSi.Battery.Level", 0xF}, {"Instance*.DSi.Battery.Level", 0xF},
@ -99,6 +99,8 @@ DefaultList<bool> DefaultBools =
{"LimitFPS", true}, {"LimitFPS", true},
{"Window*.ShowOSD", true}, {"Window*.ShowOSD", true},
{"Emu.DirectBoot", true}, {"Emu.DirectBoot", true},
{"Instance*.DS.Battery.LevelOkay", true},
{"Instance*.DSi.Battery.Charging", true},
#ifdef JIT_ENABLED #ifdef JIT_ENABLED
{"JIT.BranchOptimisations", true}, {"JIT.BranchOptimisations", true},
{"JIT.LiteralOptimisations", true}, {"JIT.LiteralOptimisations", true},

View File

@ -534,7 +534,7 @@ std::string EmuInstance::getEffectiveFirmwareSavePath()
// OR the path to the wi-fi settings. // OR the path to the wi-fi settings.
void EmuInstance::initFirmwareSaveManager() noexcept void EmuInstance::initFirmwareSaveManager() noexcept
{ {
firmwareSave = std::make_unique<SaveManager>(getEffectiveFirmwareSavePath()); firmwareSave = std::make_unique<SaveManager>(getEffectiveFirmwareSavePath() + instanceFileSuffix());
} }
std::string EmuInstance::getSavestateName(int slot) std::string EmuInstance::getSavestateName(int slot)

View File

@ -404,6 +404,7 @@ void WriteGBASave(const u8* savedata, u32 savelen, u32 writeoffset, u32 writelen
void WriteFirmware(const Firmware& firmware, u32 writeoffset, u32 writelen, void* userdata) void WriteFirmware(const Firmware& firmware, u32 writeoffset, u32 writelen, void* userdata)
{ {
EmuInstance* inst = (EmuInstance*)userdata; EmuInstance* inst = (EmuInstance*)userdata;
printf("saving firmware for instance %d\n", inst->getInstanceID());
if (!inst->firmwareSave) if (!inst->firmwareSave)
return; return;