mirrors/dolphin
0
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-08-12 19:19:03 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #5418 from MerryMage/config-again-and-again

Browse source 
VideoConfig: Port to layered configuration system
This commit is contained in:
shuffle2 2017-06-05 21:11:04 -07:00 • committed by GitHub
commit c8166951a0
32 changed files with 961 additions and 591 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Source/Core/UICommon/UICommon.cpp
View file

@ -7,10 +7,12 @@
#endif
#include "Common/CommonPaths.h"
#include "Common/Config/Config.h"
#include "Common/FileUtil.h"
#include "Common/Logging/LogManager.h"
#include "Common/MsgHandler.h"
#include "Core/ConfigLoaders/BaseConfigLoader.h"
#include "Core/ConfigManager.h"
#include "Core/HW/Wiimote.h"
@ -26,6 +28,8 @@ namespace UICommon
void Init()
{
LogManager::Init();
Config::Init();
Config::AddLoadLayer(ConfigLoaders::GenerateBaseConfigLoader());
SConfig::Init();
VideoBackendBase::PopulateList();
WiimoteReal::LoadSettings();
@ -41,6 +45,7 @@ void Shutdown()
WiimoteReal::Shutdown();
VideoBackendBase::ClearList();
SConfig::Shutdown();
Config::Shutdown();
LogManager::Shutdown();
}