From 92ca6e124e82f63b61982a5ecfb26ca818f2fe47 Mon Sep 17 00:00:00 2001
From: Michael M <mchtly@gmail.com>
Date: Fri, 10 Nov 2017 09:56:13 -0800
Subject: Add ControllerInterface::Win32 to wrap XInput and DInput

---
 .../ControllerInterface/Win32/Win32.cpp            | 26 ++++++++++++++++++++++
 .../InputCommon/ControllerInterface/Win32/Win32.h  | 15 +++++++++++++
 2 files changed, 41 insertions(+)
 create mode 100644 Source/Core/InputCommon/ControllerInterface/Win32/Win32.cpp
 create mode 100644 Source/Core/InputCommon/ControllerInterface/Win32/Win32.h

(limited to 'Source/Core/InputCommon/ControllerInterface/Win32')

diff --git a/Source/Core/InputCommon/ControllerInterface/Win32/Win32.cpp b/Source/Core/InputCommon/ControllerInterface/Win32/Win32.cpp
new file mode 100644
index 0000000000..2ce583e608
--- /dev/null
+++ b/Source/Core/InputCommon/ControllerInterface/Win32/Win32.cpp
@@ -0,0 +1,26 @@
+// Copyright 2017 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include "InputCommon/ControllerInterface/Win32/Win32.h"
+
+#include "InputCommon/ControllerInterface/DInput/DInput.h"
+#include "InputCommon/ControllerInterface/XInput/XInput.h"
+
+void ciface::Win32::Init()
+{
+  // DInput::Init();
+  XInput::Init();
+}
+
+void ciface::Win32::PopulateDevices(void* hwnd)
+{
+  DInput::PopulateDevices(static_cast<HWND>(hwnd));
+  XInput::PopulateDevices();
+}
+
+void ciface::Win32::DeInit()
+{
+  // DInput::DeInit();
+  XInput::DeInit();
+}
diff --git a/Source/Core/InputCommon/ControllerInterface/Win32/Win32.h b/Source/Core/InputCommon/ControllerInterface/Win32/Win32.h
new file mode 100644
index 0000000000..038a792e54
--- /dev/null
+++ b/Source/Core/InputCommon/ControllerInterface/Win32/Win32.h
@@ -0,0 +1,15 @@
+// Copyright 2017 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+namespace ciface
+{
+namespace Win32
+{
+void Init();
+void PopulateDevices(void* hwnd);
+void DeInit();
+}
+}
-- 
cgit v1.2.3