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

Move SetData logic to within SysConf.cpp

This commit is contained in:
Chris Burgener 2016-02-28 19:42:15 -05:00
parent 4aa6f6c812
commit b1c8198cec
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Source/Core/Common/SysConf.cpp
View File

@ -15,6 +15,8 @@
#include "Common/SysConf.h" #include "Common/SysConf.h"
#include "Common/Logging/Log.h" #include "Common/Logging/Log.h"
#include "Core/Movie.h"
SysConf::SysConf() SysConf::SysConf()
: m_IsValid(false) : m_IsValid(false)
{ {
@ -74,6 +76,13 @@ bool SysConf::LoadFromFile(const std::string& filename)
{ {
m_Filename = filename; m_Filename = filename;
m_IsValid = true; m_IsValid = true;
// Apply Wii settings from normal SYSCONF on Movie recording/playback
if (Movie::IsRecordingInput() || Movie::IsPlayingInput())
{
SetData("IPL.LNG", Movie::GetLanguage());
SetData("IPL.E60", Movie::IsPAL60());
SetData("IPL.PGS", Movie::IsProgressive());
}
return true; return true;
} }
} }

7
Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb.cpp
View File

@ -45,13 +45,6 @@ CWII_IPC_HLE_Device_usb_oh1_57e_305::CWII_IPC_HLE_Device_usb_oh1_57e_305(u32 _De
owned_sysconf.reset(new SysConf()); owned_sysconf.reset(new SysConf());
sysconf = owned_sysconf.get(); sysconf = owned_sysconf.get();
sysconf->LoadFromFile(File::GetUserPath(D_SESSION_WIIROOT_IDX) + DIR_SEP WII_SYSCONF_DIR DIR_SEP WII_SYSCONF); sysconf->LoadFromFile(File::GetUserPath(D_SESSION_WIIROOT_IDX) + DIR_SEP WII_SYSCONF_DIR DIR_SEP WII_SYSCONF);
// Apply Wii settings from normal SYSCONF on Movie recording/playback
if (Movie::IsRecordingInput() || Movie::IsPlayingInput())
{
sysconf->SetData("IPL.LNG", Movie::GetLanguage());
sysconf->SetData("IPL.E60", Movie::IsPAL60());
sysconf->SetData("IPL.PGS", Movie::IsProgressive());
}
} }
else else
{ {