From eba3eabe0a362806ad47cd7acdd024f0e85908e4 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Sun, 6 Oct 2013 19:49:20 +0000
Subject: [PATCH] (PS3) Move PS3 resolution settings code over to
 menu_settings.c

---
 frontend/menu/menu_common.h   |  6 +++++-
 frontend/menu/menu_settings.c | 24 +++++++++++++++++++++++-
 frontend/menu/rmenu.c         | 28 ++--------------------------
 3 files changed, 30 insertions(+), 28 deletions(-)

diff --git a/frontend/menu/menu_common.h b/frontend/menu/menu_common.h
index c77f1b9de5..93c6863df7 100644
--- a/frontend/menu/menu_common.h
+++ b/frontend/menu/menu_common.h
@@ -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
diff --git a/frontend/menu/menu_settings.c b/frontend/menu/menu_settings.c
index b73270fdb4..bb88874376 100644
--- a/frontend/menu/menu_settings.c
+++ b/frontend/menu/menu_settings.c
@@ -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:
diff --git a/frontend/menu/rmenu.c b/frontend/menu/rmenu.c
index 05505c4fee..6e33166dee 100644
--- a/frontend/menu/rmenu.c
+++ b/frontend/menu/rmenu.c
@@ -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)