Merge pull request #4600 from lioncash/prototype
input_common/main: Remove unimplemented prototype
This commit is contained in:
commit
57d9ef5a89
|
@ -8,13 +8,19 @@
|
|||
#include <string>
|
||||
#include <unordered_map>
|
||||
#include <vector>
|
||||
#include "input_common/gcadapter/gc_poller.h"
|
||||
#include "input_common/settings.h"
|
||||
|
||||
namespace Common {
|
||||
class ParamPackage;
|
||||
}
|
||||
|
||||
namespace Settings::NativeAnalog {
|
||||
enum Values : int;
|
||||
}
|
||||
|
||||
namespace Settings::NativeButton {
|
||||
enum Values : int;
|
||||
}
|
||||
|
||||
namespace InputCommon {
|
||||
namespace Polling {
|
||||
|
||||
|
@ -40,9 +46,6 @@ public:
|
|||
*/
|
||||
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
|
||||
|
||||
class GCAnalogFactory;
|
||||
|
|
|
@ -17,11 +17,11 @@
|
|||
#include <vector>
|
||||
#include <SDL.h>
|
||||
#include "common/logging/log.h"
|
||||
#include "common/math_util.h"
|
||||
#include "common/param_package.h"
|
||||
#include "common/threadsafe_queue.h"
|
||||
#include "core/frontend/input.h"
|
||||
#include "input_common/sdl/sdl_impl.h"
|
||||
#include "input_common/settings.h"
|
||||
|
||||
namespace InputCommon::SDL {
|
||||
|
||||
|
|
|
@ -10,7 +10,7 @@
|
|||
|
||||
namespace Settings {
|
||||
namespace NativeButton {
|
||||
enum Values {
|
||||
enum Values : int {
|
||||
A,
|
||||
B,
|
||||
X,
|
||||
|
@ -52,7 +52,7 @@ extern const std::array<const char*, NumButtons> mapping;
|
|||
} // namespace NativeButton
|
||||
|
||||
namespace NativeAnalog {
|
||||
enum Values {
|
||||
enum Values : int {
|
||||
LStick,
|
||||
RStick,
|
||||
|
||||
|
|
Loading…
Reference in New Issue