empathicqubit/Mesen-SX
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Libretro: Read firmware files from the "system" folder rather than the "system\Firmware" folder

Browse source
This commit is contained in:
Sour 2020-01-19 14:53:29 -05:00
parent cf532e59c5
commit 6e37291061
5 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Core/EmuSettings.cpp
View file

@ -126,7 +126,8 @@ void EmuSettings::SetPreferences(PreferencesConfig config)
FolderUtilities::SetFolderOverrides(
_saveFolder,
_saveStateFolder,
_screenshotFolder
_screenshotFolder,
""
);
_preferences = config;

2
Libretro/LibretroSoundManager.h
View file

@ -27,7 +27,7 @@ public:
{
if(!_skipMode && _sendAudioSample) {
for(uint32_t total = 0; total < sampleCount; ) {
total += _sendAudioSample(soundBuffer + total*2, sampleCount - total);
total += (uint32_t)_sendAudioSample(soundBuffer + total*2, (size_t)(sampleCount - total));
}
}
}

2
Libretro/libretro.cpp
View file

@ -572,7 +572,7 @@ extern "C" {
//Expect the following structure:
// /saves/*.sav
FolderUtilities::SetHomeFolder(systemFolder);
FolderUtilities::SetFolderOverrides(saveFolder, "", "");
FolderUtilities::SetFolderOverrides(saveFolder, "", "", systemFolder);
update_settings();

3
Utilities/FolderUtilities.cpp
View file

@ -57,11 +57,12 @@ vector<string> FolderUtilities::GetKnownGameFolders()
return _gameFolders;
}
void FolderUtilities::SetFolderOverrides(string saveFolder, string saveStateFolder, string screenshotFolder)
void FolderUtilities::SetFolderOverrides(string saveFolder, string saveStateFolder, string screenshotFolder, string firmwareFolder)
{
_saveFolderOverride = saveFolder;
_saveStateFolderOverride = saveStateFolder;
_screenshotFolderOverride = screenshotFolder;
_firmwareFolderOverride = firmwareFolder;
}
string FolderUtilities::GetSaveFolder()

2
Utilities/FolderUtilities.h
View file

@ -17,7 +17,7 @@ public:
static void SetHomeFolder(string homeFolder);
static string GetHomeFolder();
static void SetFolderOverrides(string saveFolder, string saveStateFolder, string screenshotFolder);
static void SetFolderOverrides(string saveFolder, string saveStateFolder, string screenshotFolder, string firmwareFolder);
static void AddKnownGameFolder(string gameFolder);
static vector<string> GetKnownGameFolders();