mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-11 15:40:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleanups

Browse Source
This commit is contained in:
twinaphex 2015-01-29 20:51:07 +01:00
parent d513c01775
commit 28f6922520
4 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gfx/video_driver.c
View File

@ -317,6 +317,7 @@ static void init_video_input(const input_driver_t *tmp)
void uninit_video_input(void) void uninit_video_input(void)
{ {
rarch_main_command(RARCH_CMD_OVERLAY_DEINIT); rarch_main_command(RARCH_CMD_OVERLAY_DEINIT);
rarch_main_command(RARCH_CMD_OSK_OVERLAY_DEINIT);
if ( if (
!driver.input_data_own && !driver.input_data_own &&

2
input/input_overlay.c
View File

@ -595,8 +595,6 @@ input_overlay_t *input_overlay_new(const char *path, bool enable,
{ {
input_overlay_t *ol = (input_overlay_t*)calloc(1, sizeof(*ol)); input_overlay_t *ol = (input_overlay_t*)calloc(1, sizeof(*ol));
RARCH_LOG("path is: %s\n", path);
if (!ol) if (!ol)
goto error; goto error;

7
retroarch.c
View File

@ -2695,10 +2695,15 @@ bool rarch_main_command(unsigned cmd)
break; break;
case RARCH_CMD_OSK_OVERLAY_START: case RARCH_CMD_OSK_OVERLAY_START:
#ifdef HAVE_OVERLAY #ifdef HAVE_OVERLAY
if (!g_settings.osk.enable)
return false;
driver.osk_active = true; driver.osk_active = true;
g_settings.osk.opacity = 100; g_settings.osk.opacity = 100;
input_overlay_set_alpha_mod(driver.osk_overlay, input_overlay_set_alpha_mod(driver.osk_overlay,
g_settings.osk.opacity); g_settings.osk.opacity);
input_overlay_enable(driver.osk_overlay,
true);
#endif #endif
break; break;
case RARCH_CMD_OSK_OVERLAY_DEINIT: case RARCH_CMD_OSK_OVERLAY_DEINIT:
@ -2712,8 +2717,6 @@ bool rarch_main_command(unsigned cmd)
break; break;
case RARCH_CMD_OSK_OVERLAY_INIT: case RARCH_CMD_OSK_OVERLAY_INIT:
#ifdef HAVE_OVERLAY #ifdef HAVE_OVERLAY
if (driver.osk_active)
return false;
rarch_main_command(RARCH_CMD_OSK_OVERLAY_DEINIT); rarch_main_command(RARCH_CMD_OSK_OVERLAY_DEINIT);
driver.osk_overlay = input_overlay_new(g_settings.osk.overlay, g_settings.osk.enable, driver.osk_overlay = input_overlay_new(g_settings.osk.overlay, g_settings.osk.enable,

6
settings.c
View File

@ -1358,8 +1358,6 @@ static bool config_load_file(const char *path, bool set_defaults)
CONFIG_GET_PATH(osk.overlay, "input_osk_overlay"); CONFIG_GET_PATH(osk.overlay, "input_osk_overlay");
CONFIG_GET_BOOL(osk.enable, "input_osk_overlay_enable"); CONFIG_GET_BOOL(osk.enable, "input_osk_overlay_enable");
CONFIG_GET_FLOAT(osk.opacity, "input_osk_overlay_opacity");
CONFIG_GET_FLOAT(osk.scale, "input_osk_overlay_scale");
#endif #endif
CONFIG_GET_BOOL(rewind_enable, "rewind_enable"); CONFIG_GET_BOOL(rewind_enable, "rewind_enable");
@ -1988,10 +1986,6 @@ bool config_save_file(const char *path)
*g_extern.osk_overlay_dir ? g_extern.osk_overlay_dir : "default"); *g_extern.osk_overlay_dir ? g_extern.osk_overlay_dir : "default");
config_set_path(conf, "input_osk_overlay", g_settings.input.overlay); config_set_path(conf, "input_osk_overlay", g_settings.input.overlay);
config_set_bool(conf, "input_osk_overlay_enable", g_settings.osk.enable); config_set_bool(conf, "input_osk_overlay_enable", g_settings.osk.enable);
config_set_float(conf, "input_osk_overlay_opacity",
g_settings.osk.opacity);
config_set_float(conf, "input_osk_overlay_scale",
g_settings.osk.scale);
#endif #endif
config_set_path(conf, "video_font_path", g_settings.video.font_path); config_set_path(conf, "video_font_path", g_settings.video.font_path);