lux/citra
1
0
Fork 0
mirror of https://git.h3cjp.net/H3cJP/citra.git synced 2024-12-26 13:16:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4600 from lioncash/prototype

Browse source 
input_common/main: Remove unimplemented prototype
This commit is contained in:
LC 2020-08-28 20:10:33 -04:00 committed by GitHub
parent 1c9a1de30d 98f5d8a713
commit 57d9ef5a89
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/input_common/main.h
View file

@ -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;

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

@ -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 {

4
src/input_common/settings.h
View file

@ -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,