summaryrefslogtreecommitdiffstats
path: root/src/input_common/helpers/stick_from_buttons.h
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--[-rwxr-xr-x]src/input_common/helpers/stick_from_buttons.h (renamed from src/input_common/analog_from_button.h)8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/input_common/analog_from_button.h b/src/input_common/helpers/stick_from_buttons.h
index bbd583dd9..1d6e24c98 100755..100644
--- a/src/input_common/analog_from_button.h
+++ b/src/input_common/helpers/stick_from_buttons.h
@@ -1,11 +1,11 @@
+
// Copyright 2017 Citra Emulator Project
// Licensed under GPLv2 or any later version
// Refer to the license.txt file included.
#pragma once
-#include <memory>
-#include "core/frontend/input.h"
+#include "common/input.h"
namespace InputCommon {
@@ -13,7 +13,7 @@ namespace InputCommon {
* An analog device factory that takes direction button devices and combines them into a analog
* device.
*/
-class AnalogFromButton final : public Input::Factory<Input::AnalogDevice> {
+class StickFromButton final : public Input::Factory<Input::InputDevice> {
public:
/**
* Creates an analog device from direction button devices
@@ -25,7 +25,7 @@ public:
* - "modifier": a serialized ParamPackage for creating a button device as the modifier
* - "modifier_scale": a float for the multiplier the modifier gives to the position
*/
- std::unique_ptr<Input::AnalogDevice> Create(const Common::ParamPackage& params) override;
+ std::unique_ptr<Input::InputDevice> Create(const Common::ParamPackage& params) override;
};
} // namespace InputCommon