summaryrefslogtreecommitdiff
path: root/Source/Core/DolphinWX/Main.cpp
diff options
context:
space:
mode:
authorLeo Lam <leolino.lam@gmail.com>2017-07-27 15:02:28 +0800
committerGitHub <noreply@github.com>2017-07-27 15:02:28 +0800
commit7a51b0bcec891b95b3ea98b03e239ec7937ceb13 (patch)
treee9029ad02ce917203b9b637891b23f6a5e246075 /Source/Core/DolphinWX/Main.cpp
parent5c29ea54c5413384c4e24bff41d7386f22e7be7e (diff)
parent1c33dfc787419d156a5d097fba878f6d09f3c75f (diff)
Merge pull request #5807 from leoetlino/connect-wiimote
Move the Wiimote connect code out of Host
Diffstat (limited to 'Source/Core/DolphinWX/Main.cpp')
-rw-r--r--Source/Core/DolphinWX/Main.cpp20
1 files changed, 0 insertions, 20 deletions
diff --git a/Source/Core/DolphinWX/Main.cpp b/Source/Core/DolphinWX/Main.cpp
index 869bdfc74e..2ef465531a 100644
--- a/Source/Core/DolphinWX/Main.cpp
+++ b/Source/Core/DolphinWX/Main.cpp
@@ -5,7 +5,6 @@
#include <OptionParser.h>
#include <cstdio>
#include <cstring>
-#include <mutex>
#include <string>
#include <utility>
#include <wx/app.h>
@@ -70,8 +69,6 @@ std::string wxStringTranslator(const char*);
CFrame* main_frame = nullptr;
-static std::mutex s_init_mutex;
-
bool DolphinApp::Initialize(int& c, wxChar** v)
{
#if defined HAVE_X11 && HAVE_X11
@@ -122,8 +119,6 @@ bool DolphinApp::OnInit()
ParseCommandLine();
- std::lock_guard<std::mutex> lk(s_init_mutex);
-
UICommon::SetUserDirectory(m_user_path.ToStdString());
UICommon::CreateDirectories();
InitLanguageSupport(); // The language setting is loaded from the user directory
@@ -473,21 +468,6 @@ bool Host_RendererIsFullscreen()
return main_frame->RendererIsFullscreen();
}
-void Host_ConnectWiimote(int wm_idx, bool connect)
-{
- std::lock_guard<std::mutex> lk(s_init_mutex);
- if (connect)
- {
- wxCommandEvent event(wxEVT_HOST_COMMAND, IDM_FORCE_CONNECT_WIIMOTE1 + wm_idx);
- main_frame->GetEventHandler()->AddPendingEvent(event);
- }
- else
- {
- wxCommandEvent event(wxEVT_HOST_COMMAND, IDM_FORCE_DISCONNECT_WIIMOTE1 + wm_idx);
- main_frame->GetEventHandler()->AddPendingEvent(event);
- }
-}
-
void Host_ShowVideoConfig(void* parent, const std::string& backend_name)
{
wxWindow* const parent_window = static_cast<wxWindow*>(parent);