lvella/suyu
1
0
Fork 0
forked from suyu/suyu
Code Pull requests Activity

Merge pull request #2260 from lioncash/sdl

Browse source 
input_common/sdl: Correct return values within GetPollers implementations
This commit is contained in:
bunnei 2019-03-21 00:20:49 -04:00 committed by GitHub
commit 839c0f829b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/input_common/sdl/sdl.h
View file

@ -24,17 +24,19 @@ namespace InputCommon::SDL {
class State { class State {
public: public:
/// Unresisters SDL device factories and shut them down. using Pollers = std::vector<std::unique_ptr<Polling::DevicePoller>>;
/// Unregisters SDL device factories and shut them down.
virtual ~State() = default; virtual ~State() = default;
virtual std::vector<std::unique_ptr<InputCommon::Polling::DevicePoller>> GetPollers( virtual Pollers GetPollers(Polling::DeviceType type) = 0;
InputCommon::Polling::DeviceType type) = 0;
}; };
class NullState : public State { class NullState : public State {
public: public:
std::vector<std::unique_ptr<InputCommon::Polling::DevicePoller>> GetPollers( Pollers GetPollers(Polling::DeviceType type) override {
InputCommon::Polling::DeviceType type) override {} return {};
}
}; };
std::unique_ptr<State> Init(); std::unique_ptr<State> Init();

9
src/input_common/sdl/sdl_impl.cpp
View file

@ -650,9 +650,9 @@ private:
}; };
} // namespace Polling } // namespace Polling
std::vector<std::unique_ptr<InputCommon::Polling::DevicePoller>> SDLState::GetPollers( SDLState::Pollers SDLState::GetPollers(InputCommon::Polling::DeviceType type) {
InputCommon::Polling::DeviceType type) { Pollers pollers;
std::vector<std::unique_ptr<InputCommon::Polling::DevicePoller>> pollers;
switch (type) { switch (type) {
case InputCommon::Polling::DeviceType::Analog: case InputCommon::Polling::DeviceType::Analog:
pollers.emplace_back(std::make_unique<Polling::SDLAnalogPoller>(*this)); pollers.emplace_back(std::make_unique<Polling::SDLAnalogPoller>(*this));
@ -660,8 +660,9 @@ std::vector<std::unique_ptr<InputCommon::Polling::DevicePoller>> SDLState::GetPo
case InputCommon::Polling::DeviceType::Button: case InputCommon::Polling::DeviceType::Button:
pollers.emplace_back(std::make_unique<Polling::SDLButtonPoller>(*this)); pollers.emplace_back(std::make_unique<Polling::SDLButtonPoller>(*this));
break; break;
return pollers;
} }
return pollers;
} }
} // namespace SDL } // namespace SDL

5
src/input_common/sdl/sdl_impl.h
View file

@ -25,7 +25,7 @@ public:
/// Initializes and registers SDL device factories /// Initializes and registers SDL device factories
SDLState(); SDLState();
/// Unresisters SDL device factories and shut them down. /// Unregisters SDL device factories and shut them down.
~SDLState() override; ~SDLState() override;
/// Handle SDL_Events for joysticks from SDL_PollEvent /// Handle SDL_Events for joysticks from SDL_PollEvent
@ -35,8 +35,7 @@ public:
std::shared_ptr<SDLJoystick> GetSDLJoystickByGUID(const std::string& guid, int port); std::shared_ptr<SDLJoystick> GetSDLJoystickByGUID(const std::string& guid, int port);
/// Get all DevicePoller that use the SDL backend for a specific device type /// Get all DevicePoller that use the SDL backend for a specific device type
std::vector<std::unique_ptr<InputCommon::Polling::DevicePoller>> GetPollers( Pollers GetPollers(Polling::DeviceType type) override;
InputCommon::Polling::DeviceType type) override;
/// Used by the Pollers during config /// Used by the Pollers during config
std::atomic<bool> polling = false; std::atomic<bool> polling = false;