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

Cleaning up apu/ and renaming -private files to _flags.

Browse Source 
Part of #296.
This commit is contained in:
Ben Vanik
2015-06-27 11:25:45 -07:00
parent 0d2d07e8e6
commit 8c69a4df09
64 changed files with 249 additions and 541 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/xenia/hid/hid.cc → src/xenia/hid/hid_flags.cc
View File

@@ -7,6 +7,6 @@
******************************************************************************
*/
#include "xenia/hid/hid-private.h"
#include "xenia/hid/hid_flags.h"
DEFINE_string(hid, "any", "Input system. Use: [any, nop, winkey, xinput]");

6
src/xenia/hid/hid-private.h → src/xenia/hid/hid_flags.h
View File

@@ -7,11 +7,11 @@
******************************************************************************
*/
#ifndef XENIA_HID_HID_PRIVATE_H_
#define XENIA_HID_HID_PRIVATE_H_
#ifndef XENIA_HID_HID_FLAGS_H_
#define XENIA_HID_HID_FLAGS_H_
#include <gflags/gflags.h>
DECLARE_string(hid);
#endif // XENIA_HID_HID_PRIVATE_H_
#endif // XENIA_HID_HID_FLAGS_H_

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

@@ -11,8 +11,8 @@
#include "xenia/emulator.h"
#include "xenia/cpu/processor.h"
#include "xenia/hid/hid_flags.h"
#include "xenia/hid/input_driver.h"
#include "xenia/hid/hid-private.h"
#include "xenia/profiling.h"
#include "xenia/hid/nop/nop_hid.h"

25
src/xenia/hid/nop/nop_hid-private.h
View File

@@ -1,25 +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_NOP_NOP_HID_PRIVATE_H_
#define XENIA_HID_NOP_NOP_HID_PRIVATE_H_
#include "xenia/hid/nop/nop_hid.h"
namespace xe {
namespace hid {
namespace nop {
//
} // namespace nop
} // namespace hid
} // namespace xe
#endif // XENIA_HID_NOP_NOP_HID_PRIVATE_H_

18
src/xenia/hid/nop/nop_hid.cc
View File

@@ -15,25 +15,7 @@ namespace xe {
namespace hid {
namespace nop {
void InitializeIfNeeded();
void CleanupOnShutdown();
void InitializeIfNeeded() {
static bool has_initialized = false;
if (has_initialized) {
return;
}
has_initialized = true;
//
atexit(CleanupOnShutdown);
}
void CleanupOnShutdown() {}
std::unique_ptr<InputDriver> Create(InputSystem* input_system) {
InitializeIfNeeded();
return std::make_unique<NopInputDriver>(input_system);
}

2
src/xenia/hid/nop/nop_input_driver.cc
View File

@@ -9,7 +9,7 @@
#include "xenia/hid/nop/nop_input_driver.h"
#include "xenia/hid/hid-private.h"
#include "xenia/hid/hid_flags.h"
namespace xe {
namespace hid {

1
src/xenia/hid/nop/nop_input_driver.h
View File

@@ -11,7 +11,6 @@
#define XENIA_HID_NOP_NOP_INPUT_DRIVER_H_
#include "xenia/hid/input_driver.h"
#include "xenia/hid/nop/nop_hid-private.h"
namespace xe {
namespace hid {

25
src/xenia/hid/winkey/winkey_hid-private.h
View File

@@ -1,25 +0,0 @@
/**
******************************************************************************
* Xenia : Xbox 360 Emulator Research Project *
******************************************************************************
* Copyright 2014 Ben Vanik. All rights reserved. *
* Released under the BSD license - see LICENSE in the root for more details. *
******************************************************************************
*/
#ifndef XENIA_HID_WINKEY_WINKEY_HID_PRIVATE_H_
#define XENIA_HID_WINKEY_WINKEY_HID_PRIVATE_H_
#include "xenia/hid/winkey/winkey_hid.h"
namespace xe {
namespace hid {
namespace winkey {
//
} // namespace winkey
} // namespace hid
} // namespace xe
#endif // XENIA_HID_WINKEY_WINKEY_HID_PRIVATE_H_

18
src/xenia/hid/winkey/winkey_hid.cc
View File

@@ -15,25 +15,7 @@ namespace xe {
namespace hid {
namespace winkey {
void InitializeIfNeeded();
void CleanupOnShutdown();
void InitializeIfNeeded() {
static bool has_initialized = false;
if (has_initialized) {
return;
}
has_initialized = true;
//
atexit(CleanupOnShutdown);
}
void CleanupOnShutdown() {}
std::unique_ptr<InputDriver> Create(InputSystem* input_system) {
InitializeIfNeeded();
return std::make_unique<WinKeyInputDriver>(input_system);
}

2
src/xenia/hid/winkey/winkey_input_driver.cc
View File

@@ -9,7 +9,7 @@
#include "xenia/hid/winkey/winkey_input_driver.h"
#include "xenia/hid/hid-private.h"
#include "xenia/hid/hid_flags.h"
namespace xe {
namespace hid {

1
src/xenia/hid/winkey/winkey_input_driver.h
View File

@@ -11,7 +11,6 @@
#define XENIA_HID_WINKEY_WINKEY_DRIVER_H_
#include "xenia/hid/input_driver.h"
#include "xenia/hid/nop/nop_hid-private.h"
namespace xe {
namespace hid {

25
src/xenia/hid/xinput/xinput_hid-private.h
View File

@@ -1,25 +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_XINPUT_XINPUT_HID_PRIVATE_H_
#define XENIA_HID_XINPUT_XINPUT_HID_PRIVATE_H_
#include "xenia/hid/xinput/xinput_hid.h"
namespace xe {
namespace hid {
namespace xinput {
//
} // namespace xinput
} // namespace hid
} // namespace xe
#endif // XENIA_HID_XINPUT_XINPUT_HID_PRIVATE_H_

18
src/xenia/hid/xinput/xinput_hid.cc
View File

@@ -15,25 +15,7 @@ namespace xe {
namespace hid {
namespace xinput {
void InitializeIfNeeded();
void CleanupOnShutdown();
void InitializeIfNeeded() {
static bool has_initialized = false;
if (has_initialized) {
return;
}
has_initialized = true;
//
atexit(CleanupOnShutdown);
}
void CleanupOnShutdown() {}
std::unique_ptr<InputDriver> Create(InputSystem* input_system) {
InitializeIfNeeded();
return std::make_unique<XInputInputDriver>(input_system);
}

4
src/xenia/hid/xinput/xinput_input_driver.cc
View File

@@ -9,9 +9,9 @@
#include "xenia/hid/xinput/xinput_input_driver.h"
#include "xenia/hid/hid-private.h"
#include <xinput.h>
#include <Xinput.h>
#include "xenia/hid/hid_flags.h"
namespace xe {
namespace hid {

1
src/xenia/hid/xinput/xinput_input_driver.h
View File

@@ -11,7 +11,6 @@
#define XENIA_HID_XINPUT_XINPUT_DRIVER_H_
#include "xenia/hid/input_driver.h"
#include "xenia/hid/nop/nop_hid-private.h"
namespace xe {
namespace hid {