archive/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2024-09-20 11:21:43 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge Core/Config/Config.h into Common/Config/Config.h

Browse source 
Allows code in Common to take advantage of the layered config logic.
This commit is contained in:
Michael Maltese 2017-07-09 16:17:36 -07:00
parent dcb4386008
commit 8b54ac225b
18 changed files with 117 additions and 151 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
Source/Core/Common/Config/Config.cpp
View file

@ -5,6 +5,7 @@
#include <algorithm>
#include <list>
#include <map>
#include <tuple>
#include "Common/Assert.h"
#include "Common/Config/Config.h"
@ -144,4 +145,34 @@ const std::string& GetLayerName(LayerType layer)
};
return layer_to_name.at(layer);
}
bool ConfigLocation::operator==(const ConfigLocation& other) const
{
return std::tie(system, section, key) == std::tie(other.system, other.section, other.key);
}
bool ConfigLocation::operator!=(const ConfigLocation& other) const
{
return !(*this == other);
}
bool ConfigLocation::operator<(const ConfigLocation& other) const
{
return std::tie(system, section, key) < std::tie(other.system, other.section, other.key);
}
LayerType GetActiveLayerForConfig(const ConfigLocation& config)
{
for (auto layer : SEARCH_ORDER)
{
if (!LayerExists(layer))
continue;
if (GetLayer(layer)->Exists(config.system, config.section, config.key))
return layer;
}
// If config is not present in any layer, base layer is considered active.
return LayerType::Base;
}
}

74
Source/Core/Common/Config/Config.h
View file

@ -15,6 +15,24 @@
namespace Config
{
struct ConfigLocation
{
System system;
std::string section;
std::string key;
bool operator==(const ConfigLocation& other) const;
bool operator!=(const ConfigLocation& other) const;
bool operator<(const ConfigLocation& other) const;
};
template <typename T>
struct ConfigInfo
{
ConfigLocation location;
T default_value;
};
using Layers = std::map<LayerType, std::unique_ptr<Layer>>;
using ConfigChangedCallback = std::function<void()>;
@ -45,4 +63,60 @@ void ClearCurrentRunLayer();
const std::string& GetSystemName(System system);
System GetSystemFromName(const std::string& system);
const std::string& GetLayerName(LayerType layer);
LayerType GetActiveLayerForConfig(const ConfigLocation&);
template <typename T>
T Get(LayerType layer, const ConfigInfo<T>& info)
{
return GetLayer(layer)
->GetOrCreateSection(info.location.system, info.location.section)
->template Get<T>(info.location.key, info.default_value);
}
template <typename T>
T Get(const ConfigInfo<T>& info)
{
return Get(LayerType::Meta, info);
}
template <typename T>
T GetBase(const ConfigInfo<T>& info)
{
return Get(LayerType::Base, info);
}
template <typename T>
LayerType GetActiveLayerForConfig(const ConfigInfo<T>& info)
{
return GetActiveLayerForConfig(info.location);
}
template <typename T>
void Set(LayerType layer, const ConfigInfo<T>& info, const T& value)
{
GetLayer(layer)
->GetOrCreateSection(info.location.system, info.location.section)
->Set(info.location.key, value);
}
template <typename T>
void SetBase(const ConfigInfo<T>& info, const T& value)
{
Set<T>(LayerType::Base, info, value);
}
template <typename T>
void SetCurrent(const ConfigInfo<T>& info, const T& value)
{
Set<T>(LayerType::CurrentRun, info, value);
}
template <typename T>
void SetBaseOrCurrent(const ConfigInfo<T>& info, const T& value)
{
if (GetActiveLayerForConfig(info) == LayerType::Base)
Set<T>(LayerType::Base, info, value);
else
Set<T>(LayerType::CurrentRun, info, value);
}
}

2
Source/Core/Core/BootManager.cpp
View file

@ -31,8 +31,8 @@
#include "Common/MsgHandler.h"
#include "Common/StringUtil.h"
#include "Common/Config/Config.h"
#include "Core/Boot/Boot.h"
#include "Core/Config/Config.h"
#include "Core/ConfigLoaders/GameConfigLoader.h"
#include "Core/ConfigLoaders/NetPlayConfigLoader.h"
#include "Core/ConfigManager.h"

1
Source/Core/Core/CMakeLists.txt
View file

@ -25,7 +25,6 @@ set(SRCS
Boot/Boot_WiiWAD.cpp
Boot/DolReader.cpp
Boot/ElfReader.cpp
Config/Config.cpp
Config/GraphicsSettings.cpp
ConfigLoaders/BaseConfigLoader.cpp
ConfigLoaders/GameConfigLoader.cpp

41
Source/Core/Core/Config/Config.cpp
View file

@ -1,41 +0,0 @@
// Copyright 2017 Dolphin Emulator Project
// Licensed under GPLv2+
// Refer to the license.txt file included.
#include "Core/Config/Config.h"
#include <tuple>
namespace Config
{
bool ConfigLocation::operator==(const ConfigLocation& other) const
{
return std::tie(system, section, key) == std::tie(other.system, other.section, other.key);
}
bool ConfigLocation::operator!=(const ConfigLocation& other) const
{
return !(*this == other);
}
bool ConfigLocation::operator<(const ConfigLocation& other) const
{
return std::tie(system, section, key) < std::tie(other.system, other.section, other.key);
}
LayerType GetActiveLayerForConfig(const ConfigLocation& config)
{
for (auto layer : SEARCH_ORDER)
{
if (!LayerExists(layer))
continue;
if (GetLayer(layer)->Exists(config.system, config.section, config.key))
return layer;
}
// If config is not present in any layer, base layer is considered active.
return LayerType::Base;
}
} // namespace Config

90
Source/Core/Core/Config/Config.h
View file

@ -1,90 +0,0 @@
// Copyright 2017 Dolphin Emulator Project
// Licensed under GPLv2+
// Refer to the license.txt file included.
#pragma once
#include <string>
#include "Common/Config/Config.h"
#include "Common/Config/Enums.h"
namespace Config
{
struct ConfigLocation
{
System system;
std::string section;
std::string key;
bool operator==(const ConfigLocation& other) const;
bool operator!=(const ConfigLocation& other) const;
bool operator<(const ConfigLocation& other) const;
};
template <typename T>
struct ConfigInfo
{
ConfigLocation location;
T default_value;
};
template <typename T>
T Get(LayerType layer, const ConfigInfo<T>& info)
{
return GetLayer(layer)
->GetOrCreateSection(info.location.system, info.location.section)
->template Get<T>(info.location.key, info.default_value);
}
template <typename T>
T Get(const ConfigInfo<T>& info)
{
return Get(LayerType::Meta, info);
}
template <typename T>
T GetBase(const ConfigInfo<T>& info)
{
return Get(LayerType::Base, info);
}
LayerType GetActiveLayerForConfig(const ConfigLocation&);
template <typename T>
LayerType GetActiveLayerForConfig(const ConfigInfo<T>& info)
{
return GetActiveLayerForConfig(info.location);
}
template <typename T>
void Set(LayerType layer, const ConfigInfo<T>& info, const T& value)
{
GetLayer(layer)
->GetOrCreateSection(info.location.system, info.location.section)
->Set(info.location.key, value);
InvokeConfigChangedCallbacks();
}
template <typename T>
void SetBase(const ConfigInfo<T>& info, const T& value)
{
Set<T>(LayerType::Base, info, value);
}
template <typename T>
void SetCurrent(const ConfigInfo<T>& info, const T& value)
{
Set<T>(LayerType::CurrentRun, info, value);
}
template <typename T>
void SetBaseOrCurrent(const ConfigInfo<T>& info, const T& value)
{
if (GetActiveLayerForConfig(info) == LayerType::Base)
Set<T>(LayerType::Base, info, value);
else
Set<T>(LayerType::CurrentRun, info, value);
}
} // namespace Config

2
Source/Core/Core/Config/GraphicsSettings.cpp
View file

@ -6,7 +6,7 @@
#include <string>
#include "Core/Config/Config.h"
#include "Common/Config/Config.h"
#include "VideoCommon/VideoConfig.h"
namespace Config

2
Source/Core/Core/Config/GraphicsSettings.h
View file

@ -6,7 +6,7 @@
#include <string>
#include "Core/Config/Config.h"
#include "Common/Config/Config.h"
namespace Config
{

2
Source/Core/Core/ConfigLoaders/BaseConfigLoader.cpp
View file

@ -16,7 +16,7 @@
#include "Common/IniFile.h"
#include "Common/Logging/Log.h"
#include "Core/Config/Config.h"
#include "Common/Config/Config.h"
#include "Core/ConfigLoaders/IsSettingSaveable.h"
namespace ConfigLoaders

2
Source/Core/Core/ConfigLoaders/GameConfigLoader.cpp
View file

@ -22,7 +22,7 @@
#include "Common/MsgHandler.h"
#include "Common/StringUtil.h"
#include "Core/Config/Config.h"
#include "Common/Config/Config.h"
#include "Core/Config/GraphicsSettings.h"
#include "Core/ConfigLoaders/IsSettingSaveable.h"

2
Source/Core/Core/ConfigLoaders/IsSettingSaveable.cpp
View file

@ -7,7 +7,7 @@
#include <algorithm>
#include <vector>
#include "Core/Config/Config.h"
#include "Common/Config/Config.h"
#include "Core/Config/GraphicsSettings.h"
namespace ConfigLoaders

2
Source/Core/Core/Core.vcxproj
View file

@ -45,7 +45,6 @@
<ClCompile Include="Boot\Boot_WiiWAD.cpp" />
<ClCompile Include="Boot\DolReader.cpp" />
<ClCompile Include="Boot\ElfReader.cpp" />
<ClCompile Include="Config\Config.cpp" />
<ClCompile Include="Config\GraphicsSettings.cpp" />
<ClCompile Include="ConfigLoaders\BaseConfigLoader.cpp" />
<ClCompile Include="ConfigLoaders\GameConfigLoader.cpp" />
@ -301,7 +300,6 @@
<ClInclude Include="Boot\DolReader.h" />
<ClInclude Include="Boot\ElfReader.h" />
<ClInclude Include="Boot\ElfTypes.h" />
<ClInclude Include="Config\Config.h" />
<ClInclude Include="Config\GraphicsSettings.h" />
<ClInclude Include="ConfigLoaders\BaseConfigLoader.h" />
<ClInclude Include="ConfigLoaders\GameConfigLoader.h" />

6
Source/Core/Core/Core.vcxproj.filters
View file

@ -871,9 +871,6 @@
<ClCompile Include="ConfigLoaders\IsSettingSaveable.cpp">
<Filter>ConfigLoader</Filter>
</ClCompile>
<ClCompile Include="Config\Config.cpp">
<Filter>Config</Filter>
</ClCompile>
<ClCompile Include="Config\GraphicsSettings.cpp">
<Filter>Config</Filter>
</ClCompile>
@ -1523,9 +1520,6 @@
<ClInclude Include="ConfigLoaders\IsSettingSaveable.h">
<Filter>ConfigLoader</Filter>
</ClInclude>
<ClInclude Include="Config\Config.h">
<Filter>Config</Filter>
</ClInclude>
<ClInclude Include="Config\GraphicsSettings.h">
<Filter>Config</Filter>
</ClInclude>

2
Source/Core/DolphinQt2/Config/Graphics/GraphicsBool.cpp
View file

@ -4,7 +4,7 @@
#include "DolphinQt2/Config/Graphics/GraphicsBool.h"
#include "Core/Config/Config.h"
#include "Common/Config/Config.h"
#include <QFont>

2
Source/Core/DolphinQt2/Config/Graphics/GraphicsChoice.cpp
View file

@ -4,7 +4,7 @@
#include "DolphinQt2/Config/Graphics/GraphicsChoice.h"
#include "Core/Config/Config.h"
#include "Common/Config/Config.h"
GraphicsChoice::GraphicsChoice(const QStringList& options, const Config::ConfigInfo<int>& setting)
: m_setting(setting)

2
Source/Core/DolphinQt2/Config/Graphics/GraphicsSlider.cpp
View file

@ -4,7 +4,7 @@
#include "DolphinQt2/Config/Graphics/GraphicsSlider.h"
#include "Core/Config/Config.h"
#include "Common/Config/Config.h"
GraphicsSlider::GraphicsSlider(int minimum, int maximum, const Config::ConfigInfo<int>& setting,
int tick)

3
Source/UnitTests/Core/CoreTimingTest.cpp
View file

@ -8,8 +8,8 @@
#include <bitset>
#include <string>
#include "Common/Config/Config.h"
#include "Common/FileUtil.h"
#include "Core/Config/Config.h"
#include "Core/ConfigManager.h"
#include "Core/Core.h"
#include "Core/CoreTiming.h"
@ -55,6 +55,7 @@ public:
Core::UndeclareAsCPUThread();
File::DeleteDirRecursively(m_profile_path);
}
private:
std::string m_profile_path;
};

2
Source/UnitTests/Core/MMIOTest.cpp
View file

@ -7,8 +7,8 @@
#include <unordered_set>
#include "Common/CommonTypes.h"
#include "Common/Config/Config.h"
#include "Common/FileUtil.h"
#include "Core/Config/Config.h"
#include "Core/HW/MMIO.h"
#include "UICommon/UICommon.h"