mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-08-18 00:09:11 +00:00
Config: Fix Movie config loading/saving
* Add missing Language setting loading/saving. This was added after the original OnionConfig PR, which is why support for it was missing. * Change MovieConfigLoader to reuse ConfigInfos. Less duplication. * Extract MovieConfigLoader::Save into SaveToDTM. The DTM should use the current config and not just the movie layer. This makes more sense than just saving the movie layer, which may not always exist, and also fixes a crash that would happen when creating a new recording because the movie layer wouldn't exist in that case. (Plus, having to get the loader from the layer and call ChangeDTM on it manually is not very pretty.)
This commit is contained in:
Léo Lam
parent
fa7e3e55d2
commit
940cc843ed
7 changed files with 74 additions and 146 deletions
|
|
@ -30,6 +30,7 @@
|
|||
#include "Common/Timer.h"
|
||||
|
||||
#include "Core/Boot/Boot.h"
|
||||
#include "Core/Config/MainSettings.h"
|
||||
#include "Core/Config/SYSCONFSettings.h"
|
||||
#include "Core/ConfigLoaders/MovieConfigLoader.h"
|
||||
#include "Core/ConfigManager.h"
|
||||
|
|
@ -77,11 +78,7 @@ static u64 s_totalLagCount = 0; // just stats
|
|||
static u64 s_currentInputCount = 0, s_totalInputCount = 0; // just stats
|
||||
static u64 s_totalTickCount = 0, s_tickCountAtLastInput = 0; // just stats
|
||||
static u64 s_recordingStartTime; // seconds since 1970 that recording started
|
||||
static bool s_bSaveConfig = false, s_bDualCore = false;
|
||||
static bool s_bDSPHLE = false, s_bFastDiscSpeed = false;
|
||||
static bool s_bSyncGPU = false, s_bNetPlay = false;
|
||||
static std::string s_videoBackend = "unknown";
|
||||
static int s_iCPUCore = 1;
|
||||
static bool s_bSaveConfig = false, s_bNetPlay = false;
|
||||
static bool s_bClearSave = false;
|
||||
static bool s_bDiscChange = false;
|
||||
static bool s_bReset = false;
|
||||
|
|
@ -92,7 +89,6 @@ static u8 s_bongos, s_memcards;
|
|||
static u8 s_revision[20];
|
||||
static u32 s_DSPiromHash = 0;
|
||||
static u32 s_DSPcoefHash = 0;
|
||||
static u8 s_language = static_cast<u8>(DiscIO::Language::LANGUAGE_UNKNOWN);
|
||||
|
||||
static bool s_bRecordingFromSaveState = false;
|
||||
static bool s_bPolled = false;
|
||||
|
|
@ -106,6 +102,7 @@ static WiiManipFunction s_wii_manip_func;
|
|||
|
||||
static std::string s_current_file_name;
|
||||
|
||||
static void GetSettings();
|
||||
static bool IsMovieHeader(u8 magic[4])
|
||||
{
|
||||
return magic[0] == 'D' && magic[1] == 'T' && magic[2] == 'M' && magic[3] == 0x1A;
|
||||
|
|
@ -219,7 +216,6 @@ void Init(const BootParameters& boot)
|
|||
s_bPolled = false;
|
||||
s_bFrameStep = false;
|
||||
s_bSaveConfig = false;
|
||||
s_iCPUCore = SConfig::GetInstance().iCPUCore;
|
||||
if (IsPlayingInput())
|
||||
{
|
||||
ReadHeader();
|
||||
|
|
@ -420,30 +416,6 @@ bool IsConfigSaved()
|
|||
{
|
||||
return s_bSaveConfig;
|
||||
}
|
||||
bool IsDualCore()
|
||||
{
|
||||
return s_bDualCore;
|
||||
}
|
||||
|
||||
bool IsDSPHLE()
|
||||
{
|
||||
return s_bDSPHLE;
|
||||
}
|
||||
|
||||
bool IsFastDiscSpeed()
|
||||
{
|
||||
return s_bFastDiscSpeed;
|
||||
}
|
||||
|
||||
int GetCPUMode()
|
||||
{
|
||||
return s_iCPUCore;
|
||||
}
|
||||
|
||||
u8 GetLanguage()
|
||||
{
|
||||
return s_language;
|
||||
}
|
||||
|
||||
bool IsStartingFromClearSave()
|
||||
{
|
||||
|
|
@ -455,11 +427,6 @@ bool IsUsingMemcard(int memcard)
|
|||
return (s_memcards & (1 << memcard)) != 0;
|
||||
}
|
||||
|
||||
bool IsSyncGPU()
|
||||
{
|
||||
return s_bSyncGPU;
|
||||
}
|
||||
|
||||
bool IsNetPlayRecording()
|
||||
{
|
||||
return s_bNetPlay;
|
||||
|
|
@ -893,16 +860,10 @@ void ReadHeader()
|
|||
{
|
||||
s_bSaveConfig = true;
|
||||
Config::AddLayer(ConfigLoaders::GenerateMovieConfigLoader(&tmpHeader));
|
||||
s_bDualCore = tmpHeader.bDualCore;
|
||||
s_bDSPHLE = tmpHeader.bDSPHLE;
|
||||
s_bFastDiscSpeed = tmpHeader.bFastDiscSpeed;
|
||||
s_iCPUCore = tmpHeader.CPUCore;
|
||||
s_bClearSave = tmpHeader.bClearSave;
|
||||
s_memcards = tmpHeader.memcards;
|
||||
s_bongos = tmpHeader.bongos;
|
||||
s_bSyncGPU = tmpHeader.bSyncGPU;
|
||||
s_bNetPlay = tmpHeader.bNetPlay;
|
||||
s_language = tmpHeader.language;
|
||||
memcpy(s_revision, tmpHeader.revision, ArraySize(s_revision));
|
||||
}
|
||||
else
|
||||
|
|
@ -910,7 +871,6 @@ void ReadHeader()
|
|||
GetSettings();
|
||||
}
|
||||
|
||||
s_videoBackend = (char*)tmpHeader.videoBackend;
|
||||
s_discChange = (char*)tmpHeader.discChange;
|
||||
s_author = (char*)tmpHeader.author;
|
||||
memcpy(s_MD5, tmpHeader.md5, 16);
|
||||
|
|
@ -1369,26 +1329,9 @@ void SaveRecording(const std::string& filename)
|
|||
header.recordingStartTime = s_recordingStartTime;
|
||||
|
||||
header.bSaveConfig = true;
|
||||
auto* movie_layer = Config::GetLayer(Config::LayerType::Movie);
|
||||
auto* loader = static_cast<ConfigLoaders::MovieConfigLayerLoader*>(movie_layer->GetLoader());
|
||||
loader->ChangeDTMHeader(&header);
|
||||
movie_layer->Save();
|
||||
header.bSkipIdle = true;
|
||||
header.bDualCore = s_bDualCore;
|
||||
header.bDSPHLE = s_bDSPHLE;
|
||||
header.bFastDiscSpeed = s_bFastDiscSpeed;
|
||||
strncpy((char*)header.videoBackend, s_videoBackend.c_str(), ArraySize(header.videoBackend));
|
||||
header.CPUCore = s_iCPUCore;
|
||||
header.bEFBAccessEnable = g_ActiveConfig.bEFBAccessEnable;
|
||||
header.bEFBCopyEnable = true;
|
||||
header.bSkipEFBCopyToRam = g_ActiveConfig.bSkipEFBCopyToRam;
|
||||
header.bEFBCopyCacheEnable = false;
|
||||
header.bEFBEmulateFormatChanges = g_ActiveConfig.bEFBEmulateFormatChanges;
|
||||
header.bUseXFB = g_ActiveConfig.bUseXFB;
|
||||
header.bUseRealXFB = g_ActiveConfig.bUseRealXFB;
|
||||
ConfigLoaders::SaveToDTM(Config::GetLayer(Config::LayerType::Meta), &header);
|
||||
header.memcards = s_memcards;
|
||||
header.bClearSave = s_bClearSave;
|
||||
header.bSyncGPU = s_bSyncGPU;
|
||||
header.bNetPlay = s_bNetPlay;
|
||||
strncpy((char*)header.discChange, s_discChange.c_str(), ArraySize(header.discChange));
|
||||
strncpy((char*)header.author, s_author.c_str(), ArraySize(header.author));
|
||||
|
|
@ -1398,7 +1341,6 @@ void SaveRecording(const std::string& filename)
|
|||
header.DSPiromHash = s_DSPiromHash;
|
||||
header.DSPcoefHash = s_DSPcoefHash;
|
||||
header.tickCount = s_totalTickCount;
|
||||
header.language = s_language;
|
||||
|
||||
// TODO
|
||||
header.uniqueID = 0;
|
||||
|
|
@ -1457,24 +1399,16 @@ void SetGraphicsConfig()
|
|||
void GetSettings()
|
||||
{
|
||||
s_bSaveConfig = true;
|
||||
s_bDualCore = SConfig::GetInstance().bCPUThread;
|
||||
s_bDSPHLE = SConfig::GetInstance().bDSPHLE;
|
||||
s_bFastDiscSpeed = SConfig::GetInstance().bFastDiscSpeed;
|
||||
s_videoBackend = g_video_backend->GetName();
|
||||
s_bSyncGPU = SConfig::GetInstance().bSyncGPU;
|
||||
s_iCPUCore = SConfig::GetInstance().iCPUCore;
|
||||
s_bNetPlay = NetPlay::IsNetPlayRunning();
|
||||
if (SConfig::GetInstance().bWii)
|
||||
{
|
||||
u64 title_id = SConfig::GetInstance().GetTitleID();
|
||||
s_bClearSave =
|
||||
!File::Exists(Common::GetTitleDataPath(title_id, Common::FROM_SESSION_ROOT) + "banner.bin");
|
||||
s_language = Config::Get(Config::SYSCONF_LANGUAGE);
|
||||
}
|
||||
else
|
||||
{
|
||||
s_bClearSave = !File::Exists(SConfig::GetInstance().m_strMemoryCardA);
|
||||
s_language = SConfig::GetInstance().SelectedLanguage;
|
||||
}
|
||||
s_memcards |=
|
||||
(SConfig::GetInstance().m_EXIDevice[0] == ExpansionInterface::EXIDEVICE_MEMORYCARD ||
|
||||
|
|
@ -1488,7 +1422,7 @@ void GetSettings()
|
|||
std::array<u8, 20> revision = ConvertGitRevisionToBytes(scm_rev_git_str);
|
||||
std::copy(std::begin(revision), std::end(revision), std::begin(s_revision));
|
||||
|
||||
if (!s_bDSPHLE)
|
||||
if (!Config::Get(Config::MAIN_DSP_HLE))
|
||||
{
|
||||
std::string irom_file = File::GetUserPath(D_GCUSER_IDX) + DSP_IROM;
|
||||
std::string coef_file = File::GetUserPath(D_GCUSER_IDX) + DSP_COEF;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue