ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Create rarch_reinit_drivers(). 

Avoid rarch_set_fullscreen() calls which are non-intuitive.
This commit is contained in:
Themaister 2014-06-01 00:42:36 +02:00
parent 41e770eb0c
commit 4449f071ed
3 changed files with 24 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
driver.c
View File

@ -489,7 +489,7 @@ retro_proc_address_t driver_get_proc_address(const char *sym)
bool driver_update_system_av_info(const struct retro_system_av_info *info) bool driver_update_system_av_info(const struct retro_system_av_info *info)
{ {
g_extern.system.av_info = *info; g_extern.system.av_info = *info;
rarch_set_fullscreen(g_settings.video.fullscreen); rarch_reinit_drivers();
// Cannot continue recording with different parameters. // Cannot continue recording with different parameters.
// Take the easiest route out and just restart the recording. // Take the easiest route out and just restart the recording.
#ifdef HAVE_RECORD #ifdef HAVE_RECORD

28
frontend/menu/backend/menu_common_backend.c
View File

@ -2194,7 +2194,7 @@ static int menu_common_iterate(unsigned action)
else if (menu_type == RGUI_SETTINGS_VIDEO_SOFTFILTER) else if (menu_type == RGUI_SETTINGS_VIDEO_SOFTFILTER)
{ {
fill_pathname_join(g_settings.video.filter_path, dir, path, sizeof(g_settings.video.filter_path)); fill_pathname_join(g_settings.video.filter_path, dir, path, sizeof(g_settings.video.filter_path));
rarch_set_fullscreen(g_settings.video.fullscreen); rarch_reinit_drivers();
menu_flush_stack_type(RGUI_SETTINGS_VIDEO_OPTIONS); menu_flush_stack_type(RGUI_SETTINGS_VIDEO_OPTIONS);
} }
else if (menu_type == RGUI_SETTINGS_AUDIO_DSP_FILTER) else if (menu_type == RGUI_SETTINGS_AUDIO_DSP_FILTER)
@ -3375,7 +3375,7 @@ static int menu_common_setting_set(unsigned setting, unsigned action)
menu_clear_navigation(driver.menu); menu_clear_navigation(driver.menu);
#else #else
driver.menu_data_own = true; driver.menu_data_own = true;
rarch_set_fullscreen(g_settings.video.fullscreen); rarch_reinit_drivers();
#endif #endif
driver.menu->need_refresh = true; driver.menu->need_refresh = true;
break; break;
@ -3386,7 +3386,7 @@ static int menu_common_setting_set(unsigned setting, unsigned action)
strlcpy(g_settings.video.filter_path, "", sizeof(g_settings.video.filter_path)); strlcpy(g_settings.video.filter_path, "", sizeof(g_settings.video.filter_path));
#endif #endif
driver.menu_data_own = true; driver.menu_data_own = true;
rarch_set_fullscreen(g_settings.video.fullscreen); rarch_reinit_drivers();
break; break;
} }
break; break;
@ -4024,7 +4024,7 @@ static int menu_common_setting_set(unsigned setting, unsigned action)
if (action == RGUI_ACTION_OK) if (action == RGUI_ACTION_OK)
{ {
g_settings.video.fullscreen = !g_settings.video.fullscreen; g_settings.video.fullscreen = !g_settings.video.fullscreen;
rarch_set_fullscreen(g_settings.video.fullscreen); rarch_reinit_drivers();
} }
break; break;
@ -4090,7 +4090,7 @@ static int menu_common_setting_set(unsigned setting, unsigned action)
g_extern.lifecycle_state &= ~(1ULL << MODE_VIDEO_PAL_TEMPORAL_ENABLE); g_extern.lifecycle_state &= ~(1ULL << MODE_VIDEO_PAL_TEMPORAL_ENABLE);
} }
rarch_set_fullscreen(g_settings.video.fullscreen); rarch_reinit_drivers();
} }
break; break;
case RGUI_SETTINGS_VIDEO_PAL60: case RGUI_SETTINGS_VIDEO_PAL60:
@ -4106,7 +4106,7 @@ static int menu_common_setting_set(unsigned setting, unsigned action)
else else
g_extern.lifecycle_state |= (1ULL << MODE_VIDEO_PAL_TEMPORAL_ENABLE); g_extern.lifecycle_state |= (1ULL << MODE_VIDEO_PAL_TEMPORAL_ENABLE);
rarch_set_fullscreen(g_settings.video.fullscreen); rarch_reinit_drivers();
} }
break; break;
case RGUI_ACTION_START: case RGUI_ACTION_START:
@ -4114,7 +4114,7 @@ static int menu_common_setting_set(unsigned setting, unsigned action)
{ {
g_extern.lifecycle_state &= ~(1ULL << MODE_VIDEO_PAL_TEMPORAL_ENABLE); g_extern.lifecycle_state &= ~(1ULL << MODE_VIDEO_PAL_TEMPORAL_ENABLE);
rarch_set_fullscreen(g_settings.video.fullscreen); rarch_reinit_drivers();
} }
break; break;
} }
@ -4232,7 +4232,7 @@ static int menu_common_setting_set(unsigned setting, unsigned action)
*scale = max(*scale, 1.0f); *scale = max(*scale, 1.0f);
if (old_scale != *scale && !g_settings.video.fullscreen) if (old_scale != *scale && !g_settings.video.fullscreen)
rarch_set_fullscreen(g_settings.video.fullscreen); rarch_reinit_drivers();
break; break;
} }
@ -4249,7 +4249,7 @@ static int menu_common_setting_set(unsigned setting, unsigned action)
g_settings.video.threaded = false; g_settings.video.threaded = false;
if (g_settings.video.threaded != old) if (g_settings.video.threaded != old)
rarch_set_fullscreen(g_settings.video.fullscreen); rarch_reinit_drivers();
break; break;
} }
#endif #endif
@ -4312,20 +4312,20 @@ static int menu_common_setting_set(unsigned setting, unsigned action)
{ {
case RGUI_ACTION_START: case RGUI_ACTION_START:
g_settings.video.monitor_index = 0; g_settings.video.monitor_index = 0;
rarch_set_fullscreen(g_settings.video.fullscreen); rarch_reinit_drivers();
break; break;
case RGUI_ACTION_OK: case RGUI_ACTION_OK:
case RGUI_ACTION_RIGHT: case RGUI_ACTION_RIGHT:
g_settings.video.monitor_index++; g_settings.video.monitor_index++;
rarch_set_fullscreen(g_settings.video.fullscreen); rarch_reinit_drivers();
break; break;
case RGUI_ACTION_LEFT: case RGUI_ACTION_LEFT:
if (g_settings.video.monitor_index) if (g_settings.video.monitor_index)
{ {
g_settings.video.monitor_index--; g_settings.video.monitor_index--;
rarch_set_fullscreen(g_settings.video.fullscreen); rarch_reinit_drivers();
} }
break; break;
@ -4512,12 +4512,12 @@ static int menu_common_setting_set(unsigned setting, unsigned action)
if (action == RGUI_ACTION_OK || action == RGUI_ACTION_LEFT || action == RGUI_ACTION_RIGHT) if (action == RGUI_ACTION_OK || action == RGUI_ACTION_LEFT || action == RGUI_ACTION_RIGHT)
{ {
g_settings.video.disable_composition = !g_settings.video.disable_composition; g_settings.video.disable_composition = !g_settings.video.disable_composition;
rarch_set_fullscreen(g_settings.video.fullscreen); rarch_reinit_drivers();
} }
else if (action == RGUI_ACTION_START) else if (action == RGUI_ACTION_START)
{ {
g_settings.video.disable_composition = false; g_settings.video.disable_composition = false;
rarch_set_fullscreen(g_settings.video.fullscreen); rarch_reinit_drivers();
} }
break; break;
#ifdef HAVE_NETPLAY #ifdef HAVE_NETPLAY

14
general.h
View File

@ -690,6 +690,11 @@ struct rarch_main_wrap
bool no_rom; bool no_rom;
}; };
// Public data structures
extern struct settings g_settings;
extern struct global g_extern;
/////////
// Public functions // Public functions
void config_load(void); void config_load(void);
void config_set_defaults(void); void config_set_defaults(void);
@ -741,6 +746,10 @@ void rarch_load_state(void);
void rarch_save_state(void); void rarch_save_state(void);
void rarch_state_slot_increase(void); void rarch_state_slot_increase(void);
void rarch_state_slot_decrease(void); void rarch_state_slot_decrease(void);
static inline void rarch_reinit_drivers(void)
{
rarch_set_fullscreen(g_settings.video.fullscreen);
}
#ifdef HAVE_RECORD #ifdef HAVE_RECORD
void rarch_init_recording(void); void rarch_init_recording(void);
@ -748,11 +757,6 @@ void rarch_deinit_recording(void);
#endif #endif
///////// /////////
// Public data structures
extern struct settings g_settings;
extern struct global g_extern;
/////////
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif