mirror of
https://github.com/AxioDL/boo.git
synced 2025-07-08 22:25:52 +00:00
General: Convert typedefs into using aliases
This commit is contained in:
parent
78ce16aa9f
commit
88355ada5f
@ -9,7 +9,7 @@
|
|||||||
#include <vector>
|
#include <vector>
|
||||||
#include <unordered_set>
|
#include <unordered_set>
|
||||||
|
|
||||||
typedef HRESULT(WINAPI* pD3DCreateBlob)(SIZE_T Size, ID3DBlob** ppBlob);
|
using pD3DCreateBlob = HRESULT(WINAPI*)(SIZE_T Size, ID3DBlob** ppBlob);
|
||||||
extern pD3DCreateBlob D3DCreateBlobPROC;
|
extern pD3DCreateBlob D3DCreateBlobPROC;
|
||||||
|
|
||||||
namespace boo {
|
namespace boo {
|
||||||
|
@ -16,8 +16,9 @@ class DeviceBase;
|
|||||||
#define dev_typeid(type) std::hash<std::string>()(#type)
|
#define dev_typeid(type) std::hash<std::string>()(#type)
|
||||||
|
|
||||||
struct DeviceSignature {
|
struct DeviceSignature {
|
||||||
typedef std::vector<const DeviceSignature*> TDeviceSignatureSet;
|
using TDeviceSignatureSet = std::vector<const DeviceSignature*>;
|
||||||
typedef std::function<std::shared_ptr<DeviceBase>(DeviceToken*)> TFactoryLambda;
|
using TFactoryLambda = std::function<std::shared_ptr<DeviceBase>(DeviceToken*)>;
|
||||||
|
|
||||||
const char* m_name = nullptr;
|
const char* m_name = nullptr;
|
||||||
uint64_t m_typeHash = 0;
|
uint64_t m_typeHash = 0;
|
||||||
unsigned m_vid = 0;
|
unsigned m_vid = 0;
|
||||||
|
@ -5,11 +5,11 @@
|
|||||||
#include "DeviceToken.hpp"
|
#include "DeviceToken.hpp"
|
||||||
|
|
||||||
namespace boo {
|
namespace boo {
|
||||||
|
|
||||||
typedef std::unordered_map<std::string, std::unique_ptr<DeviceToken>> TDeviceTokens;
|
|
||||||
typedef std::pair<TDeviceTokens::iterator, bool> TInsertedDeviceToken;
|
|
||||||
class DeviceFinder;
|
class DeviceFinder;
|
||||||
|
|
||||||
|
using TDeviceTokens = std::unordered_map<std::string, std::unique_ptr<DeviceToken>>;
|
||||||
|
using TInsertedDeviceToken = std::pair<TDeviceTokens::iterator, bool>;
|
||||||
|
|
||||||
class IHIDListener {
|
class IHIDListener {
|
||||||
public:
|
public:
|
||||||
virtual ~IHIDListener() = default;
|
virtual ~IHIDListener() = default;
|
||||||
|
@ -6,13 +6,13 @@
|
|||||||
|
|
||||||
namespace boo {
|
namespace boo {
|
||||||
|
|
||||||
typedef union {
|
union TVectorUnion {
|
||||||
float v[4];
|
float v[4];
|
||||||
#if __SSE__
|
#if __SSE__
|
||||||
__m128 q;
|
__m128 q;
|
||||||
__m64 d[2];
|
__m64 d[2];
|
||||||
#endif
|
#endif
|
||||||
} TVectorUnion;
|
};
|
||||||
|
|
||||||
static constexpr TVectorUnion Min32Vec = {{INT32_MIN, INT32_MIN, INT32_MIN, INT32_MIN}};
|
static constexpr TVectorUnion Min32Vec = {{INT32_MIN, INT32_MIN, INT32_MIN, INT32_MIN}};
|
||||||
static constexpr TVectorUnion Max32Vec = {{INT32_MAX, INT32_MAX, INT32_MAX, INT32_MAX}};
|
static constexpr TVectorUnion Max32Vec = {{INT32_MAX, INT32_MAX, INT32_MAX, INT32_MAX}};
|
||||||
|
@ -12,12 +12,12 @@
|
|||||||
|
|
||||||
#ifdef TE_VIRTUAL_MIDI
|
#ifdef TE_VIRTUAL_MIDI
|
||||||
#include <teVirtualMIDI.h>
|
#include <teVirtualMIDI.h>
|
||||||
typedef LPVM_MIDI_PORT(CALLBACK* pfnvirtualMIDICreatePortEx2)(LPCWSTR portName, LPVM_MIDI_DATA_CB callback,
|
using pfnvirtualMIDICreatePortEx2 = LPVM_MIDI_PORT(CALLBACK*)(LPCWSTR portName, LPVM_MIDI_DATA_CB callback,
|
||||||
DWORD_PTR dwCallbackInstance, DWORD maxSysexLength,
|
DWORD_PTR dwCallbackInstance, DWORD maxSysexLength,
|
||||||
DWORD flags);
|
DWORD flags);
|
||||||
typedef void(CALLBACK* pfnvirtualMIDIClosePort)(LPVM_MIDI_PORT midiPort);
|
using pfnvirtualMIDIClosePort = void(CALLBACK*)(LPVM_MIDI_PORT midiPort);
|
||||||
typedef BOOL(CALLBACK* pfnvirtualMIDISendData)(LPVM_MIDI_PORT midiPort, LPBYTE midiDataBytes, DWORD length);
|
using pfnvirtualMIDISendData = BOOL(CALLBACK*)(LPVM_MIDI_PORT midiPort, LPBYTE midiDataBytes, DWORD length);
|
||||||
typedef LPCWSTR(CALLBACK* pfnvirtualMIDIGetDriverVersion)(PWORD major, PWORD minor, PWORD release, PWORD build);
|
using pfnvirtualMIDIGetDriverVersion = LPCWSTR(CALLBACK*)(PWORD major, PWORD minor, PWORD release, PWORD build);
|
||||||
static pfnvirtualMIDICreatePortEx2 virtualMIDICreatePortEx2PROC = nullptr;
|
static pfnvirtualMIDICreatePortEx2 virtualMIDICreatePortEx2PROC = nullptr;
|
||||||
static pfnvirtualMIDIClosePort virtualMIDIClosePortPROC = nullptr;
|
static pfnvirtualMIDIClosePort virtualMIDIClosePortPROC = nullptr;
|
||||||
static pfnvirtualMIDISendData virtualMIDISendDataPROC = nullptr;
|
static pfnvirtualMIDISendData virtualMIDISendDataPROC = nullptr;
|
||||||
|
@ -60,7 +60,7 @@ public:
|
|||||||
, m_pname(pname)
|
, m_pname(pname)
|
||||||
, m_args(args)
|
, m_args(args)
|
||||||
, m_singleInstance(singleInstance) {
|
, m_singleInstance(singleInstance) {
|
||||||
typedef HRESULT(WINAPI * CreateDXGIFactory1PROC)(REFIID riid, _COM_Outptr_ void** ppFactory);
|
using CreateDXGIFactory1PROC = HRESULT (WINAPI *)(REFIID riid, _COM_Outptr_ void** ppFactory);
|
||||||
CreateDXGIFactory1PROC MyCreateDXGIFactory1 = CreateDXGIFactory1;
|
CreateDXGIFactory1PROC MyCreateDXGIFactory1 = CreateDXGIFactory1;
|
||||||
|
|
||||||
bool no12 = true;
|
bool no12 = true;
|
||||||
|
@ -110,8 +110,8 @@ public:
|
|||||||
if (!dxgilib)
|
if (!dxgilib)
|
||||||
Log.report(logvisor::Fatal, fmt("unable to load dxgi.dll"));
|
Log.report(logvisor::Fatal, fmt("unable to load dxgi.dll"));
|
||||||
|
|
||||||
typedef HRESULT(WINAPI * CreateDXGIFactory1PROC)(REFIID riid, _COM_Outptr_ void** ppFactory);
|
using CreateDXGIFactory1PROC = HRESULT(WINAPI*)(REFIID riid, _COM_Outptr_ void** ppFactory);
|
||||||
CreateDXGIFactory1PROC MyCreateDXGIFactory1 = (CreateDXGIFactory1PROC)GetProcAddress(dxgilib, "CreateDXGIFactory1");
|
auto MyCreateDXGIFactory1 = (CreateDXGIFactory1PROC)GetProcAddress(dxgilib, "CreateDXGIFactory1");
|
||||||
if (!MyCreateDXGIFactory1)
|
if (!MyCreateDXGIFactory1)
|
||||||
Log.report(logvisor::Fatal, fmt("unable to find CreateDXGIFactory1 in DXGI.dll\n"));
|
Log.report(logvisor::Fatal, fmt("unable to find CreateDXGIFactory1 in DXGI.dll\n"));
|
||||||
|
|
||||||
|
@ -20,7 +20,7 @@ extern std::condition_variable g_nwcv;
|
|||||||
|
|
||||||
#if _WIN32_WINNT_WINBLUE && !WINDOWS_STORE
|
#if _WIN32_WINNT_WINBLUE && !WINDOWS_STORE
|
||||||
#include <ShellScalingApi.h>
|
#include <ShellScalingApi.h>
|
||||||
typedef HRESULT(WINAPI* PFN_GetScaleFactorForMonitor)(_In_ HMONITOR, _Out_ DEVICE_SCALE_FACTOR*);
|
using PFN_GetScaleFactorForMonitor = HRESULT(WINAPI*)(_In_ HMONITOR, _Out_ DEVICE_SCALE_FACTOR*);
|
||||||
extern PFN_GetScaleFactorForMonitor MyGetScaleFactorForMonitor;
|
extern PFN_GetScaleFactorForMonitor MyGetScaleFactorForMonitor;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -25,8 +25,8 @@ class IWindow;
|
|||||||
|
|
||||||
#include <d3d9.h>
|
#include <d3d9.h>
|
||||||
|
|
||||||
typedef int (WINAPI *pD3DPERF_BeginEvent)(D3DCOLOR col, LPCWSTR wszName);
|
using pD3DPERF_BeginEvent = int (WINAPI*)(D3DCOLOR col, LPCWSTR wszName);
|
||||||
typedef int (WINAPI *pD3DPERF_EndEvent)();
|
using pD3DPERF_EndEvent = int (WINAPI*)();
|
||||||
|
|
||||||
struct D3D12Context {
|
struct D3D12Context {
|
||||||
ComPtr<IDXGIFactory2> m_dxFactory;
|
ComPtr<IDXGIFactory2> m_dxFactory;
|
||||||
|
@ -59,7 +59,7 @@
|
|||||||
#undef False
|
#undef False
|
||||||
#undef True
|
#undef True
|
||||||
|
|
||||||
typedef GLXContext (*glXCreateContextAttribsARBProc)(Display*, GLXFBConfig, GLXContext, Bool, const int*);
|
using glXCreateContextAttribsARBProc = GLXContext (*)(Display*, GLXFBConfig, GLXContext, Bool, const int*);
|
||||||
static glXCreateContextAttribsARBProc glXCreateContextAttribsARB = 0;
|
static glXCreateContextAttribsARBProc glXCreateContextAttribsARB = 0;
|
||||||
static bool s_glxError;
|
static bool s_glxError;
|
||||||
static int ctxErrorHandler(Display* dpy, XErrorEvent* ev) {
|
static int ctxErrorHandler(Display* dpy, XErrorEvent* ev) {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user