From 6df0249d3e193f152597374a4cbcec529621c42b Mon Sep 17 00:00:00 2001 From: radius Date: Thu, 17 Mar 2016 20:08:00 -0500 Subject: [PATCH] make xmb default on atv --- configuration.c | 3 +++ defaults.h | 1 + frontend/drivers/platform_linux.c | 12 +++++++++--- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/configuration.c b/configuration.c index 59960b4ff2..124f60413e 100644 --- a/configuration.c +++ b/configuration.c @@ -358,6 +358,9 @@ const char *config_get_default_joypad(void) **/ const char *config_get_default_menu(void) { + if (!string_is_empty(g_defaults.settings.menu)) + return g_defaults.settings.menu; + switch (MENU_DEFAULT_DRIVER) { case MENU_RGUI: diff --git a/defaults.h b/defaults.h index ffb8c2dc32..7425669b98 100644 --- a/defaults.h +++ b/defaults.h @@ -67,6 +67,7 @@ struct defaults int out_latency; float video_refresh_rate; bool video_threaded_enable; + char menu[PATH_MAX_LENGTH]; } settings; #ifndef IS_SALAMANDER diff --git a/frontend/drivers/platform_linux.c b/frontend/drivers/platform_linux.c index 830671c4a2..ff83eedad8 100644 --- a/frontend/drivers/platform_linux.c +++ b/frontend/drivers/platform_linux.c @@ -895,7 +895,10 @@ static bool device_is_game_console(const char *name) device_is_xperia_play(name) || strstr(name, "GAMEMID_BT") || strstr(name, "S7800") || - strstr(name, "SHIELD") + strstr(name, "XD\n") || + strstr(name, "ARCHOS GAMEPAD") || + strstr(name, "SHIELD Android TV") + strstr(name, "SHIELD\n") || ) return true; @@ -1952,13 +1955,16 @@ static void frontend_linux_get_env(int *argc, else if (strstr(device_model, "JSS15J")) g_defaults.settings.video_refresh_rate = 59.65; -#if 0 + /* Explicitly disable input overlay by default * for gamepad-like/console devices. */ if (device_is_game_console(device_model)) + { g_defaults.settings.input_overlay_enable = false; -#endif + snprintf(g_defaults.settings.menu, sizeof(g_defaults.settings.menu), "xmb"); + } + #else char base_path[PATH_MAX]; const char *xdg = getenv("XDG_CONFIG_HOME");