fabi/Xenia-Canary
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Simplifying HID creation.

Browse Source 
Part of #296.
This commit is contained in:
Ben Vanik
2015-06-27 09:42:30 -07:00
parent 883126d497
commit b38bf5c132
8 changed files with 57 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
src/xenia/hid/hid.cc
View File

@@ -7,57 +7,6 @@
******************************************************************************
*/
#include "xenia/hid/hid.h"
#include "xenia/hid/hid-private.h"
#include "xenia/hid/input_driver.h"
using namespace xe;
using namespace xe::hid;
DEFINE_string(hid, "any", "Input system. Use: [any, nop, winkey, xinput]");
#include "xenia/hid/nop/nop_hid.h"
#if XE_PLATFORM_WIN32
#include "xenia/hid/winkey/winkey_hid.h"
#include "xenia/hid/xinput/xinput_hid.h"
#endif // WIN32
std::unique_ptr<InputSystem> xe::hid::Create(Emulator* emulator) {
std::unique_ptr<InputSystem> input_system =
std::make_unique<InputSystem>(emulator);
if (FLAGS_hid.compare("nop") == 0) {
input_system->AddDriver(xe::hid::nop::Create(input_system.get()));
#if XE_PLATFORM_WIN32
} else if (FLAGS_hid.compare("winkey") == 0) {
input_system->AddDriver(xe::hid::winkey::Create(input_system.get()));
} else if (FLAGS_hid.compare("xinput") == 0) {
input_system->AddDriver(xe::hid::xinput::Create(input_system.get()));
#endif // WIN32
} else {
// Create all available.
bool any_created = false;
// NOTE: in any mode we create as many as we can, falling back to nop.
#if XE_PLATFORM_WIN32
auto xinput_driver = xe::hid::xinput::Create(input_system.get());
if (xinput_driver) {
input_system->AddDriver(std::move(xinput_driver));
any_created = true;
}
auto winkey_driver = xe::hid::winkey::Create(input_system.get());
if (winkey_driver) {
input_system->AddDriver(std::move(winkey_driver));
any_created = true;
}
#endif // WIN32
// Fallback to nop if none created.
if (!any_created) {
input_system->AddDriver(xe::hid::nop::Create(input_system.get()));
}
}
return input_system;
}

29
src/xenia/hid/hid.h
View File

@@ -1,29 +0,0 @@
/**
******************************************************************************
* Xenia : Xbox 360 Emulator Research Project *
******************************************************************************
* Copyright 2013 Ben Vanik. All rights reserved. *
* Released under the BSD license - see LICENSE in the root for more details. *
******************************************************************************
*/
#ifndef XENIA_HID_HID_H_
#define XENIA_HID_HID_H_
#include <memory>
#include "xenia/hid/input_system.h"
namespace xe {
class Emulator;
} // namespace xe
namespace xe {
namespace hid {
std::unique_ptr<InputSystem> Create(Emulator* emulator);
} // namespace hid
} // namespace xe
#endif // XENIA_HID_HID_H_

46
src/xenia/hid/input_system.cc
View File

@@ -12,11 +12,57 @@
#include "xenia/emulator.h"
#include "xenia/cpu/processor.h"
#include "xenia/hid/input_driver.h"
#include "xenia/hid/hid-private.h"
#include "xenia/profiling.h"
#include "xenia/hid/nop/nop_hid.h"
#if XE_PLATFORM_WIN32
#include "xenia/hid/winkey/winkey_hid.h"
#include "xenia/hid/xinput/xinput_hid.h"
#endif // WIN32
namespace xe {
namespace hid {
std::unique_ptr<InputSystem> InputSystem::Create(Emulator* emulator) {
auto input_system = std::make_unique<InputSystem>(emulator);
if (FLAGS_hid.compare("nop") == 0) {
input_system->AddDriver(xe::hid::nop::Create(input_system.get()));
#if XE_PLATFORM_WIN32
} else if (FLAGS_hid.compare("winkey") == 0) {
input_system->AddDriver(xe::hid::winkey::Create(input_system.get()));
} else if (FLAGS_hid.compare("xinput") == 0) {
input_system->AddDriver(xe::hid::xinput::Create(input_system.get()));
#endif // WIN32
} else {
// Create all available.
bool any_created = false;
// NOTE: in any mode we create as many as we can, falling back to nop.
#if XE_PLATFORM_WIN32
auto xinput_driver = xe::hid::xinput::Create(input_system.get());
if (xinput_driver) {
input_system->AddDriver(std::move(xinput_driver));
any_created = true;
}
auto winkey_driver = xe::hid::winkey::Create(input_system.get());
if (winkey_driver) {
input_system->AddDriver(std::move(winkey_driver));
any_created = true;
}
#endif // WIN32
// Fallback to nop if none created.
if (!any_created) {
input_system->AddDriver(xe::hid::nop::Create(input_system.get()));
}
}
return input_system;
}
InputSystem::InputSystem(Emulator* emulator)
: emulator_(emulator), memory_(emulator->memory()) {}

9
src/xenia/hid/input_system.h
View File

@@ -13,9 +13,14 @@
#include <memory>
#include <vector>
#include "xenia/emulator.h"
#include "xenia/cpu/processor.h"
#include "xenia/memory.h"
#include "xenia/xbox.h"
namespace xe {
class Emulator;
} // namespace xe
namespace xe {
namespace hid {
@@ -26,6 +31,8 @@ class InputSystem {
InputSystem(Emulator* emulator);
~InputSystem();
static std::unique_ptr<InputSystem> Create(Emulator* emulator);
Emulator* emulator() const { return emulator_; }
Memory* memory() const { return memory_; }
cpu::Processor* processor() const { return processor_; }