summaryrefslogtreecommitdiff
path: root/Source
diff options
context:
space:
mode:
authordegasus <wickmarkus@web.de>2014-02-16 23:22:11 +0100
committerdegasus <wickmarkus@web.de>2014-04-30 12:51:13 +0200
commitf254fdfd965c0d860e2e457de24fb4aa1b00a957 (patch)
tree7a8df246ce07b50372bda0f26512554ff7442e9f /Source
parent30586f4d29537835b4a06b52e3c6f23a9e8c2c29 (diff)
drop Host_GetKeyState
This function isn't used any more and it shouldn't be used at all as it generates a sync request to the x11 server. So it has to wait for a complete round trip time.
Diffstat (limited to 'Source')
-rw-r--r--Source/Core/Core/Host.h1
-rw-r--r--Source/Core/DolphinWX/Main.cpp19
-rw-r--r--Source/Core/DolphinWX/MainAndroid.cpp5
-rw-r--r--Source/Core/DolphinWX/MainNoGUI.cpp5
4 files changed, 0 insertions, 30 deletions
diff --git a/Source/Core/Core/Host.h b/Source/Core/Core/Host.h
index ffb638be5d..0f68338d25 100644
--- a/Source/Core/Core/Host.h
+++ b/Source/Core/Core/Host.h
@@ -25,7 +25,6 @@
bool Host_RendererHasFocus();
void Host_ConnectWiimote(int wm_idx, bool connect);
-bool Host_GetKeyState(int keycode);
void Host_GetRenderWindowSize(int& x, int& y, int& width, int& height);
void Host_Message(int Id);
void Host_NotifyMapLoaded();
diff --git a/Source/Core/DolphinWX/Main.cpp b/Source/Core/DolphinWX/Main.cpp
index 60574d9820..76f001b180 100644
--- a/Source/Core/DolphinWX/Main.cpp
+++ b/Source/Core/DolphinWX/Main.cpp
@@ -620,25 +620,6 @@ void Host_UpdateBreakPointView()
}
}
-bool Host_GetKeyState(int keycode)
-{
-#ifdef _WIN32
- return (0 != GetAsyncKeyState(keycode));
-#elif defined __WXGTK__
- std::unique_lock<std::recursive_mutex> lk(main_frame->keystate_lock, std::try_to_lock);
- if (!lk.owns_lock())
- return false;
-
- bool key_pressed;
- if (!wxIsMainThread()) wxMutexGuiEnter();
- key_pressed = wxGetKeyState(wxKeyCode(keycode));
- if (!wxIsMainThread()) wxMutexGuiLeave();
- return key_pressed;
-#else
- return wxGetKeyState(wxKeyCode(keycode));
-#endif
-}
-
void Host_GetRenderWindowSize(int& x, int& y, int& width, int& height)
{
main_frame->GetRenderWindowSize(x, y, width, height);
diff --git a/Source/Core/DolphinWX/MainAndroid.cpp b/Source/Core/DolphinWX/MainAndroid.cpp
index ab82e7def1..d103589ea5 100644
--- a/Source/Core/DolphinWX/MainAndroid.cpp
+++ b/Source/Core/DolphinWX/MainAndroid.cpp
@@ -85,11 +85,6 @@ void Host_UpdateMainFrame()
void Host_UpdateBreakPointView(){}
-bool Host_GetKeyState(int keycode)
-{
- return false;
-}
-
void Host_GetRenderWindowSize(int& x, int& y, int& width, int& height)
{
x = SConfig::GetInstance().m_LocalCoreStartupParameter.iRenderWindowXPos;
diff --git a/Source/Core/DolphinWX/MainNoGUI.cpp b/Source/Core/DolphinWX/MainNoGUI.cpp
index cfd176e27a..76e7608e15 100644
--- a/Source/Core/DolphinWX/MainNoGUI.cpp
+++ b/Source/Core/DolphinWX/MainNoGUI.cpp
@@ -79,11 +79,6 @@ void Host_UpdateMainFrame()
void Host_UpdateBreakPointView(){}
-bool Host_GetKeyState(int keycode)
-{
- return false;
-}
-
void Host_GetRenderWindowSize(int& x, int& y, int& width, int& height)
{
x = SConfig::GetInstance().m_LocalCoreStartupParameter.iRenderWindowXPos;