diff --git a/Common/Input/KeyCodes.h b/Common/Input/KeyCodes.h
index 354113f869..925998945b 100644
--- a/Common/Input/KeyCodes.h
+++ b/Common/Input/KeyCodes.h
@@ -281,15 +281,6 @@ enum InputAxis {
JOYSTICK_AXIS_DISTANCE = 24,
JOYSTICK_AXIS_TILT = 25,
- // Ouya axises. Just here for reference, they map straight to regular android axises
- // and will be mapped the same way.
- JOYSTICK_OUYA_AXIS_L2 = 17,
- JOYSTICK_OUYA_AXIS_LS_X = 0,
- JOYSTICK_OUYA_AXIS_LS_Y = 1,
- JOYSTICK_OUYA_AXIS_R2 = 18,
- JOYSTICK_OUYA_AXIS_RS_X = 11,
- JOYSTICK_OUYA_AXIS_RS_Y = 14,
-
// Relative mouse axis for PC.
JOYSTICK_AXIS_MOUSE_REL_X = 26,
JOYSTICK_AXIS_MOUSE_REL_Y = 27,
diff --git a/Core/KeyMap.cpp b/Core/KeyMap.cpp
index 12930f5556..b4d96afab7 100644
--- a/Core/KeyMap.cpp
+++ b/Core/KeyMap.cpp
@@ -730,8 +730,6 @@ void RestoreDefault() {
std::string name = System_GetProperty(SYSPROP_NAME);
if (IsNvidiaShield(name)) {
SetDefaultKeyMap(DEFAULT_MAPPING_SHIELD, false);
- } else if (IsOuya(name)) {
- SetDefaultKeyMap(DEFAULT_MAPPING_OUYA, false);
} else if (IsXperiaPlay(name)) {
SetDefaultKeyMap(DEFAULT_MAPPING_XPERIA_PLAY, false);
} else if (IsMOQII7S(name)) {
@@ -812,10 +810,6 @@ void ClearAllMappings() {
g_controllerMapGeneration++;
}
-bool IsOuya(const std::string &name) {
- return name == "OUYA:OUYA Console";
-}
-
bool IsNvidiaShield(const std::string &name) {
return name == "NVIDIA:SHIELD";
}
@@ -839,7 +833,7 @@ bool IsMOQII7S(const std::string &name) {
}
bool HasBuiltinController(const std::string &name) {
- return IsOuya(name) || IsXperiaPlay(name) || IsNvidiaShield(name) || IsMOQII7S(name) || IsRetroid(name);
+ return IsXperiaPlay(name) || IsNvidiaShield(name) || IsMOQII7S(name) || IsRetroid(name);
}
void NotifyPadConnected(InputDeviceID deviceId, const std::string &name) {
diff --git a/Core/KeyMap.h b/Core/KeyMap.h
index 1e0cf93fc5..b2f2da888e 100644
--- a/Core/KeyMap.h
+++ b/Core/KeyMap.h
@@ -213,7 +213,6 @@ namespace KeyMap {
bool IsNvidiaShield(const std::string &name);
bool IsNvidiaShieldTV(const std::string &name);
bool IsXperiaPlay(const std::string &name);
- bool IsOuya(const std::string &name);
bool IsMOQII7S(const std::string &name);
bool IsRetroid(const std::string &name);
bool HasBuiltinController(const std::string &name);
diff --git a/Core/KeyMapDefaults.cpp b/Core/KeyMapDefaults.cpp
index df9ada7ef7..dbe0d5b682 100644
--- a/Core/KeyMapDefaults.cpp
+++ b/Core/KeyMapDefaults.cpp
@@ -301,27 +301,6 @@ static const DefMappingStruct defaultPadMapIOS[] = {
{VIRTKEY_FASTFORWARD , JOYSTICK_AXIS_RTRIGGER, +1},
};
-static const DefMappingStruct defaultOuyaMap[] = {
- {CTRL_CROSS , NKCODE_BUTTON_A},
- {CTRL_CIRCLE , NKCODE_BUTTON_B},
- {CTRL_SQUARE , NKCODE_BUTTON_X},
- {CTRL_TRIANGLE , NKCODE_BUTTON_Y},
- {CTRL_UP , NKCODE_DPAD_UP},
- {CTRL_RIGHT , NKCODE_DPAD_RIGHT},
- {CTRL_DOWN , NKCODE_DPAD_DOWN},
- {CTRL_LEFT , NKCODE_DPAD_LEFT},
- {CTRL_START , NKCODE_BUTTON_R2},
- {CTRL_SELECT , NKCODE_BUTTON_L2},
- {CTRL_LTRIGGER , NKCODE_BUTTON_L1},
- {CTRL_RTRIGGER , NKCODE_BUTTON_R1},
- {VIRTKEY_FASTFORWARD , NKCODE_BUTTON_THUMBL},
- {VIRTKEY_PAUSE , NKCODE_BUTTON_THUMBR},
- {VIRTKEY_AXIS_X_MIN, JOYSTICK_AXIS_X, -1},
- {VIRTKEY_AXIS_X_MAX, JOYSTICK_AXIS_X, +1},
- {VIRTKEY_AXIS_Y_MIN, JOYSTICK_AXIS_Y, +1},
- {VIRTKEY_AXIS_Y_MAX, JOYSTICK_AXIS_Y, -1},
-};
-
static const DefMappingStruct defaultXperiaPlay[] = {
{CTRL_CROSS , NKCODE_BUTTON_CROSS},
{CTRL_CIRCLE , NKCODE_BUTTON_CIRCLE},
@@ -411,9 +390,6 @@ void SetDefaultKeyMap(DefaultMaps dmap, bool replace) {
case DEFAULT_MAPPING_IOS_PAD:
SetDefaultKeyMap(DEVICE_ID_PAD_0, defaultPadMapIOS, ARRAY_SIZE(defaultPadMapIOS), replace);
break;
- case DEFAULT_MAPPING_OUYA:
- SetDefaultKeyMap(DEVICE_ID_PAD_0, defaultOuyaMap, ARRAY_SIZE(defaultOuyaMap), replace);
- break;
case DEFAULT_MAPPING_XPERIA_PLAY:
SetDefaultKeyMap(DEVICE_ID_DEFAULT, defaultXperiaPlay, ARRAY_SIZE(defaultXperiaPlay), replace);
break;
diff --git a/Core/KeyMapDefaults.h b/Core/KeyMapDefaults.h
index 90684b93cc..69c2fb2295 100644
--- a/Core/KeyMapDefaults.h
+++ b/Core/KeyMapDefaults.h
@@ -10,7 +10,6 @@ enum DefaultMaps {
DEFAULT_MAPPING_XINPUT,
DEFAULT_MAPPING_ANDROID_XBOX, // XBox controller or similar on Android
DEFAULT_MAPPING_SHIELD,
- DEFAULT_MAPPING_OUYA,
DEFAULT_MAPPING_XPERIA_PLAY,
DEFAULT_MAPPING_MOQI_I7S,
DEFAULT_MAPPING_RETROID_CONTROLLER,
diff --git a/UI/NativeApp.cpp b/UI/NativeApp.cpp
index 4b6b32e5ee..b52485112d 100644
--- a/UI/NativeApp.cpp
+++ b/UI/NativeApp.cpp
@@ -167,7 +167,6 @@ std::string config_filename;
// Really need to clean this mess of globals up... but instead I add more :P
bool g_TakeScreenshot;
-static bool isOuya;
static bool resized = false;
static bool restarting = false;
@@ -754,7 +753,6 @@ void NativeInit(int argc, const char *argv[], const char *savegame_dir, const ch
StartWebServer(WebServerFlags::DEBUGGER);
std::string sysName = System_GetProperty(SYSPROP_NAME);
- isOuya = KeyMap::IsOuya(sysName);
// We do this here, instead of in NativeInitGraphics, because the display may be reset.
// When it's reset we don't want to forget all our managed things.
diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml
index 34ee89a078..cad9f20aed 100644
--- a/android/AndroidManifest.xml
+++ b/android/AndroidManifest.xml
@@ -59,7 +59,6 @@
-
diff --git a/android/src/org/ppsspp/ppsspp/NativeActivity.java b/android/src/org/ppsspp/ppsspp/NativeActivity.java
index e5394565d3..73685ef372 100644
--- a/android/src/org/ppsspp/ppsspp/NativeActivity.java
+++ b/android/src/org/ppsspp/ppsspp/NativeActivity.java
@@ -636,20 +636,14 @@ public abstract class NativeActivity extends Activity {
// the format here, if we specify that we want destination alpha in the config chooser, which we do.
// http://grokbase.com/t/gg/android-developers/11bj40jm4w/fall-back
- // Needed to avoid banding on Ouya?
- if (Build.MANUFACTURER.equals("OUYA")) {
- mGLSurfaceView.getHolder().setFormat(PixelFormat.RGBX_8888);
- mGLSurfaceView.setEGLConfigChooser(new NativeEGLConfigChooser());
- } else {
- // Tried to mess around with config choosers (NativeEGLConfigChooser) here but fail completely on Xperia Play.
+ // Tried to mess around with config choosers (NativeEGLConfigChooser) here but fail completely on Xperia Play.
- // Then I tried to require 8888/16/8 but that backfired too, does not work on Mali 450 which is
- // used in popular TVs and boxes like Mi Box. So we'll just get what we get, I guess...
+ // Then I tried to require 8888/16/8 but that backfired too, does not work on Mali 450 which is
+ // used in popular TVs and boxes like Mi Box. So we'll just get what we get, I guess...
- // if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.ICE_CREAM_SANDWICH && !Build.MANUFACTURER.equals("Amazon")) {
- // mGLSurfaceView.setEGLConfigChooser(8, 8, 8, 8, 16, 8);
- // }
- }
+ // if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.ICE_CREAM_SANDWICH && !Build.MANUFACTURER.equals("Amazon")) {
+ // mGLSurfaceView.setEGLConfigChooser(8, 8, 8, 8, 16, 8);
+ // }
mGLSurfaceView.setRenderer(nativeRenderer);
setContentView(mGLSurfaceView);