Merge pull request #4600 from lioncash/prototype

input_common/main: Remove unimplemented prototype
This commit is contained in:
LC 2020-08-28 20:10:33 -04:00 committed by GitHub
commit 57d9ef5a89
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 8 deletions

View file

@ -8,13 +8,19 @@
#include <string> #include <string>
#include <unordered_map> #include <unordered_map>
#include <vector> #include <vector>
#include "input_common/gcadapter/gc_poller.h"
#include "input_common/settings.h"
namespace Common { namespace Common {
class ParamPackage; class ParamPackage;
} }
namespace Settings::NativeAnalog {
enum Values : int;
}
namespace Settings::NativeButton {
enum Values : int;
}
namespace InputCommon { namespace InputCommon {
namespace Polling { namespace Polling {
@ -40,9 +46,6 @@ public:
*/ */
virtual Common::ParamPackage GetNextInput() = 0; virtual Common::ParamPackage GetNextInput() = 0;
}; };
// Get all DevicePoller from all backends for a specific device type
std::vector<std::unique_ptr<DevicePoller>> GetPollers(DeviceType type);
} // namespace Polling } // namespace Polling
class GCAnalogFactory; class GCAnalogFactory;

View file

@ -17,11 +17,11 @@
#include <vector> #include <vector>
#include <SDL.h> #include <SDL.h>
#include "common/logging/log.h" #include "common/logging/log.h"
#include "common/math_util.h"
#include "common/param_package.h" #include "common/param_package.h"
#include "common/threadsafe_queue.h" #include "common/threadsafe_queue.h"
#include "core/frontend/input.h" #include "core/frontend/input.h"
#include "input_common/sdl/sdl_impl.h" #include "input_common/sdl/sdl_impl.h"
#include "input_common/settings.h"
namespace InputCommon::SDL { namespace InputCommon::SDL {

View file

@ -10,7 +10,7 @@
namespace Settings { namespace Settings {
namespace NativeButton { namespace NativeButton {
enum Values { enum Values : int {
A, A,
B, B,
X, X,
@ -52,7 +52,7 @@ extern const std::array<const char*, NumButtons> mapping;
} // namespace NativeButton } // namespace NativeButton
namespace NativeAnalog { namespace NativeAnalog {
enum Values { enum Values : int {
LStick, LStick,
RStick, RStick,