From c51347c5329b3dd26fbe74765b2f366c14ef3b7b Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sat, 13 Apr 2013 09:09:56 +0200 Subject: [PATCH] Drop MODE_VIDEO_SCREENSHOTS_ENABLE --- frontend/menu/rmenu.c | 20 -------------------- frontend/menu/rmenu.h | 1 - frontend/platform/platform_ps3.c | 18 +++++++----------- general.h | 1 - gfx/context/ps3_ctx.c | 24 ------------------------ gfx/context/xdk_ctx.c | 7 ------- gfx/gfx_context.h | 8 -------- settings.c | 14 -------------- 8 files changed, 7 insertions(+), 86 deletions(-) diff --git a/frontend/menu/rmenu.c b/frontend/menu/rmenu.c index f2f0538051..61cec0a6c8 100644 --- a/frontend/menu/rmenu.c +++ b/frontend/menu/rmenu.c @@ -455,11 +455,6 @@ static void populate_setting_item(void *data, unsigned input) snprintf(current_item->setting_text, sizeof(current_item->setting_text), (g_extern.lifecycle_mode_state & (1ULL << MODE_VIDEO_TRIPLE_BUFFERING_ENABLE)) ? "ON" : "OFF"); snprintf(current_item->comment, sizeof(current_item->comment), (g_extern.lifecycle_mode_state & (1ULL << MODE_VIDEO_TRIPLE_BUFFERING_ENABLE)) ? "INFO - [Triple Buffering] is set to 'ON'." : "INFO - [Triple Buffering] is set to 'OFF'."); break; - case SETTING_ENABLE_SCREENSHOTS: - strlcpy(current_item->text, "Screenshot Option", sizeof(current_item->text)); - snprintf(current_item->setting_text, sizeof(current_item->setting_text), (g_extern.lifecycle_mode_state & (1ULL << MODE_VIDEO_SCREENSHOTS_ENABLE)) ? "ON" : "OFF"); - snprintf(current_item->comment, sizeof(current_item->comment), "INFO - Screenshots feature is set to '%s'.", (g_extern.lifecycle_mode_state & (1ULL << MODE_VIDEO_SCREENSHOTS_ENABLE)) ? "ON" : "OFF"); - break; case SETTING_DEFAULT_VIDEO_ALL: strlcpy(current_item->text, "DEFAULTS", sizeof(current_item->text)); strlcpy(current_item->setting_text, "", sizeof(current_item->setting_text)); @@ -1778,21 +1773,6 @@ static int set_setting_action(uint8_t menu_type, unsigned switchvalue, uint64_t driver.video->restart(); } break; - case SETTING_ENABLE_SCREENSHOTS: - if ((input & (1ULL << RMENU_DEVICE_NAV_LEFT)) || (input & (1ULL << RMENU_DEVICE_NAV_RIGHT)) || (input & (1ULL << RMENU_DEVICE_NAV_B))) - { - if (g_extern.lifecycle_mode_state & (1ULL << MODE_VIDEO_SCREENSHOTS_ENABLE)) - g_extern.lifecycle_mode_state &= ~(1ULL << MODE_VIDEO_SCREENSHOTS_ENABLE); - else - g_extern.lifecycle_mode_state |= (1ULL << MODE_VIDEO_SCREENSHOTS_ENABLE); - device_ptr->ctx_driver->rmenu_screenshot_enable((g_extern.lifecycle_mode_state & (1ULL << MODE_VIDEO_SCREENSHOTS_ENABLE)) ? true : false); - } - if (input & (1ULL << RMENU_DEVICE_NAV_START)) - { - g_extern.lifecycle_mode_state |= (1ULL << MODE_VIDEO_SCREENSHOTS_ENABLE); - device_ptr->ctx_driver->rmenu_screenshot_enable((g_extern.lifecycle_mode_state & (1ULL << MODE_VIDEO_SCREENSHOTS_ENABLE)) ? true : false); - } - break; case SETTING_DEFAULT_VIDEO_ALL: if (input & (1ULL << RMENU_DEVICE_NAV_START)) { diff --git a/frontend/menu/rmenu.h b/frontend/menu/rmenu.h index 9761152b0d..7b7f318acb 100644 --- a/frontend/menu/rmenu.h +++ b/frontend/menu/rmenu.h @@ -100,7 +100,6 @@ enum SETTING_REFRESH_RATE, SETTING_THROTTLE_MODE, SETTING_TRIPLE_BUFFERING, - SETTING_ENABLE_SCREENSHOTS, SETTING_DEFAULT_VIDEO_ALL, SETTING_SOUND_MODE, #ifdef HAVE_RSOUND diff --git a/frontend/platform/platform_ps3.c b/frontend/platform/platform_ps3.c index 2cb275dacb..85d1973ac2 100644 --- a/frontend/platform/platform_ps3.c +++ b/frontend/platform/platform_ps3.c @@ -352,20 +352,17 @@ static void system_init(void) static void system_post_init(void) { #if (CELL_SDK_VERSION > 0x340000) && !defined(__PSL1GHT__) - if (g_extern.lifecycle_mode_state & (1ULL << MODE_VIDEO_SCREENSHOTS_ENABLE)) - { #ifdef HAVE_SYSMODULES - cellSysmoduleLoadModule(CELL_SYSMODULE_SYSUTIL_SCREENSHOT); + cellSysmoduleLoadModule(CELL_SYSMODULE_SYSUTIL_SCREENSHOT); #endif #ifdef HAVE_SYSUTILS - CellScreenShotSetParam screenshot_param = {0, 0, 0, 0}; + CellScreenShotSetParam screenshot_param = {0, 0, 0, 0}; - screenshot_param.photo_title = "RetroArch PS3"; - screenshot_param.game_title = "RetroArch PS3"; - cellScreenShotSetParameter (&screenshot_param); - cellScreenShotEnable(); + screenshot_param.photo_title = "RetroArch PS3"; + screenshot_param.game_title = "RetroArch PS3"; + cellScreenShotSetParameter (&screenshot_param); + cellScreenShotEnable(); #endif - } #ifdef HAVE_SYSUTILS if (g_extern.lifecycle_mode_state & (1ULL << MODE_AUDIO_CUSTOM_BGM_ENABLE)) cellSysutilEnableBgmPlayback(); @@ -410,8 +407,7 @@ static void system_deinit(void) #ifndef __PSL1GHT__ /* screenshot PRX */ - if (g_extern.lifecycle_mode_state & (1ULL << MODE_VIDEO_SCREENSHOTS_ENABLE)) - cellSysmoduleUnloadModule(CELL_SYSMODULE_SYSUTIL_SCREENSHOT); + cellSysmoduleUnloadModule(CELL_SYSMODULE_SYSUTIL_SCREENSHOT); #endif cellSysmoduleUnloadModule(CELL_SYSMODULE_JPGDEC); diff --git a/general.h b/general.h index 79911844f4..ea3b550a68 100644 --- a/general.h +++ b/general.h @@ -124,7 +124,6 @@ enum menu_enums MODE_VIDEO_TRIPLE_BUFFERING_ENABLE, MODE_VIDEO_FLICKER_FILTER_ENABLE, MODE_VIDEO_SOFT_FILTER_ENABLE, - MODE_VIDEO_SCREENSHOTS_ENABLE, MODE_VIDEO_THROTTLE_ENABLE, MODE_VIDEO_PAL_ENABLE, MODE_VIDEO_PAL_TEMPORAL_ENABLE, diff --git a/gfx/context/ps3_ctx.c b/gfx/context/ps3_ctx.c index 6432ca0fff..892c845a43 100644 --- a/gfx/context/ps3_ctx.c +++ b/gfx/context/ps3_ctx.c @@ -85,27 +85,6 @@ static float gfx_ctx_get_aspect_ratio(void) return 16.0f/9.0f; } -static void rmenu_ctx_ps3_screenshot_enable(bool enable) -{ -#if(CELL_SDK_VERSION > 0x340000) - if(enable) - { - cellSysmoduleLoadModule(CELL_SYSMODULE_SYSUTIL_SCREENSHOT); - CellScreenShotSetParam screenshot_param = {0, 0, 0, 0}; - - screenshot_param.photo_title = "RetroArch PS3"; - screenshot_param.game_title = "RetroArch PS3"; - cellScreenShotSetParameter (&screenshot_param); - cellScreenShotEnable(); - } - else - { - cellScreenShotDisable(); - cellSysmoduleUnloadModule(CELL_SYSMODULE_SYSUTIL_SCREENSHOT); - } -#endif -} - static void gfx_ctx_get_available_resolutions (void) { bool defaultresolution; @@ -333,8 +312,5 @@ const gfx_ctx_driver_t gfx_ctx_ps3 = { NULL, NULL, "ps3", -#ifdef HAVE_RMENU - rmenu_ctx_ps3_screenshot_enable, -#endif }; diff --git a/gfx/context/xdk_ctx.c b/gfx/context/xdk_ctx.c index 5649251967..791d99acc2 100644 --- a/gfx/context/xdk_ctx.c +++ b/gfx/context/xdk_ctx.c @@ -80,10 +80,6 @@ static bool gfx_ctx_xdk_window_has_focus(void) return true; } -static void gfx_ctx_xdk_menu_screenshot_enable(bool enable) -{ -} - static void gfx_ctx_xdk_update_window_title(bool reset) { } static void gfx_ctx_xdk_get_video_size(unsigned *width, unsigned *height) @@ -255,7 +251,4 @@ const gfx_ctx_driver_t gfx_ctx_xdk = { NULL, NULL, "xdk", -#if defined(HAVE_RMENU) - gfx_ctx_xdk_menu_screenshot_enable, -#endif }; diff --git a/gfx/gfx_context.h b/gfx/gfx_context.h index 74ca7df7a7..c1f2169379 100644 --- a/gfx/gfx_context.h +++ b/gfx/gfx_context.h @@ -23,10 +23,6 @@ #include "../config.h" #endif -#if defined(HAVE_RMENU) -#include "../frontend/menu/rmenu.h" -#endif - #define MAX_EGLIMAGE_TEXTURES 32 enum gfx_ctx_api @@ -99,10 +95,6 @@ typedef struct gfx_ctx_driver // Human readable string. const char *ident; - -#if defined(HAVE_RMENU) - void (*rmenu_screenshot_enable)(bool enable); -#endif } gfx_ctx_driver_t; extern const gfx_ctx_driver_t gfx_ctx_sdl_gl; diff --git a/settings.c b/settings.c index 001dea349f..50077b3134 100644 --- a/settings.c +++ b/settings.c @@ -254,7 +254,6 @@ void config_set_defaults(void) strlcpy(g_extern.console.main_wrap.default_sram_dir, default_paths.sram_dir, sizeof(g_extern.console.main_wrap.default_sram_dir)); g_extern.console.screen.gamma_correction = DEFAULT_GAMMA; g_extern.lifecycle_mode_state |= (1ULL << MODE_AUDIO_CUSTOM_BGM_ENABLE); - g_extern.lifecycle_mode_state |= (1ULL << MODE_VIDEO_SCREENSHOTS_ENABLE); g_extern.lifecycle_mode_state |= (1ULL << MODE_VIDEO_THROTTLE_ENABLE); g_extern.lifecycle_mode_state |= (1ULL << MODE_VIDEO_TRIPLE_BUFFERING_ENABLE); g_extern.lifecycle_mode_state |= (1ULL << MODE_VIDEO_SOFT_FILTER_ENABLE); @@ -525,14 +524,6 @@ bool config_load_file(const char *path) g_extern.lifecycle_mode_state &= ~(1ULL << MODE_AUDIO_CUSTOM_BGM_ENABLE); } - if (config_get_bool(conf, "screenshots_enable", &screenshots_enable)) - { - if (screenshots_enable) - g_extern.lifecycle_mode_state |= (1ULL << MODE_VIDEO_SCREENSHOTS_ENABLE); - else - g_extern.lifecycle_mode_state &= ~(1ULL << MODE_VIDEO_SCREENSHOTS_ENABLE); - } - if (config_get_bool(conf, "flicker_filter_enable", &flicker_filter_enable)) { if (flicker_filter_enable) @@ -1171,11 +1162,6 @@ bool config_save_file(const char *path) config_set_int(conf, "rmenu_low_ram_mode_enable", 0); #endif - if (g_extern.lifecycle_mode_state & (1ULL << MODE_VIDEO_SCREENSHOTS_ENABLE)) - config_set_bool(conf, "screenshots_enable", true); - else - config_set_bool(conf, "screenshots_enable", false); - config_set_bool(conf, "gamma_correction", g_extern.console.screen.gamma_correction); #ifdef _XBOX1 config_set_int(conf, "sound_volume_level", g_extern.console.sound.volume_level);