(PS3) Move PS3 resolution settings code over to menu_settings.c

This commit is contained in:
twinaphex 2013-10-06 19:49:20 +00:00
parent 28630a9feb
commit eba3eabe0a
3 changed files with 30 additions and 28 deletions

View File

@ -64,7 +64,7 @@ typedef enum
// Shader stuff
RGUI_SETTINGS_VIDEO_OPTIONS,
RGUI_SETTINGS_VIDEO_OPTIONS_FIRST,
#ifdef GEKKO
#if defined(GEKKO) || defined(__CELLOS_LV2__)
RGUI_SETTINGS_VIDEO_RESOLUTION,
#endif
RGUI_SETTINGS_VIDEO_FILTER,
@ -370,6 +370,10 @@ int menu_set_settings(unsigned setting, unsigned action);
void menu_key_event(bool down, unsigned keycode, uint32_t character, uint16_t key_modifiers);
#ifdef HAVE_RMENU
void rgui_init_textures(void);
#endif
#ifdef __cplusplus
}
#endif

View File

@ -672,7 +672,7 @@ int menu_set_settings(unsigned setting, unsigned action)
rarch_set_fullscreen(!g_settings.video.fullscreen);
break;
#ifdef GEKKO
#if defined(GEKKO)
case RGUI_SETTINGS_VIDEO_RESOLUTION:
if (action == RGUI_ACTION_LEFT)
{
@ -698,6 +698,28 @@ int menu_set_settings(unsigned setting, unsigned action)
}
}
break;
#elif defined(__CELLOS_LV2__)
case RGUI_SETTINGS_VIDEO_RESOLUTION:
if (action == RGUI_ACTION_LEFT)
settings_set(1ULL << S_RESOLUTION_PREVIOUS);
else if (action == RGUI_ACTION_RIGHT)
settings_set(1ULL << S_RESOLUTION_NEXT);
else if (action == RGUI_ACTION_OK)
{
if (g_extern.console.screen.resolutions.list[g_extern.console.screen.resolutions.current.idx] == CELL_VIDEO_OUT_RESOLUTION_576)
{
if (g_extern.console.screen.pal_enable)
g_extern.lifecycle_mode_state |= (1ULL<< MODE_VIDEO_PAL_ENABLE);
}
else
{
g_extern.lifecycle_mode_state &= ~(1ULL << MODE_VIDEO_PAL_ENABLE);
g_extern.lifecycle_mode_state &= ~(1ULL << MODE_VIDEO_PAL_TEMPORAL_ENABLE);
}
driver.video->restart();
rgui_init_textures();
}
break;
#endif
#ifdef HW_RVL
case RGUI_SETTINGS_VIDEO_SOFT_FILTER:

View File

@ -761,7 +761,7 @@ static bool osk_callback_enter_filename_init(void *data)
#endif
#endif
static void rgui_init_textures(void)
void rgui_init_textures(void)
{
#ifdef HAVE_MENU_PANEL
texture_image_load("D:\\Media\\menuMainRomSelectPanel.png", menu_panel);
@ -781,31 +781,7 @@ static int set_setting_action(uint8_t menu_type, unsigned switchvalue, uint64_t
{
#ifdef __CELLOS_LV2__
case SETTING_CHANGE_RESOLUTION:
switch (action)
{
case RGUI_ACTION_RIGHT:
settings_set(1ULL << S_RESOLUTION_NEXT);
break;
case RGUI_ACTION_LEFT:
settings_set(1ULL << S_RESOLUTION_PREVIOUS);
break;
case RGUI_ACTION_OK:
if (g_extern.console.screen.resolutions.list[g_extern.console.screen.resolutions.current.idx] == CELL_VIDEO_OUT_RESOLUTION_576)
{
if (g_extern.console.screen.pal_enable)
g_extern.lifecycle_mode_state |= (1ULL<< MODE_VIDEO_PAL_ENABLE);
}
else
{
g_extern.lifecycle_mode_state &= ~(1ULL << MODE_VIDEO_PAL_ENABLE);
g_extern.lifecycle_mode_state &= ~(1ULL << MODE_VIDEO_PAL_TEMPORAL_ENABLE);
}
driver.video->restart();
rgui_init_textures();
break;
}
menu_set_settings(RGUI_SETTINGS_VIDEO_RESOLUTION, action);
break;
case SETTING_PAL60_MODE:
switch (action)