OpenPunk/citra
1
0
Fork 0
mirror of https://github.com/citra-emu/citra.git synced 2024-11-25 13:40:14 +00:00
Code Issues Projects Releases Wiki Activity

another travis build fix

Browse Source
This commit is contained in:
Anon 2016-07-30 13:07:28 -05:00
parent f1979ac39d
commit 2239cc9f0c
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/input_core/input_core.cpp
View File

@ -32,17 +32,17 @@ namespace InputCore {
CoreTiming::ScheduleEvent(frame_ticks - cycles_late, tick_event);
}
void InputCore::Init() {
void Init() {
devices = ParseSettings();
tick_event = CoreTiming::RegisterEvent("InputCore::tick_event", InputTickCallback);
CoreTiming::ScheduleEvent(frame_ticks, tick_event);
}
void InputCore::Shutdown() {
void Shutdown() {
devices.clear();
}
vector<shared_ptr<IDevice>> InputCore::ParseSettings() {
vector<shared_ptr<IDevice>> ParseSettings() {
vector<shared_ptr<IDevice>> devices;
vector<Settings::InputDeviceMapping> uniqueMappings; //unique mappings from settings file, used to init devices.
@ -97,7 +97,7 @@ namespace InputCore {
return devices;
}
bool InputCore::CheckIfMappingExists(vector<Settings::InputDeviceMapping> uniqueMapping, Settings::InputDeviceMapping mappingToCheck) {
bool CheckIfMappingExists(vector<Settings::InputDeviceMapping> uniqueMapping, Settings::InputDeviceMapping mappingToCheck) {
for (auto& mapping : uniqueMapping) {
if (mapping == mappingToCheck)
return true;