Merge branch 'master' into stable

1 files changed, 32 insertions, 0 deletions

diff --git a/Source/Core/InputCommon/InputConfig.h b/Source/Core/InputCommon/InputConfig.h
new file mode 100644
index 0000000000..d827e25927
--- /dev/null
+++ b/Source/Core/InputCommon/InputConfig.h
@@ -0,0 +1,32 @@
+// Copyright 2010 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <map>
+#include <vector>
+
+#include "Common/FileUtil.h"
+#include "Common/IniFile.h"
+#include "Common/Thread.h"
+
+#include "InputCommon/ControllerEmu.h"
+#include "InputCommon/ControllerInterface/ControllerInterface.h"
+
+class InputConfig
+{
+public:
+	InputConfig(const char* const _ini_name, const char* const _gui_name,
+		const char* const _profile_name)
+		: ini_name(_ini_name), gui_name(_gui_name), profile_name(_profile_name) {}
+
+	bool LoadConfig(bool isGC);
+	void SaveConfig();
+
+	std::vector<ControllerEmu*>  controllers;
+
+	const char* const ini_name;
+	const char* const gui_name;
+	const char* const profile_name;
+};