mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-28 08:37:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Drop MODE_VIDEO_SCREENSHOTS_ENABLE

Browse Source
This commit is contained in:
twinaphex 2013-04-13 09:09:56 +02:00
parent 33798edb27
commit c51347c532
8 changed files with 7 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
frontend/menu/rmenu.c
View File

@ -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->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'."); 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; 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: case SETTING_DEFAULT_VIDEO_ALL:
strlcpy(current_item->text, "DEFAULTS", sizeof(current_item->text)); strlcpy(current_item->text, "DEFAULTS", sizeof(current_item->text));
strlcpy(current_item->setting_text, "", sizeof(current_item->setting_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(); driver.video->restart();
} }
break; 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: case SETTING_DEFAULT_VIDEO_ALL:
if (input & (1ULL << RMENU_DEVICE_NAV_START)) if (input & (1ULL << RMENU_DEVICE_NAV_START))
{ {

1
frontend/menu/rmenu.h
View File

@ -100,7 +100,6 @@ enum
SETTING_REFRESH_RATE, SETTING_REFRESH_RATE,
SETTING_THROTTLE_MODE, SETTING_THROTTLE_MODE,
SETTING_TRIPLE_BUFFERING, SETTING_TRIPLE_BUFFERING,
SETTING_ENABLE_SCREENSHOTS,
SETTING_DEFAULT_VIDEO_ALL, SETTING_DEFAULT_VIDEO_ALL,
SETTING_SOUND_MODE, SETTING_SOUND_MODE,
#ifdef HAVE_RSOUND #ifdef HAVE_RSOUND

18
frontend/platform/platform_ps3.c
View File

@ -352,20 +352,17 @@ static void system_init(void)
static void system_post_init(void) static void system_post_init(void)
{ {
#if (CELL_SDK_VERSION > 0x340000) && !defined(__PSL1GHT__) #if (CELL_SDK_VERSION > 0x340000) && !defined(__PSL1GHT__)
if (g_extern.lifecycle_mode_state & (1ULL << MODE_VIDEO_SCREENSHOTS_ENABLE))
{
#ifdef HAVE_SYSMODULES #ifdef HAVE_SYSMODULES
cellSysmoduleLoadModule(CELL_SYSMODULE_SYSUTIL_SCREENSHOT); cellSysmoduleLoadModule(CELL_SYSMODULE_SYSUTIL_SCREENSHOT);
#endif #endif
#ifdef HAVE_SYSUTILS #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.photo_title = "RetroArch PS3";
screenshot_param.game_title = "RetroArch PS3"; screenshot_param.game_title = "RetroArch PS3";
cellScreenShotSetParameter (&screenshot_param); cellScreenShotSetParameter (&screenshot_param);
cellScreenShotEnable(); cellScreenShotEnable();
#endif #endif
}
#ifdef HAVE_SYSUTILS #ifdef HAVE_SYSUTILS
if (g_extern.lifecycle_mode_state & (1ULL << MODE_AUDIO_CUSTOM_BGM_ENABLE)) if (g_extern.lifecycle_mode_state & (1ULL << MODE_AUDIO_CUSTOM_BGM_ENABLE))
cellSysutilEnableBgmPlayback(); cellSysutilEnableBgmPlayback();
@ -410,8 +407,7 @@ static void system_deinit(void)
#ifndef __PSL1GHT__ #ifndef __PSL1GHT__
/* screenshot PRX */ /* screenshot PRX */
if (g_extern.lifecycle_mode_state & (1ULL << MODE_VIDEO_SCREENSHOTS_ENABLE)) cellSysmoduleUnloadModule(CELL_SYSMODULE_SYSUTIL_SCREENSHOT);
cellSysmoduleUnloadModule(CELL_SYSMODULE_SYSUTIL_SCREENSHOT);
#endif #endif
cellSysmoduleUnloadModule(CELL_SYSMODULE_JPGDEC); cellSysmoduleUnloadModule(CELL_SYSMODULE_JPGDEC);

1
general.h
View File

@ -124,7 +124,6 @@ enum menu_enums
MODE_VIDEO_TRIPLE_BUFFERING_ENABLE, MODE_VIDEO_TRIPLE_BUFFERING_ENABLE,
MODE_VIDEO_FLICKER_FILTER_ENABLE, MODE_VIDEO_FLICKER_FILTER_ENABLE,
MODE_VIDEO_SOFT_FILTER_ENABLE, MODE_VIDEO_SOFT_FILTER_ENABLE,
MODE_VIDEO_SCREENSHOTS_ENABLE,
MODE_VIDEO_THROTTLE_ENABLE, MODE_VIDEO_THROTTLE_ENABLE,
MODE_VIDEO_PAL_ENABLE, MODE_VIDEO_PAL_ENABLE,
MODE_VIDEO_PAL_TEMPORAL_ENABLE, MODE_VIDEO_PAL_TEMPORAL_ENABLE,

24
gfx/context/ps3_ctx.c
View File

@ -85,27 +85,6 @@ static float gfx_ctx_get_aspect_ratio(void)
return 16.0f/9.0f; 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) static void gfx_ctx_get_available_resolutions (void)
{ {
bool defaultresolution; bool defaultresolution;
@ -333,8 +312,5 @@ const gfx_ctx_driver_t gfx_ctx_ps3 = {
NULL, NULL,
NULL, NULL,
"ps3", "ps3",
#ifdef HAVE_RMENU
rmenu_ctx_ps3_screenshot_enable,
#endif
}; };

7
gfx/context/xdk_ctx.c
View File

@ -80,10 +80,6 @@ static bool gfx_ctx_xdk_window_has_focus(void)
return true; 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_update_window_title(bool reset) { }
static void gfx_ctx_xdk_get_video_size(unsigned *width, unsigned *height) 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,
NULL, NULL,
"xdk", "xdk",
#if defined(HAVE_RMENU)
gfx_ctx_xdk_menu_screenshot_enable,
#endif
}; };

8
gfx/gfx_context.h
View File

@ -23,10 +23,6 @@
#include "../config.h" #include "../config.h"
#endif #endif
#if defined(HAVE_RMENU)
#include "../frontend/menu/rmenu.h"
#endif
#define MAX_EGLIMAGE_TEXTURES 32 #define MAX_EGLIMAGE_TEXTURES 32
enum gfx_ctx_api enum gfx_ctx_api
@ -99,10 +95,6 @@ typedef struct gfx_ctx_driver
// Human readable string. // Human readable string.
const char *ident; const char *ident;
#if defined(HAVE_RMENU)
void (*rmenu_screenshot_enable)(bool enable);
#endif
} gfx_ctx_driver_t; } gfx_ctx_driver_t;
extern const gfx_ctx_driver_t gfx_ctx_sdl_gl; extern const gfx_ctx_driver_t gfx_ctx_sdl_gl;

14
settings.c
View File

@ -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)); 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.console.screen.gamma_correction = DEFAULT_GAMMA;
g_extern.lifecycle_mode_state |= (1ULL << MODE_AUDIO_CUSTOM_BGM_ENABLE); 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_THROTTLE_ENABLE);
g_extern.lifecycle_mode_state |= (1ULL << MODE_VIDEO_TRIPLE_BUFFERING_ENABLE); g_extern.lifecycle_mode_state |= (1ULL << MODE_VIDEO_TRIPLE_BUFFERING_ENABLE);
g_extern.lifecycle_mode_state |= (1ULL << MODE_VIDEO_SOFT_FILTER_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); 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 (config_get_bool(conf, "flicker_filter_enable", &flicker_filter_enable))
{ {
if (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); config_set_int(conf, "rmenu_low_ram_mode_enable", 0);
#endif #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); config_set_bool(conf, "gamma_correction", g_extern.console.screen.gamma_correction);
#ifdef _XBOX1 #ifdef _XBOX1
config_set_int(conf, "sound_volume_level", g_extern.console.sound.volume_level); config_set_int(conf, "sound_volume_level", g_extern.console.sound.volume_level);