summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLioncash <mathew1800@gmail.com>2018-08-03 03:41:51 +0200
committerLioncash <mathew1800@gmail.com>2018-08-03 03:44:25 +0200
commit29b6afb82f39a9f21389e2d9ee65ff6cdd909db8 (patch)
tree7ead7d2f209cac64066d5c91aed3721dd595b9e2
parentMerge pull request #896 from lioncash/audio-out (diff)
downloadyuzu-29b6afb82f39a9f21389e2d9ee65ff6cdd909db8.tar
yuzu-29b6afb82f39a9f21389e2d9ee65ff6cdd909db8.tar.gz
yuzu-29b6afb82f39a9f21389e2d9ee65ff6cdd909db8.tar.bz2
yuzu-29b6afb82f39a9f21389e2d9ee65ff6cdd909db8.tar.lz
yuzu-29b6afb82f39a9f21389e2d9ee65ff6cdd909db8.tar.xz
yuzu-29b6afb82f39a9f21389e2d9ee65ff6cdd909db8.tar.zst
yuzu-29b6afb82f39a9f21389e2d9ee65ff6cdd909db8.zip
-rw-r--r--src/input_common/keyboard.cpp2
-rw-r--r--src/input_common/motion_emu.cpp2
-rw-r--r--src/input_common/sdl/sdl.cpp12
3 files changed, 2 insertions, 14 deletions
diff --git a/src/input_common/keyboard.cpp b/src/input_common/keyboard.cpp
index 0f0d10f23..0410ff328 100644
--- a/src/input_common/keyboard.cpp
+++ b/src/input_common/keyboard.cpp
@@ -14,7 +14,7 @@ public:
explicit KeyButton(std::shared_ptr<KeyButtonList> key_button_list_)
: key_button_list(key_button_list_) {}
- ~KeyButton();
+ ~KeyButton() override;
bool GetStatus() const override {
return status.load();
diff --git a/src/input_common/motion_emu.cpp b/src/input_common/motion_emu.cpp
index caffe48cb..9570c060e 100644
--- a/src/input_common/motion_emu.cpp
+++ b/src/input_common/motion_emu.cpp
@@ -131,7 +131,7 @@ public:
device = std::make_shared<MotionEmuDevice>(update_millisecond, sensitivity);
}
- std::tuple<Math::Vec3<float>, Math::Vec3<float>> GetStatus() const {
+ std::tuple<Math::Vec3<float>, Math::Vec3<float>> GetStatus() const override {
return device->GetStatus();
}
diff --git a/src/input_common/sdl/sdl.cpp b/src/input_common/sdl/sdl.cpp
index 8d117c2d4..604d9a7d9 100644
--- a/src/input_common/sdl/sdl.cpp
+++ b/src/input_common/sdl/sdl.cpp
@@ -314,10 +314,6 @@ namespace Polling {
class SDLPoller : public InputCommon::Polling::DevicePoller {
public:
- SDLPoller() = default;
-
- ~SDLPoller() = default;
-
void Start() override {
// SDL joysticks must be opened, otherwise they don't generate events
SDL_JoystickUpdate();
@@ -341,10 +337,6 @@ private:
class SDLButtonPoller final : public SDLPoller {
public:
- SDLButtonPoller() = default;
-
- ~SDLButtonPoller() = default;
-
Common::ParamPackage GetNextInput() override {
SDL_Event event;
while (SDL_PollEvent(&event)) {
@@ -364,10 +356,6 @@ public:
class SDLAnalogPoller final : public SDLPoller {
public:
- SDLAnalogPoller() = default;
-
- ~SDLAnalogPoller() = default;
-
void Start() override {
SDLPoller::Start();