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

Merge pull request #8165 from lioncash/linkage 

{Android/ButtonManager, ResourcePack/Manager}: Make file-scope variables/functions internally linked where applicable
This commit is contained in:
Connor McLaughlin 2019-06-08 20:56:13 +10:00 committed by GitHub
parent ab66e91766 eb15a52fd5
commit b13e00b003
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Source/Android/jni/ButtonManager.cpp
View File

@ -2,6 +2,7 @@
// Licensed under GPLv2+
// Refer to the license.txt file included.
#include <array>
#include <sstream>
#include <string>
#include <unordered_map>
@ -14,9 +15,10 @@
namespace ButtonManager
{
const std::string touchScreenKey = "Touchscreen";
std::unordered_map<std::string, InputDevice*> m_controllers;
std::vector<std::string> configStrings = {
namespace
{
constexpr char touchScreenKey[] = "Touchscreen";
constexpr std::array<const char*, 143> configStrings{{
// GC
"InputA",
"InputB",
@ -168,8 +170,9 @@ std::vector<std::string> configStrings = {
"TurntableCrossRight",
// Rumble
"Rumble",
};
std::vector<ButtonType> configTypes = {
}};
constexpr std::array<ButtonType, 143> configTypes{{
// GC
BUTTON_A,
BUTTON_B,
@ -321,9 +324,11 @@ std::vector<ButtonType> configTypes = {
TURNTABLE_CROSSFADE_RIGHT,
// Rumble
RUMBLE,
};
}};
static void AddBind(const std::string& dev, sBind* bind)
std::unordered_map<std::string, InputDevice*> m_controllers;
void AddBind(const std::string& dev, sBind* bind)
{
auto it = m_controllers.find(dev);
if (it != m_controllers.end())
@ -334,6 +339,7 @@ static void AddBind(const std::string& dev, sBind* bind)
m_controllers[dev] = new InputDevice(dev);
m_controllers[dev]->AddBind(bind);
}
} // Anonymous namespace
void Init(const std::string& gameId)
{

13
Source/Core/UICommon/ResourcePack/Manager.cpp
View File

@ -11,15 +11,13 @@
#include <algorithm>
namespace
{
std::vector<ResourcePack::ResourcePack> packs;
std::string packs_path;
} // namespace
namespace ResourcePack
{
namespace
{
std::vector<ResourcePack> packs;
std::string packs_path;
IniFile GetPackConfig()
{
packs_path = File::GetUserPath(D_RESOURCEPACK_IDX) + "/Packs.ini";
@ -29,6 +27,7 @@ IniFile GetPackConfig()
return file;
}
} // Anonymous namespace
bool Init()
{