Skip to content
Permalink
Browse files

Merge pull request #8165 from lioncash/linkage

{Android/ButtonManager, ResourcePack/Manager}: Make file-scope variables/functions internally linked where applicable
  • Loading branch information...
stenzek committed Jun 8, 2019
2 parents ab66e91 + eb15a52 commit b13e00b0031efa596c7ddef8a4cd8dc2006ade59
Showing with 17 additions and 12 deletions.
  1. +13 −7 Source/Android/jni/ButtonManager.cpp
  2. +4 −5 Source/Core/UICommon/ResourcePack/Manager.cpp
@@ -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,
};
}};

std::unordered_map<std::string, InputDevice*> m_controllers;

static void AddBind(const std::string& dev, sBind* bind)
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)
{
@@ -11,15 +11,13 @@

#include <algorithm>

namespace ResourcePack
{
namespace
{
std::vector<ResourcePack::ResourcePack> packs;

std::vector<ResourcePack> packs;
std::string packs_path;
} // namespace

namespace ResourcePack
{
IniFile GetPackConfig()
{
packs_path = File::GetUserPath(D_RESOURCEPACK_IDX) + "/Packs.ini";
@@ -29,6 +27,7 @@ IniFile GetPackConfig()

return file;
}
} // Anonymous namespace

bool Init()
{

0 comments on commit b13e00b

Please sign in to comment.
You can’t perform that action at this time.