summaryrefslogtreecommitdiff
path: root/Source/Core/Common/SysConf.cpp
diff options
context:
space:
mode:
authorPierre Bourdon <delroth@gmail.com>2016-03-14 01:42:37 +0100
committerPierre Bourdon <delroth@gmail.com>2016-03-14 01:42:37 +0100
commitf0e25b84777fa1090ff53d0844a982bb44a83435 (patch)
treeb86c390081c5b8c6c745c7b3d12074fc3563610d /Source/Core/Common/SysConf.cpp
parent53815961fdf4b805a26a3872f51455485ea3c733 (diff)
parentb1c8198cecbd3aeeccdd5096049f3a453ba411dd (diff)
Merge pull request #3668 from RisingFog/wii_movie_sysconf
Apply Wii Settings on Movie Recording/Playback
Diffstat (limited to 'Source/Core/Common/SysConf.cpp')
-rw-r--r--Source/Core/Common/SysConf.cpp9
1 files changed, 9 insertions, 0 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;
}
}