ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Movie: Add the PAL60 setting to Movie files.

This commit is contained in:
Admiral H. Curtiss 2015-06-05 20:27:01 +02:00
parent 2e5e724f94
commit 277348cd75
3 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Source/Core/Core/BootManager.cpp
View File

@ -229,6 +229,7 @@ bool BootCore(const std::string& _rFilename)
StartUp.bSkipIdle = Movie::IsSkipIdle(); StartUp.bSkipIdle = Movie::IsSkipIdle();
StartUp.bDSPHLE = Movie::IsDSPHLE(); StartUp.bDSPHLE = Movie::IsDSPHLE();
StartUp.bProgressive = Movie::IsProgressive(); StartUp.bProgressive = Movie::IsProgressive();
StartUp.bPAL60 = Movie::IsPAL60();
StartUp.bFastDiscSpeed = Movie::IsFastDiscSpeed(); StartUp.bFastDiscSpeed = Movie::IsFastDiscSpeed();
StartUp.iCPUCore = Movie::GetCPUMode(); StartUp.iCPUCore = Movie::GetCPUMode();
StartUp.bSyncGPU = Movie::IsSyncGPU(); StartUp.bSyncGPU = Movie::IsSyncGPU();

12
Source/Core/Core/Movie.cpp
View File

@ -63,7 +63,9 @@ static u64 s_totalLagCount = 0; // just stats
u64 g_currentInputCount = 0, g_totalInputCount = 0; // just stats u64 g_currentInputCount = 0, g_totalInputCount = 0; // just stats
static u64 s_totalTickCount = 0, s_tickCountAtLastInput = 0; // just stats static u64 s_totalTickCount = 0, s_tickCountAtLastInput = 0; // just stats
static u64 s_recordingStartTime; // seconds since 1970 that recording started static u64 s_recordingStartTime; // seconds since 1970 that recording started
static bool s_bSaveConfig = false, s_bSkipIdle = false, s_bDualCore = false, s_bProgressive = false, s_bDSPHLE = false, s_bFastDiscSpeed = false; static bool s_bSaveConfig = false, s_bSkipIdle = false, s_bDualCore = false;
static bool s_bProgressive = false, s_bPAL60 = false;
static bool s_bDSPHLE = false, s_bFastDiscSpeed = false;
static bool s_bSyncGPU = false, s_bNetPlay = false; static bool s_bSyncGPU = false, s_bNetPlay = false;
static std::string s_videoBackend = "unknown"; static std::string s_videoBackend = "unknown";
static int s_iCPUCore = 1; static int s_iCPUCore = 1;
@ -361,6 +363,11 @@ bool IsProgressive()
return s_bProgressive; return s_bProgressive;
} }
bool IsPAL60()
{
return s_bPAL60;
}
bool IsSkipIdle() bool IsSkipIdle()
{ {
return s_bSkipIdle; return s_bSkipIdle;
@ -789,6 +796,7 @@ void ReadHeader()
s_bSkipIdle = tmpHeader.bSkipIdle; s_bSkipIdle = tmpHeader.bSkipIdle;
s_bDualCore = tmpHeader.bDualCore; s_bDualCore = tmpHeader.bDualCore;
s_bProgressive = tmpHeader.bProgressive; s_bProgressive = tmpHeader.bProgressive;
s_bPAL60 = tmpHeader.bPAL60;
s_bDSPHLE = tmpHeader.bDSPHLE; s_bDSPHLE = tmpHeader.bDSPHLE;
s_bFastDiscSpeed = tmpHeader.bFastDiscSpeed; s_bFastDiscSpeed = tmpHeader.bFastDiscSpeed;
s_iCPUCore = tmpHeader.CPUCore; s_iCPUCore = tmpHeader.CPUCore;
@ -1211,6 +1219,7 @@ void SaveRecording(const std::string& filename)
header.bSkipIdle = s_bSkipIdle; header.bSkipIdle = s_bSkipIdle;
header.bDualCore = s_bDualCore; header.bDualCore = s_bDualCore;
header.bProgressive = s_bProgressive; header.bProgressive = s_bProgressive;
header.bPAL60 = s_bPAL60;
header.bDSPHLE = s_bDSPHLE; header.bDSPHLE = s_bDSPHLE;
header.bFastDiscSpeed = s_bFastDiscSpeed; header.bFastDiscSpeed = s_bFastDiscSpeed;
strncpy((char *)header.videoBackend, s_videoBackend.c_str(),ArraySize(header.videoBackend)); strncpy((char *)header.videoBackend, s_videoBackend.c_str(),ArraySize(header.videoBackend));
@ -1290,6 +1299,7 @@ void GetSettings()
s_bSkipIdle = SConfig::GetInstance().bSkipIdle; s_bSkipIdle = SConfig::GetInstance().bSkipIdle;
s_bDualCore = SConfig::GetInstance().bCPUThread; s_bDualCore = SConfig::GetInstance().bCPUThread;
s_bProgressive = SConfig::GetInstance().bProgressive; s_bProgressive = SConfig::GetInstance().bProgressive;
s_bPAL60 = SConfig::GetInstance().bPAL60;
s_bDSPHLE = SConfig::GetInstance().bDSPHLE; s_bDSPHLE = SConfig::GetInstance().bDSPHLE;
s_bFastDiscSpeed = SConfig::GetInstance().bFastDiscSpeed; s_bFastDiscSpeed = SConfig::GetInstance().bFastDiscSpeed;
s_videoBackend = g_video_backend->GetName(); s_videoBackend = g_video_backend->GetName();

4
Source/Core/Core/Movie.h
View File

@ -101,7 +101,8 @@ struct DTMHeader
u8 bongos; u8 bongos;
bool bSyncGPU; bool bSyncGPU;
bool bNetPlay; bool bNetPlay;
u8 reserved[13]; // Padding for any new config options bool bPAL60;
u8 reserved[12]; // Padding for any new config options
u8 discChange[40]; // Name of iso file to switch to, for two disc games. u8 discChange[40]; // Name of iso file to switch to, for two disc games.
u8 revision[20]; // Git hash u8 revision[20]; // Git hash
u32 DSPiromHash; u32 DSPiromHash;
@ -131,6 +132,7 @@ u64 GetRecordingStartTime();
bool IsConfigSaved(); bool IsConfigSaved();
bool IsDualCore(); bool IsDualCore();
bool IsProgressive(); bool IsProgressive();
bool IsPAL60();
bool IsSkipIdle(); bool IsSkipIdle();
bool IsDSPHLE(); bool IsDSPHLE();
bool IsFastDiscSpeed(); bool IsFastDiscSpeed();