From 4f662ff0e2f31717161b9b7a7d84edaf72bfe582 Mon Sep 17 00:00:00 2001
From: Twinaphex <autechre1024@hotmail.com>
Date: Tue, 29 May 2012 02:48:13 +0200
Subject: [PATCH] (PS3) Implement S_RETURN_TO_LAUNCHER

---
 console/console_settings.c |  5 +++++
 console/console_settings.h |  1 +
 ps3/menu.c                 | 17 +++++------------
 3 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/console/console_settings.c b/console/console_settings.c
index dd1c7793d4..e94a6cd3f1 100644
--- a/console/console_settings.c
+++ b/console/console_settings.c
@@ -60,6 +60,11 @@ void rarch_settings_change(unsigned setting)
          g_console.menu_enable = false;
          g_console.mode_switch = MODE_EMULATION;
          break;
+      case S_RETURN_TO_LAUNCHER:
+         g_console.return_to_launcher = true;
+	 g_console.menu_enable = false;
+	 g_console.mode_switch = MODE_EXIT;
+         break;
       case S_RETURN_TO_MENU:
          g_console.menu_enable = false;
          g_console.ingame_menu_item = 0;
diff --git a/console/console_settings.h b/console/console_settings.h
index bf66fddab2..20cd1b6331 100644
--- a/console/console_settings.h
+++ b/console/console_settings.h
@@ -26,6 +26,7 @@ enum
    S_OVERSCAN_INCREMENT,
    S_RETURN_TO_DASHBOARD,
    S_RETURN_TO_GAME,
+   S_RETURN_TO_LAUNCHER,
    S_RETURN_TO_MENU,
    S_ROTATION_DECREMENT,
    S_ROTATION_INCREMENT,
diff --git a/ps3/menu.c b/ps3/menu.c
index a59bb25d65..561b7a475e 100644
--- a/ps3/menu.c
+++ b/ps3/menu.c
@@ -937,9 +937,7 @@ static void select_file(uint32_t menu_id)
 		  {
 		     strlcpy(g_console.launch_app_on_exit, path, sizeof(g_console.launch_app_on_exit));
                      set_libretro_core_as_launch = false;
-		     g_console.return_to_launcher = true;
-		     g_console.menu_enable = false;
-		     g_console.mode_switch = MODE_EXIT;
+                     rarch_settings_change(S_RETURN_TO_LAUNCHER);
 		  }
 		  break;
 	    }
@@ -2173,8 +2171,7 @@ static void ingame_menu(uint32_t menu_id)
 	       {
                   if((g_settings.video.fbo_scale_x > MIN_SCALING_FACTOR))
 		  {
-                     g_settings.video.fbo_scale_x -= 1.0f;
-		     g_settings.video.fbo_scale_y -= 1.0f;
+                     rarch_settings_change(S_SCALE_FACTOR_DECREMENT);
 		     apply_scaling(FBO_REINIT);
 		     set_delay = DELAY_MEDIUM;
 		  }
@@ -2186,8 +2183,7 @@ static void ingame_menu(uint32_t menu_id)
 	       {
                   if((g_settings.video.fbo_scale_x < MAX_SCALING_FACTOR))
 		  {
-                     g_settings.video.fbo_scale_x += 1.0f;
-		     g_settings.video.fbo_scale_y += 1.0f;
+                     rarch_settings_change(S_SCALE_FACTOR_INCREMENT);
 		     apply_scaling(FBO_REINIT);
 		     set_delay = DELAY_MEDIUM;
 		  }
@@ -2195,8 +2191,7 @@ static void ingame_menu(uint32_t menu_id)
 	    }
 	    if(CTRL_START(state))
 	    {
-               g_settings.video.fbo_scale_x = 2.0f;
-	       g_settings.video.fbo_scale_y = 2.0f;
+               rarch_settings_default(S_DEF_SCALE_FACTOR);
 	       apply_scaling(FBO_REINIT);
 	    }
 	    strlcpy(comment, "Press LEFT or RIGHT to change the [Scaling] settings.\nPress START to reset back to default values.", sizeof(comment));
@@ -2410,9 +2405,7 @@ static void ingame_menu(uint32_t menu_id)
                strlcpy(g_console.launch_app_on_exit, MULTIMAN_EXECUTABLE,
                   sizeof(g_console.launch_app_on_exit));
 
-	       g_console.return_to_launcher = true;
-	       g_console.menu_enable = false;
-	       g_console.mode_switch = MODE_EXIT;
+               rarch_settings_change(S_RETURN_TO_DASHBOARD);
 	    }
 	    strlcpy(comment, "Press 'CROSS' to quit the emulator and return to multiMAN.", sizeof(comment));
 	    break;