From b1c8198cecbd3aeeccdd5096049f3a453ba411dd Mon Sep 17 00:00:00 2001 From: Chris Burgener Date: Sun, 28 Feb 2016 19:42:15 -0500 Subject: [PATCH] Move SetData logic to within SysConf.cpp --- Source/Core/Common/SysConf.cpp | 9 +++++++++ Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb.cpp | 7 ------- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/Source/Core/Common/SysConf.cpp b/Source/Core/Common/SysConf.cpp index 23a49412c8..a50efeb71b 100644 --- a/Source/Core/Common/SysConf.cpp +++ b/Source/Core/Common/SysConf.cpp @@ -15,6 +15,8 @@ #include "Common/SysConf.h" #include "Common/Logging/Log.h" +#include "Core/Movie.h" + SysConf::SysConf() : m_IsValid(false) { @@ -74,6 +76,13 @@ bool SysConf::LoadFromFile(const std::string& filename) { m_Filename = filename; 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; } } diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb.cpp b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb.cpp index 781ff67858..a30c34d8a0 100644 --- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb.cpp +++ b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb.cpp @@ -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()); sysconf = owned_sysconf.get(); 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 {