summaryrefslogtreecommitdiff
path: root/Source/Core/DolphinWX/MainAndroid.cpp
diff options
context:
space:
mode:
authorLioncash <mathew1800@gmail.com>2014-11-15 00:11:09 -0500
committerLioncash <mathew1800@gmail.com>2014-11-17 13:44:49 -0500
commitb94dbca160d7a7d0308d4e8d4ff7613f9e6238b1 (patch)
tree8f2e562e6b311cac31531df17bbf1a4f346c81ba /Source/Core/DolphinWX/MainAndroid.cpp
parentaa2fc1f66b768420fcb6958948572f0faa89986d (diff)
Host: Kill off GetRenderWindowSize
Diffstat (limited to 'Source/Core/DolphinWX/MainAndroid.cpp')
-rw-r--r--Source/Core/DolphinWX/MainAndroid.cpp15
1 files changed, 1 insertions, 14 deletions
diff --git a/Source/Core/DolphinWX/MainAndroid.cpp b/Source/Core/DolphinWX/MainAndroid.cpp
index 2189fae5db..273b0c4664 100644
--- a/Source/Core/DolphinWX/MainAndroid.cpp
+++ b/Source/Core/DolphinWX/MainAndroid.cpp
@@ -48,7 +48,6 @@
#include "VideoCommon/VideoBackendBase.h"
ANativeWindow* surf;
-int g_width, g_height;
std::string g_filename;
#define DOLPHIN_TAG "Dolphinemu"
@@ -77,14 +76,6 @@ void Host_UpdateMainFrame()
{
}
-void Host_GetRenderWindowSize(int& x, int& y, int& width, int& height)
-{
- x = SConfig::GetInstance().m_LocalCoreStartupParameter.iRenderWindowXPos;
- y = SConfig::GetInstance().m_LocalCoreStartupParameter.iRenderWindowYPos;
- width = g_width;
- height = g_height;
-}
-
void Host_RequestRenderWindowSize(int width, int height) {}
void Host_RequestFullscreen(bool enable_fullscreen) {}
@@ -311,11 +302,6 @@ JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_SetFilename(
{
g_filename = GetJString(env, jFile);
}
-JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_SetDimensions(JNIEnv *env, jobject obj, jint _width, jint _height)
-{
- g_width = (int)_width;
- g_height = (int)_height;
-}
JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_SaveState(JNIEnv *env, jobject obj, jint slot)
{
@@ -348,6 +334,7 @@ JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_CreateUserFo
JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_Run(JNIEnv *env, jobject obj, jobject _surf)
{
surf = ANativeWindow_fromSurface(env, _surf);
+
// Install our callbacks
OSD::AddCallback(OSD::OSD_INIT, ButtonManager::Init);
OSD::AddCallback(OSD::OSD_SHUTDOWN, ButtonManager::Shutdown);