summaryrefslogtreecommitdiff
path: root/src/input_common/main.cpp
diff options
context:
space:
mode:
authorGravatar Ameer2020-06-21 23:56:56 -0400
committerGravatar Ameer2020-06-21 23:56:56 -0400
commit28046ae3a9cd5e32c7cae1cf64aa005502bf1749 (patch)
treee26cc2a7266fe3709a2417acba6536ee58a77964 /src/input_common/main.cpp
parentfix for sleep using stl (diff)
downloadyuzu-28046ae3a9cd5e32c7cae1cf64aa005502bf1749.tar.gz
yuzu-28046ae3a9cd5e32c7cae1cf64aa005502bf1749.tar.xz
yuzu-28046ae3a9cd5e32c7cae1cf64aa005502bf1749.zip
Tidy up the pointers, use pair over tuple where appropriate
Diffstat (limited to '')
-rw-r--r--src/input_common/main.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/input_common/main.cpp b/src/input_common/main.cpp
index fc399db7e..827a1a30c 100644
--- a/src/input_common/main.cpp
+++ b/src/input_common/main.cpp
@@ -25,12 +25,11 @@ static std::shared_ptr<MotionEmu> motion_emu;
25static std::unique_ptr<SDL::State> sdl; 25static std::unique_ptr<SDL::State> sdl;
26#endif 26#endif
27static std::unique_ptr<CemuhookUDP::State> udp; 27static std::unique_ptr<CemuhookUDP::State> udp;
28static std::shared_ptr<GCAdapter::Adapter> gcadapter;
29static std::shared_ptr<GCButtonFactory> gcbuttons; 28static std::shared_ptr<GCButtonFactory> gcbuttons;
30static std::shared_ptr<GCAnalogFactory> gcanalog; 29static std::shared_ptr<GCAnalogFactory> gcanalog;
31 30
32void Init() { 31void Init() {
33 gcadapter = std::make_shared<GCAdapter::Adapter>(); 32 std::shared_ptr<GCAdapter::Adapter> gcadapter = std::make_shared<GCAdapter::Adapter>();
34 gcbuttons = std::make_shared<GCButtonFactory>(gcadapter); 33 gcbuttons = std::make_shared<GCButtonFactory>(gcadapter);
35 Input::RegisterFactory<Input::ButtonDevice>("gcpad", gcbuttons); 34 Input::RegisterFactory<Input::ButtonDevice>("gcpad", gcbuttons);
36 gcanalog = std::make_shared<GCAnalogFactory>(gcadapter); 35 gcanalog = std::make_shared<GCAnalogFactory>(gcadapter);