mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-01-27 03:35:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

(RARCH_CONSOLE) Rename rarch_console_settings.c to rmenu_settings.c

Browse Source
This commit is contained in:
twinaphex 2013-01-11 22:27:31 +01:00
parent c7adeb9ed0
commit cba3b80925
12 changed files with 144 additions and 147 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
console/griffin/griffin.c
View File

@ -49,7 +49,9 @@ CONSOLE EXTENSIONS
#include "../rarch_console_input.c" #include "../rarch_console_input.c"
#endif #endif
#include "../rarch_console_settings.c" #ifdef HAVE_RMENU
#include "../../frontend/menu/rmenu_settings.c"
#endif
#endif #endif

4
console/rarch_console_rom_ext.c
View File

@ -27,7 +27,7 @@
#include "../general.h" #include "../general.h"
#include "../file.h" #include "../file.h"
#include "rarch_console_settings.h" #include "../frontend/menu/rmenu_settings.h"
#include "rarch_console.h" #include "rarch_console.h"
#include "rarch_console_rom_ext.h" #include "rarch_console_rom_ext.h"
@ -226,7 +226,7 @@ void rarch_console_load_game_wrap(const char *path, unsigned extract_zip_mode)
rarch_extract_zipfile(path, first_file, sizeof(first_file), extract_zip_mode); rarch_extract_zipfile(path, first_file, sizeof(first_file), extract_zip_mode);
if(g_extern.lifecycle_menu_state & (1 << MODE_INFO_DRAW)) if(g_extern.lifecycle_menu_state & (1 << MODE_INFO_DRAW))
rarch_settings_msg(S_MSG_EXTRACTED_ZIPFILE, S_DELAY_180); rmenu_settings_msg(S_MSG_EXTRACTED_ZIPFILE, S_DELAY_180);
if(g_extern.file_state.zip_extract_mode == ZIP_EXTRACT_TO_CURRENT_DIR_AND_LOAD_FIRST_FILE) if(g_extern.file_state.zip_extract_mode == ZIP_EXTRACT_TO_CURRENT_DIR_AND_LOAD_FIRST_FILE)
{ {

1
console/rarch_console_video.c
View File

@ -16,7 +16,6 @@
#include <stdint.h> #include <stdint.h>
#include "rarch_console_settings.h"
#include "rarch_console_video.h" #include "rarch_console_video.h"
struct aspect_ratio_elem aspectratio_lut[ASPECT_RATIO_END] = { struct aspect_ratio_elem aspectratio_lut[ASPECT_RATIO_END] = {

2
frontend/frontend_console.c
View File

@ -302,7 +302,7 @@ begin_loop:
{ {
RARCH_ERR("rarch_main_init failed.\n"); RARCH_ERR("rarch_main_init failed.\n");
g_extern.lifecycle_menu_state |= (1 << MODE_MENU); g_extern.lifecycle_menu_state |= (1 << MODE_MENU);
rarch_settings_msg(S_MSG_ROM_LOADING_ERROR, S_DELAY_180); rmenu_settings_msg(S_MSG_ROM_LOADING_ERROR, S_DELAY_180);
} }
g_extern.lifecycle_menu_state &= ~(1 << MODE_INIT); g_extern.lifecycle_menu_state &= ~(1 << MODE_INIT);
} }

42
frontend/menu/rgui.c
View File

@ -21,8 +21,8 @@
#include "rgui.h" #include "rgui.h"
#include "utils/file_list.h" #include "utils/file_list.h"
#include "rmenu_settings.h"
#include "../../console/rarch_console_video.h" #include "../../console/rarch_console_video.h"
#include "../../gfx/fonts/bitmap.h"
#include "../../screenshot.h" #include "../../screenshot.h"
#define TERM_START_X 15 #define TERM_START_X 15
@ -448,7 +448,7 @@ static void render_text(rgui_handle_t *rgui)
case RGUI_SETTINGS_VIDEO_ROTATION: case RGUI_SETTINGS_VIDEO_ROTATION:
{ {
char rotate_msg[64]; char rotate_msg[64];
rarch_settings_create_menu_item_label(rotate_msg, S_LBL_ROTATION, sizeof(rotate_msg)); rmenu_settings_create_menu_item_label(rotate_msg, S_LBL_ROTATION, sizeof(rotate_msg));
snprintf(type_str, sizeof(type_str), rotate_msg); snprintf(type_str, sizeof(type_str), rotate_msg);
} }
break; break;
@ -585,11 +585,11 @@ static int rgui_settings_toggle_setting(rgui_file_type_t setting, rgui_action_t
return -1; return -1;
} }
else if (action == RGUI_ACTION_START) else if (action == RGUI_ACTION_START)
rarch_settings_default(S_DEF_SAVE_STATE); rmenu_settings_set_default(S_DEF_SAVE_STATE);
else if (action == RGUI_ACTION_LEFT) else if (action == RGUI_ACTION_LEFT)
rarch_settings_change(S_SAVESTATE_DECREMENT); rmenu_settings_set(S_SAVESTATE_DECREMENT);
else if (action == RGUI_ACTION_RIGHT) else if (action == RGUI_ACTION_RIGHT)
rarch_settings_change(S_SAVESTATE_INCREMENT); rmenu_settings_set(S_SAVESTATE_INCREMENT);
break; break;
case RGUI_SETTINGS_SCREENSHOT: case RGUI_SETTINGS_SCREENSHOT:
if (action == RGUI_ACTION_OK) if (action == RGUI_ACTION_OK)
@ -618,9 +618,9 @@ static int rgui_settings_toggle_setting(rgui_file_type_t setting, rgui_action_t
break; break;
case RGUI_SETTINGS_VIDEO_FILTER: case RGUI_SETTINGS_VIDEO_FILTER:
if (action == RGUI_ACTION_START) if (action == RGUI_ACTION_START)
rarch_settings_default(S_DEF_HW_TEXTURE_FILTER); rmenu_settings_set_default(S_DEF_HW_TEXTURE_FILTER);
else else
rarch_settings_change(S_HW_TEXTURE_FILTER); rmenu_settings_set(S_HW_TEXTURE_FILTER);
break; break;
#ifdef HW_RVL #ifdef HW_RVL
case RGUI_SETTINGS_VIDEO_SOFT_FILTER: case RGUI_SETTINGS_VIDEO_SOFT_FILTER:
@ -678,60 +678,60 @@ static int rgui_settings_toggle_setting(rgui_file_type_t setting, rgui_action_t
break; break;
case RGUI_SETTINGS_VIDEO_ASPECT_RATIO: case RGUI_SETTINGS_VIDEO_ASPECT_RATIO:
if (action == RGUI_ACTION_START) if (action == RGUI_ACTION_START)
rarch_settings_default(S_DEF_ASPECT_RATIO); rmenu_settings_set_default(S_DEF_ASPECT_RATIO);
else if (action == RGUI_ACTION_LEFT) else if (action == RGUI_ACTION_LEFT)
rarch_settings_change(S_ASPECT_RATIO_DECREMENT); rmenu_settings_set(S_ASPECT_RATIO_DECREMENT);
else if (action == RGUI_ACTION_RIGHT) else if (action == RGUI_ACTION_RIGHT)
rarch_settings_change(S_ASPECT_RATIO_INCREMENT); rmenu_settings_set(S_ASPECT_RATIO_INCREMENT);
video_set_aspect_ratio_func(g_settings.video.aspect_ratio_idx); video_set_aspect_ratio_func(g_settings.video.aspect_ratio_idx);
break; break;
case RGUI_SETTINGS_VIDEO_ROTATION: case RGUI_SETTINGS_VIDEO_ROTATION:
if (action == RGUI_ACTION_START) if (action == RGUI_ACTION_START)
{ {
rarch_settings_default(S_DEF_AUDIO_CONTROL_RATE); rmenu_settings_set_default(S_DEF_AUDIO_CONTROL_RATE);
video_set_rotation_func(g_extern.console.screen.orientation); video_set_rotation_func(g_extern.console.screen.orientation);
} }
else if (action == RGUI_ACTION_LEFT) else if (action == RGUI_ACTION_LEFT)
{ {
rarch_settings_change(S_ROTATION_DECREMENT); rmenu_settings_set(S_ROTATION_DECREMENT);
video_set_rotation_func(g_extern.console.screen.orientation); video_set_rotation_func(g_extern.console.screen.orientation);
} }
else if (action == RGUI_ACTION_RIGHT) else if (action == RGUI_ACTION_RIGHT)
{ {
rarch_settings_change(S_ROTATION_INCREMENT); rmenu_settings_set(S_ROTATION_INCREMENT);
video_set_rotation_func(g_extern.console.screen.orientation); video_set_rotation_func(g_extern.console.screen.orientation);
} }
break; break;
case RGUI_SETTINGS_VIDEO_OVERSCAN: case RGUI_SETTINGS_VIDEO_OVERSCAN:
if (action == RGUI_ACTION_START) if (action == RGUI_ACTION_START)
{ {
rarch_settings_default(S_DEF_OVERSCAN); rmenu_settings_set_default(S_DEF_OVERSCAN);
driver.video->apply_state_changes(); driver.video->apply_state_changes();
} }
else if (action == RGUI_ACTION_LEFT) else if (action == RGUI_ACTION_LEFT)
{ {
rarch_settings_change(S_OVERSCAN_DECREMENT); rmenu_settings_set(S_OVERSCAN_DECREMENT);
driver.video->apply_state_changes(); driver.video->apply_state_changes();
} }
else if (action == RGUI_ACTION_RIGHT) else if (action == RGUI_ACTION_RIGHT)
{ {
rarch_settings_change(S_OVERSCAN_INCREMENT); rmenu_settings_set(S_OVERSCAN_INCREMENT);
driver.video->apply_state_changes(); driver.video->apply_state_changes();
} }
break; break;
case RGUI_SETTINGS_AUDIO_MUTE: case RGUI_SETTINGS_AUDIO_MUTE:
if (action == RGUI_ACTION_START) if (action == RGUI_ACTION_START)
rarch_settings_default(S_DEF_AUDIO_MUTE); rmenu_settings_set_default(S_DEF_AUDIO_MUTE);
else else
rarch_settings_change(S_AUDIO_MUTE); rmenu_settings_set(S_AUDIO_MUTE);
break; break;
case RGUI_SETTINGS_AUDIO_CONTROL_RATE: case RGUI_SETTINGS_AUDIO_CONTROL_RATE:
if (action == RGUI_ACTION_START) if (action == RGUI_ACTION_START)
rarch_settings_default(S_DEF_AUDIO_CONTROL_RATE); rmenu_settings_set_default(S_DEF_AUDIO_CONTROL_RATE);
else if (action == RGUI_ACTION_LEFT) else if (action == RGUI_ACTION_LEFT)
rarch_settings_change(S_AUDIO_CONTROL_RATE_DECREMENT); rmenu_settings_set(S_AUDIO_CONTROL_RATE_DECREMENT);
else if (action == RGUI_ACTION_RIGHT) else if (action == RGUI_ACTION_RIGHT)
rarch_settings_change(S_AUDIO_CONTROL_RATE_INCREMENT); rmenu_settings_set(S_AUDIO_CONTROL_RATE_INCREMENT);
break; break;
case RGUI_SETTINGS_ZIP_EXTRACT: case RGUI_SETTINGS_ZIP_EXTRACT:
if (action == RGUI_ACTION_START) if (action == RGUI_ACTION_START)

100
frontend/menu/rmenu.c
View File

@ -30,7 +30,7 @@
#include "../../console/rarch_console.h" #include "../../console/rarch_console.h"
#include "../../console/rarch_console_rom_ext.h" #include "../../console/rarch_console_rom_ext.h"
#include "../../console/rarch_console_input.h" #include "../../console/rarch_console_input.h"
#include "../../console/rarch_console_settings.h" #include "rmenu_settings.h"
#include "../../gfx/image.h" #include "../../gfx/image.h"
@ -573,7 +573,7 @@ static void browser_update(void *data, uint64_t input, const char *extensions)
ret = filebrowser_iterate(b, action); ret = filebrowser_iterate(b, action);
if(!ret) if(!ret)
rarch_settings_msg(S_MSG_DIR_LOADING_ERROR, S_DELAY_180); rmenu_settings_msg(S_MSG_DIR_LOADING_ERROR, S_DELAY_180);
} }
void browser_render(void *data) void browser_render(void *data)
@ -672,7 +672,7 @@ int select_file(void *data, void *state)
{ {
driver.video->set_shader(driver.video_data, (enum rarch_shader_type)g_settings.video.shader_type, path, RARCH_SHADER_INDEX_PASS0); driver.video->set_shader(driver.video_data, (enum rarch_shader_type)g_settings.video.shader_type, path, RARCH_SHADER_INDEX_PASS0);
if (g_extern.lifecycle_menu_state & (1 << MODE_INFO_DRAW)) if (g_extern.lifecycle_menu_state & (1 << MODE_INFO_DRAW))
rarch_settings_msg(S_MSG_SHADER_LOADING_SUCCEEDED, S_DELAY_180); rmenu_settings_msg(S_MSG_SHADER_LOADING_SUCCEEDED, S_DELAY_180);
} }
else else
RARCH_ERR("Shaders are unsupported on this platform.\n"); RARCH_ERR("Shaders are unsupported on this platform.\n");
@ -688,7 +688,7 @@ int select_file(void *data, void *state)
{ {
driver.video->set_shader(driver.video_data, (enum rarch_shader_type)g_settings.video.shader_type, path, RARCH_SHADER_INDEX_PASS1); driver.video->set_shader(driver.video_data, (enum rarch_shader_type)g_settings.video.shader_type, path, RARCH_SHADER_INDEX_PASS1);
if (g_extern.lifecycle_menu_state & (1 << MODE_INFO_DRAW)) if (g_extern.lifecycle_menu_state & (1 << MODE_INFO_DRAW))
rarch_settings_msg(S_MSG_SHADER_LOADING_SUCCEEDED, S_DELAY_180); rmenu_settings_msg(S_MSG_SHADER_LOADING_SUCCEEDED, S_DELAY_180);
} }
else else
RARCH_ERR("Shaders are unsupported on this platform.\n"); RARCH_ERR("Shaders are unsupported on this platform.\n");
@ -725,7 +725,7 @@ int select_file(void *data, void *state)
else else
{ {
if (g_extern.lifecycle_menu_state & (1 << MODE_INFO_DRAW)) if (g_extern.lifecycle_menu_state & (1 << MODE_INFO_DRAW))
rarch_settings_msg(S_MSG_RESTART_RARCH, S_DELAY_180); rmenu_settings_msg(S_MSG_RESTART_RARCH, S_DELAY_180);
} }
break; break;
} }
@ -734,7 +734,7 @@ int select_file(void *data, void *state)
} }
if(!ret) if(!ret)
rarch_settings_msg(S_MSG_DIR_LOADING_ERROR, S_DELAY_180); rmenu_settings_msg(S_MSG_DIR_LOADING_ERROR, S_DELAY_180);
} }
else if (input & (1ULL << RMENU_DEVICE_NAV_X)) else if (input & (1ULL << RMENU_DEVICE_NAV_X))
menu_stack_pop(); menu_stack_pop();
@ -832,7 +832,7 @@ int select_directory(void *data, void *state)
} }
if(!ret) if(!ret)
rarch_settings_msg(S_MSG_DIR_LOADING_ERROR, S_DELAY_180); rmenu_settings_msg(S_MSG_DIR_LOADING_ERROR, S_DELAY_180);
display_menubar(current_menu); display_menubar(current_menu);
@ -1024,9 +1024,9 @@ static int set_setting_action(void *data, unsigned switchvalue, uint64_t input)
#ifdef __CELLOS_LV2__ #ifdef __CELLOS_LV2__
case SETTING_CHANGE_RESOLUTION: case SETTING_CHANGE_RESOLUTION:
if(input & (1ULL << RMENU_DEVICE_NAV_RIGHT)) if(input & (1ULL << RMENU_DEVICE_NAV_RIGHT))
rarch_settings_change(S_RESOLUTION_NEXT); rmenu_settings_set(S_RESOLUTION_NEXT);
if(input & (1ULL << RMENU_DEVICE_NAV_LEFT)) if(input & (1ULL << RMENU_DEVICE_NAV_LEFT))
rarch_settings_change(S_RESOLUTION_PREVIOUS); rmenu_settings_set(S_RESOLUTION_PREVIOUS);
if(input & (1ULL << RMENU_DEVICE_NAV_B)) if(input & (1ULL << RMENU_DEVICE_NAV_B))
{ {
if (g_extern.console.screen.resolutions.list[g_extern.console.screen.resolutions.current.idx] == CELL_VIDEO_OUT_RESOLUTION_576) if (g_extern.console.screen.resolutions.list[g_extern.console.screen.resolutions.current.idx] == CELL_VIDEO_OUT_RESOLUTION_576)
@ -1089,7 +1089,7 @@ static int set_setting_action(void *data, unsigned switchvalue, uint64_t input)
{ {
driver.video->set_shader(driver.video_data, (enum rarch_shader_type)g_settings.video.shader_type, NULL, RARCH_SHADER_INDEX_PASS0); driver.video->set_shader(driver.video_data, (enum rarch_shader_type)g_settings.video.shader_type, NULL, RARCH_SHADER_INDEX_PASS0);
if (g_extern.lifecycle_menu_state & (1 << MODE_INFO_DRAW)) if (g_extern.lifecycle_menu_state & (1 << MODE_INFO_DRAW))
rarch_settings_msg(S_MSG_SHADER_LOADING_SUCCEEDED, S_DELAY_180); rmenu_settings_msg(S_MSG_SHADER_LOADING_SUCCEEDED, S_DELAY_180);
} }
else else
RARCH_ERR("Shaders are unsupported on this platform.\n"); RARCH_ERR("Shaders are unsupported on this platform.\n");
@ -1109,7 +1109,7 @@ static int set_setting_action(void *data, unsigned switchvalue, uint64_t input)
{ {
driver.video->set_shader(driver.video_data, (enum rarch_shader_type)g_settings.video.shader_type, NULL, RARCH_SHADER_INDEX_PASS1); driver.video->set_shader(driver.video_data, (enum rarch_shader_type)g_settings.video.shader_type, NULL, RARCH_SHADER_INDEX_PASS1);
if (g_extern.lifecycle_menu_state & (1 << MODE_INFO_DRAW)) if (g_extern.lifecycle_menu_state & (1 << MODE_INFO_DRAW))
rarch_settings_msg(S_MSG_SHADER_LOADING_SUCCEEDED, S_DELAY_180); rmenu_settings_msg(S_MSG_SHADER_LOADING_SUCCEEDED, S_DELAY_180);
} }
else else
RARCH_ERR("Shaders are unsupported on this platform.\n"); RARCH_ERR("Shaders are unsupported on this platform.\n");
@ -1133,29 +1133,29 @@ static int set_setting_action(void *data, unsigned switchvalue, uint64_t input)
case SETTING_KEEP_ASPECT_RATIO: case SETTING_KEEP_ASPECT_RATIO:
if(input & (1ULL << RMENU_DEVICE_NAV_LEFT)) if(input & (1ULL << RMENU_DEVICE_NAV_LEFT))
{ {
rarch_settings_change(S_ASPECT_RATIO_DECREMENT); rmenu_settings_set(S_ASPECT_RATIO_DECREMENT);
driver.video->set_aspect_ratio(driver.video_data, g_settings.video.aspect_ratio_idx); driver.video->set_aspect_ratio(driver.video_data, g_settings.video.aspect_ratio_idx);
} }
if(input & (1ULL << RMENU_DEVICE_NAV_RIGHT)) if(input & (1ULL << RMENU_DEVICE_NAV_RIGHT))
{ {
rarch_settings_change(S_ASPECT_RATIO_INCREMENT); rmenu_settings_set(S_ASPECT_RATIO_INCREMENT);
driver.video->set_aspect_ratio(driver.video_data, g_settings.video.aspect_ratio_idx); driver.video->set_aspect_ratio(driver.video_data, g_settings.video.aspect_ratio_idx);
} }
if(input & (1ULL << RMENU_DEVICE_NAV_START)) if(input & (1ULL << RMENU_DEVICE_NAV_START))
{ {
rarch_settings_default(S_DEF_ASPECT_RATIO); rmenu_settings_set_default(S_DEF_ASPECT_RATIO);
driver.video->set_aspect_ratio(driver.video_data, g_settings.video.aspect_ratio_idx); driver.video->set_aspect_ratio(driver.video_data, g_settings.video.aspect_ratio_idx);
} }
break; break;
case SETTING_HW_TEXTURE_FILTER: case SETTING_HW_TEXTURE_FILTER:
if((input & (1ULL << RMENU_DEVICE_NAV_LEFT)) || (input & (1ULL << RMENU_DEVICE_NAV_RIGHT)) || (input & (1ULL << RMENU_DEVICE_NAV_B))) if((input & (1ULL << RMENU_DEVICE_NAV_LEFT)) || (input & (1ULL << RMENU_DEVICE_NAV_RIGHT)) || (input & (1ULL << RMENU_DEVICE_NAV_B)))
{ {
rarch_settings_change(S_HW_TEXTURE_FILTER); rmenu_settings_set(S_HW_TEXTURE_FILTER);
device_ptr->ctx_driver->set_filtering(1, g_settings.video.smooth); device_ptr->ctx_driver->set_filtering(1, g_settings.video.smooth);
} }
if(input & (1ULL << RMENU_DEVICE_NAV_START)) if(input & (1ULL << RMENU_DEVICE_NAV_START))
{ {
rarch_settings_change(S_DEF_HW_TEXTURE_FILTER); rmenu_settings_set(S_DEF_HW_TEXTURE_FILTER);
device_ptr->ctx_driver->set_filtering(1, g_settings.video.smooth); device_ptr->ctx_driver->set_filtering(1, g_settings.video.smooth);
} }
break; break;
@ -1163,19 +1163,19 @@ static int set_setting_action(void *data, unsigned switchvalue, uint64_t input)
case SETTING_HW_TEXTURE_FILTER_2: case SETTING_HW_TEXTURE_FILTER_2:
if((input & (1ULL << RMENU_DEVICE_NAV_LEFT)) || (input & (1ULL << RMENU_DEVICE_NAV_RIGHT)) || (input & (1ULL << RMENU_DEVICE_NAV_B))) if((input & (1ULL << RMENU_DEVICE_NAV_LEFT)) || (input & (1ULL << RMENU_DEVICE_NAV_RIGHT)) || (input & (1ULL << RMENU_DEVICE_NAV_B)))
{ {
rarch_settings_change(S_HW_TEXTURE_FILTER_2); rmenu_settings_set(S_HW_TEXTURE_FILTER_2);
device_ptr->ctx_driver->set_filtering(2, g_settings.video.second_pass_smooth); device_ptr->ctx_driver->set_filtering(2, g_settings.video.second_pass_smooth);
} }
if(input & (1ULL << RMENU_DEVICE_NAV_START)) if(input & (1ULL << RMENU_DEVICE_NAV_START))
{ {
rarch_settings_change(S_DEF_HW_TEXTURE_FILTER_2); rmenu_settings_set(S_DEF_HW_TEXTURE_FILTER_2);
device_ptr->ctx_driver->set_filtering(2, g_settings.video.second_pass_smooth); device_ptr->ctx_driver->set_filtering(2, g_settings.video.second_pass_smooth);
} }
break; break;
case SETTING_SCALE_ENABLED: case SETTING_SCALE_ENABLED:
if((input & (1ULL << RMENU_DEVICE_NAV_LEFT)) || (input & (1ULL << RMENU_DEVICE_NAV_RIGHT)) || (input & (1ULL << RMENU_DEVICE_NAV_B))) if((input & (1ULL << RMENU_DEVICE_NAV_LEFT)) || (input & (1ULL << RMENU_DEVICE_NAV_RIGHT)) || (input & (1ULL << RMENU_DEVICE_NAV_B)))
{ {
rarch_settings_change(S_SCALE_ENABLED); rmenu_settings_set(S_SCALE_ENABLED);
if(g_settings.video.render_to_texture) if(g_settings.video.render_to_texture)
device_ptr->ctx_driver->set_fbo(FBO_INIT); device_ptr->ctx_driver->set_fbo(FBO_INIT);
@ -1184,7 +1184,7 @@ static int set_setting_action(void *data, unsigned switchvalue, uint64_t input)
} }
if(input & (1ULL << RMENU_DEVICE_NAV_START)) if(input & (1ULL << RMENU_DEVICE_NAV_START))
{ {
rarch_settings_default(S_DEF_SCALE_ENABLED); rmenu_settings_set_default(S_DEF_SCALE_ENABLED);
device_ptr->ctx_driver->set_fbo(FBO_REINIT); device_ptr->ctx_driver->set_fbo(FBO_REINIT);
} }
break; break;
@ -1197,7 +1197,7 @@ static int set_setting_action(void *data, unsigned switchvalue, uint64_t input)
if(should_decrement) if(should_decrement)
{ {
rarch_settings_change(S_SCALE_FACTOR_DECREMENT); rmenu_settings_set(S_SCALE_FACTOR_DECREMENT);
device_ptr->ctx_driver->set_fbo(FBO_REINIT); device_ptr->ctx_driver->set_fbo(FBO_REINIT);
} }
} }
@ -1209,14 +1209,14 @@ static int set_setting_action(void *data, unsigned switchvalue, uint64_t input)
bool should_increment = g_settings.video.fbo.scale_x < MAX_SCALING_FACTOR; bool should_increment = g_settings.video.fbo.scale_x < MAX_SCALING_FACTOR;
if(should_increment) if(should_increment)
{ {
rarch_settings_change(S_SCALE_FACTOR_INCREMENT); rmenu_settings_set(S_SCALE_FACTOR_INCREMENT);
device_ptr->ctx_driver->set_fbo(FBO_REINIT); device_ptr->ctx_driver->set_fbo(FBO_REINIT);
} }
} }
} }
if(input & (1ULL << RMENU_DEVICE_NAV_START)) if(input & (1ULL << RMENU_DEVICE_NAV_START))
{ {
rarch_settings_default(S_DEF_SCALE_FACTOR); rmenu_settings_set_default(S_DEF_SCALE_FACTOR);
device_ptr->ctx_driver->set_fbo(FBO_REINIT); device_ptr->ctx_driver->set_fbo(FBO_REINIT);
} }
break; break;
@ -1251,41 +1251,41 @@ static int set_setting_action(void *data, unsigned switchvalue, uint64_t input)
case SETTING_HW_OVERSCAN_AMOUNT: case SETTING_HW_OVERSCAN_AMOUNT:
if(input & (1ULL << RMENU_DEVICE_NAV_LEFT)) if(input & (1ULL << RMENU_DEVICE_NAV_LEFT))
{ {
rarch_settings_change(S_OVERSCAN_DECREMENT); rmenu_settings_set(S_OVERSCAN_DECREMENT);
gfx_ctx_set_overscan(); gfx_ctx_set_overscan();
} }
if((input & (1ULL << RMENU_DEVICE_NAV_RIGHT)) || (input & (1ULL << RMENU_DEVICE_NAV_B))) if((input & (1ULL << RMENU_DEVICE_NAV_RIGHT)) || (input & (1ULL << RMENU_DEVICE_NAV_B)))
{ {
rarch_settings_change(S_OVERSCAN_INCREMENT); rmenu_settings_set(S_OVERSCAN_INCREMENT);
gfx_ctx_set_overscan(); gfx_ctx_set_overscan();
} }
if(input & (1ULL << RMENU_DEVICE_NAV_START)) if(input & (1ULL << RMENU_DEVICE_NAV_START))
{ {
rarch_settings_default(S_DEF_OVERSCAN); rmenu_settings_set_default(S_DEF_OVERSCAN);
gfx_ctx_set_overscan(); gfx_ctx_set_overscan();
} }
break; break;
case SETTING_THROTTLE_MODE: case SETTING_THROTTLE_MODE:
if((input & (1ULL << RMENU_DEVICE_NAV_LEFT)) || (input & (1ULL << RMENU_DEVICE_NAV_RIGHT)) || (input & (1ULL << RMENU_DEVICE_NAV_B))) if((input & (1ULL << RMENU_DEVICE_NAV_LEFT)) || (input & (1ULL << RMENU_DEVICE_NAV_RIGHT)) || (input & (1ULL << RMENU_DEVICE_NAV_B)))
{ {
rarch_settings_change(S_THROTTLE); rmenu_settings_set(S_THROTTLE);
device_ptr->ctx_driver->swap_interval((g_extern.lifecycle_menu_state & (1 << MODE_VIDEO_THROTTLE_ENABLE))); device_ptr->ctx_driver->swap_interval((g_extern.lifecycle_menu_state & (1 << MODE_VIDEO_THROTTLE_ENABLE)));
} }
if(input & (1ULL << RMENU_DEVICE_NAV_START)) if(input & (1ULL << RMENU_DEVICE_NAV_START))
{ {
rarch_settings_default(S_DEF_THROTTLE); rmenu_settings_set_default(S_DEF_THROTTLE);
device_ptr->ctx_driver->swap_interval((g_extern.lifecycle_menu_state & (1 << MODE_VIDEO_THROTTLE_ENABLE))); device_ptr->ctx_driver->swap_interval((g_extern.lifecycle_menu_state & (1 << MODE_VIDEO_THROTTLE_ENABLE)));
} }
break; break;
case SETTING_TRIPLE_BUFFERING: case SETTING_TRIPLE_BUFFERING:
if((input & (1ULL << RMENU_DEVICE_NAV_LEFT)) || (input & (1ULL << RMENU_DEVICE_NAV_RIGHT)) || (input & (1ULL << RMENU_DEVICE_NAV_B))) if((input & (1ULL << RMENU_DEVICE_NAV_LEFT)) || (input & (1ULL << RMENU_DEVICE_NAV_RIGHT)) || (input & (1ULL << RMENU_DEVICE_NAV_B)))
{ {
rarch_settings_change(S_TRIPLE_BUFFERING); rmenu_settings_set(S_TRIPLE_BUFFERING);
driver.video->restart(); driver.video->restart();
} }
if(input & (1ULL << RMENU_DEVICE_NAV_START)) if(input & (1ULL << RMENU_DEVICE_NAV_START))
{ {
rarch_settings_default(S_DEF_TRIPLE_BUFFERING); rmenu_settings_set_default(S_DEF_TRIPLE_BUFFERING);
if(!(g_extern.lifecycle_menu_state & (1 << MODE_VIDEO_TRIPLE_BUFFERING_ENABLE))) if(!(g_extern.lifecycle_menu_state & (1 << MODE_VIDEO_TRIPLE_BUFFERING_ENABLE)))
driver.video->restart(); driver.video->restart();
@ -1365,11 +1365,11 @@ static int set_setting_action(void *data, unsigned switchvalue, uint64_t input)
break; break;
case SETTING_EMU_CURRENT_SAVE_STATE_SLOT: case SETTING_EMU_CURRENT_SAVE_STATE_SLOT:
if(input & (1ULL << RMENU_DEVICE_NAV_LEFT)) if(input & (1ULL << RMENU_DEVICE_NAV_LEFT))
rarch_settings_change(S_SAVESTATE_DECREMENT); rmenu_settings_set(S_SAVESTATE_DECREMENT);
if((input & (1ULL << RMENU_DEVICE_NAV_RIGHT)) || (input & (1ULL << RMENU_DEVICE_NAV_B))) if((input & (1ULL << RMENU_DEVICE_NAV_RIGHT)) || (input & (1ULL << RMENU_DEVICE_NAV_B)))
rarch_settings_change(S_SAVESTATE_INCREMENT); rmenu_settings_set(S_SAVESTATE_INCREMENT);
if(input & (1ULL << RMENU_DEVICE_NAV_START)) if(input & (1ULL << RMENU_DEVICE_NAV_START))
rarch_settings_default(S_DEF_SAVE_STATE); rmenu_settings_set_default(S_DEF_SAVE_STATE);
break; break;
case SETTING_EMU_SHOW_DEBUG_INFO_MSG: case SETTING_EMU_SHOW_DEBUG_INFO_MSG:
if((input & (1ULL << RMENU_DEVICE_NAV_LEFT)) || (input & (1ULL << RMENU_DEVICE_NAV_RIGHT)) || (input & (1ULL << RMENU_DEVICE_NAV_B))) if((input & (1ULL << RMENU_DEVICE_NAV_LEFT)) || (input & (1ULL << RMENU_DEVICE_NAV_RIGHT)) || (input & (1ULL << RMENU_DEVICE_NAV_B)))
@ -1396,10 +1396,10 @@ static int set_setting_action(void *data, unsigned switchvalue, uint64_t input)
case SETTING_EMU_REWIND_ENABLED: case SETTING_EMU_REWIND_ENABLED:
if((input & (1ULL << RMENU_DEVICE_NAV_LEFT)) || (input & (1ULL << RMENU_DEVICE_NAV_RIGHT)) || (input & (1ULL << RMENU_DEVICE_NAV_B))) if((input & (1ULL << RMENU_DEVICE_NAV_LEFT)) || (input & (1ULL << RMENU_DEVICE_NAV_RIGHT)) || (input & (1ULL << RMENU_DEVICE_NAV_B)))
{ {
rarch_settings_change(S_REWIND); rmenu_settings_set(S_REWIND);
if (g_extern.lifecycle_menu_state & (1 << MODE_INFO_DRAW)) if (g_extern.lifecycle_menu_state & (1 << MODE_INFO_DRAW))
rarch_settings_msg(S_MSG_RESTART_RARCH, S_DELAY_180); rmenu_settings_msg(S_MSG_RESTART_RARCH, S_DELAY_180);
} }
if(input & (1ULL << RMENU_DEVICE_NAV_START)) if(input & (1ULL << RMENU_DEVICE_NAV_START))
g_settings.rewind_enable = false; g_settings.rewind_enable = false;
@ -1441,10 +1441,10 @@ static int set_setting_action(void *data, unsigned switchvalue, uint64_t input)
break; break;
case SETTING_EMU_AUDIO_MUTE: case SETTING_EMU_AUDIO_MUTE:
if((input & (1ULL << RMENU_DEVICE_NAV_LEFT)) || (input & (1ULL << RMENU_DEVICE_NAV_RIGHT)) || (input & (1ULL << RMENU_DEVICE_NAV_B))) if((input & (1ULL << RMENU_DEVICE_NAV_LEFT)) || (input & (1ULL << RMENU_DEVICE_NAV_RIGHT)) || (input & (1ULL << RMENU_DEVICE_NAV_B)))
rarch_settings_change(S_AUDIO_MUTE); rmenu_settings_set(S_AUDIO_MUTE);
if(input & (1ULL << RMENU_DEVICE_NAV_START)) if(input & (1ULL << RMENU_DEVICE_NAV_START))
rarch_settings_default(S_DEF_AUDIO_MUTE); rmenu_settings_set_default(S_DEF_AUDIO_MUTE);
break; break;
#ifdef _XBOX1 #ifdef _XBOX1
case SETTING_EMU_AUDIO_SOUND_VOLUME_LEVEL: case SETTING_EMU_AUDIO_SOUND_VOLUME_LEVEL:
@ -1452,14 +1452,14 @@ static int set_setting_action(void *data, unsigned switchvalue, uint64_t input)
{ {
g_extern.console.sound.volume_level = !g_extern.console.sound.volume_level; g_extern.console.sound.volume_level = !g_extern.console.sound.volume_level;
if (g_extern.lifecycle_menu_state & (1 << MODE_INFO_DRAW)) if (g_extern.lifecycle_menu_state & (1 << MODE_INFO_DRAW))
rarch_settings_msg(S_MSG_RESTART_RARCH, S_DELAY_180); rmenu_settings_msg(S_MSG_RESTART_RARCH, S_DELAY_180);
} }
if(input & (1ULL << RMENU_DEVICE_NAV_START)) if(input & (1ULL << RMENU_DEVICE_NAV_START))
{ {
g_extern.console.sound.volume_level = 0; g_extern.console.sound.volume_level = 0;
if (g_extern.lifecycle_menu_state & (1 << MODE_INFO_DRAW)) if (g_extern.lifecycle_menu_state & (1 << MODE_INFO_DRAW))
rarch_settings_msg(S_MSG_RESTART_RARCH, S_DELAY_180); rmenu_settings_msg(S_MSG_RESTART_RARCH, S_DELAY_180);
} }
break; break;
#endif #endif
@ -1828,7 +1828,7 @@ int select_rom(void *data, void *state)
bool ret = filebrowser_iterate(filebrowser, FILEBROWSER_ACTION_OK); bool ret = filebrowser_iterate(filebrowser, FILEBROWSER_ACTION_OK);
if(!ret) if(!ret)
rarch_settings_msg(S_MSG_DIR_LOADING_ERROR, S_DELAY_180); rmenu_settings_msg(S_MSG_DIR_LOADING_ERROR, S_DELAY_180);
} }
else else
rarch_console_load_game_wrap(filebrowser_get_current_path(filebrowser), g_extern.file_state.zip_extract_mode); rarch_console_load_game_wrap(filebrowser_get_current_path(filebrowser), g_extern.file_state.zip_extract_mode);
@ -2158,19 +2158,19 @@ int ingame_menu(void *data, void *state)
case MENU_ITEM_ORIENTATION: case MENU_ITEM_ORIENTATION:
if(input & (1ULL << RMENU_DEVICE_NAV_LEFT)) if(input & (1ULL << RMENU_DEVICE_NAV_LEFT))
{ {
rarch_settings_change(S_ROTATION_DECREMENT); rmenu_settings_set(S_ROTATION_DECREMENT);
driver.video->set_rotation(NULL, g_extern.console.screen.orientation); driver.video->set_rotation(NULL, g_extern.console.screen.orientation);
} }
if((input & (1ULL << RMENU_DEVICE_NAV_RIGHT)) || (input & (1ULL << RMENU_DEVICE_NAV_B))) if((input & (1ULL << RMENU_DEVICE_NAV_RIGHT)) || (input & (1ULL << RMENU_DEVICE_NAV_B)))
{ {
rarch_settings_change(S_ROTATION_INCREMENT); rmenu_settings_set(S_ROTATION_INCREMENT);
driver.video->set_rotation(NULL, g_extern.console.screen.orientation); driver.video->set_rotation(NULL, g_extern.console.screen.orientation);
} }
if(input & (1ULL << RMENU_DEVICE_NAV_START)) if(input & (1ULL << RMENU_DEVICE_NAV_START))
{ {
rarch_settings_default(S_DEF_ROTATION); rmenu_settings_set_default(S_DEF_ROTATION);
driver.video->set_rotation(NULL, g_extern.console.screen.orientation); driver.video->set_rotation(NULL, g_extern.console.screen.orientation);
} }
snprintf(strw_buffer, sizeof(strw_buffer), "Press [%s] to reset back to default values.", rarch_input_find_platform_key_label(1ULL << RETRO_DEVICE_ID_JOYPAD_START)); snprintf(strw_buffer, sizeof(strw_buffer), "Press [%s] to reset back to default values.", rarch_input_find_platform_key_label(1ULL << RETRO_DEVICE_ID_JOYPAD_START));
@ -2189,7 +2189,7 @@ int ingame_menu(void *data, void *state)
if((input & (1ULL << RMENU_DEVICE_NAV_B)) || (input & (1ULL << RMENU_DEVICE_NAV_R2)) || (input & (1ULL << RMENU_DEVICE_NAV_L2))) if((input & (1ULL << RMENU_DEVICE_NAV_B)) || (input & (1ULL << RMENU_DEVICE_NAV_R2)) || (input & (1ULL << RMENU_DEVICE_NAV_L2)))
{ {
g_extern.lifecycle_state |= (1ULL << RARCH_FRAMEADVANCE); g_extern.lifecycle_state |= (1ULL << RARCH_FRAMEADVANCE);
rarch_settings_change(S_FRAME_ADVANCE); rmenu_settings_set(S_FRAME_ADVANCE);
menu_idx = MENU_ITEM_FRAME_ADVANCE; menu_idx = MENU_ITEM_FRAME_ADVANCE;
return -1; return -1;
} }
@ -2294,23 +2294,23 @@ int ingame_menu(void *data, void *state)
device_ptr->font_ctx->render_msg_place(device_ptr,default_pos.x_position, default_pos.comment_y_position, default_pos.font_size, WHITE, strw_buffer); device_ptr->font_ctx->render_msg_place(device_ptr,default_pos.x_position, default_pos.comment_y_position, default_pos.font_size, WHITE, strw_buffer);
rarch_settings_create_menu_item_label(strw_buffer, S_LBL_LOAD_STATE_SLOT, sizeof(strw_buffer)); rmenu_settings_create_menu_item_label(strw_buffer, S_LBL_LOAD_STATE_SLOT, sizeof(strw_buffer));
device_ptr->font_ctx->render_msg_place(device_ptr, default_pos.x_position, default_pos.y_position, default_pos.font_size, MENU_ITEM_SELECTED(MENU_ITEM_LOAD_STATE), strw_buffer); device_ptr->font_ctx->render_msg_place(device_ptr, default_pos.x_position, default_pos.y_position, default_pos.font_size, MENU_ITEM_SELECTED(MENU_ITEM_LOAD_STATE), strw_buffer);
rarch_settings_create_menu_item_label(strw_buffer, S_LBL_SAVE_STATE_SLOT, sizeof(strw_buffer)); rmenu_settings_create_menu_item_label(strw_buffer, S_LBL_SAVE_STATE_SLOT, sizeof(strw_buffer));
device_ptr->font_ctx->render_msg_place(device_ptr, default_pos.x_position, default_pos.y_position+(default_pos.y_position_increment*MENU_ITEM_SAVE_STATE), default_pos.font_size, MENU_ITEM_SELECTED(MENU_ITEM_SAVE_STATE), strw_buffer); device_ptr->font_ctx->render_msg_place(device_ptr, default_pos.x_position, default_pos.y_position+(default_pos.y_position_increment*MENU_ITEM_SAVE_STATE), default_pos.font_size, MENU_ITEM_SELECTED(MENU_ITEM_SAVE_STATE), strw_buffer);
rarch_settings_create_menu_item_label(strw_buffer, S_LBL_ASPECT_RATIO, sizeof(strw_buffer)); rmenu_settings_create_menu_item_label(strw_buffer, S_LBL_ASPECT_RATIO, sizeof(strw_buffer));
device_ptr->font_ctx->render_msg_place(device_ptr, default_pos.x_position, (default_pos.y_position+(default_pos.y_position_increment*MENU_ITEM_KEEP_ASPECT_RATIO)), default_pos.font_size, MENU_ITEM_SELECTED(MENU_ITEM_KEEP_ASPECT_RATIO), strw_buffer); device_ptr->font_ctx->render_msg_place(device_ptr, default_pos.x_position, (default_pos.y_position+(default_pos.y_position_increment*MENU_ITEM_KEEP_ASPECT_RATIO)), default_pos.font_size, MENU_ITEM_SELECTED(MENU_ITEM_KEEP_ASPECT_RATIO), strw_buffer);
snprintf(strw_buffer, sizeof(strw_buffer), "Overscan: %f", g_extern.console.screen.overscan_amount); snprintf(strw_buffer, sizeof(strw_buffer), "Overscan: %f", g_extern.console.screen.overscan_amount);
device_ptr->font_ctx->render_msg_place(device_ptr, default_pos.x_position, (default_pos.y_position+(default_pos.y_position_increment*MENU_ITEM_OVERSCAN_AMOUNT)), default_pos.font_size, MENU_ITEM_SELECTED(MENU_ITEM_OVERSCAN_AMOUNT), strw_buffer); device_ptr->font_ctx->render_msg_place(device_ptr, default_pos.x_position, (default_pos.y_position+(default_pos.y_position_increment*MENU_ITEM_OVERSCAN_AMOUNT)), default_pos.font_size, MENU_ITEM_SELECTED(MENU_ITEM_OVERSCAN_AMOUNT), strw_buffer);
rarch_settings_create_menu_item_label(strw_buffer, S_LBL_ROTATION, sizeof(strw_buffer)); rmenu_settings_create_menu_item_label(strw_buffer, S_LBL_ROTATION, sizeof(strw_buffer));
device_ptr->font_ctx->render_msg_place(device_ptr, default_pos.x_position, (default_pos.y_position+(default_pos.y_position_increment*MENU_ITEM_ORIENTATION)), default_pos.font_size, MENU_ITEM_SELECTED(MENU_ITEM_ORIENTATION), strw_buffer); device_ptr->font_ctx->render_msg_place(device_ptr, default_pos.x_position, (default_pos.y_position+(default_pos.y_position_increment*MENU_ITEM_ORIENTATION)), default_pos.font_size, MENU_ITEM_SELECTED(MENU_ITEM_ORIENTATION), strw_buffer);
#ifdef HAVE_FBO #ifdef HAVE_FBO
rarch_settings_create_menu_item_label(strw_buffer, S_LBL_SCALE_FACTOR, sizeof(strw_buffer)); rmenu_settings_create_menu_item_label(strw_buffer, S_LBL_SCALE_FACTOR, sizeof(strw_buffer));
device_ptr->font_ctx->render_msg_place(device_ptr, default_pos.x_position, (default_pos.y_position+(default_pos.y_position_increment*MENU_ITEM_SCALE_FACTOR)), default_pos.font_size, MENU_ITEM_SELECTED(MENU_ITEM_SCALE_FACTOR), strw_buffer); device_ptr->font_ctx->render_msg_place(device_ptr, default_pos.x_position, (default_pos.y_position+(default_pos.y_position_increment*MENU_ITEM_SCALE_FACTOR)), default_pos.font_size, MENU_ITEM_SELECTED(MENU_ITEM_SCALE_FACTOR), strw_buffer);
#endif #endif
@ -2415,7 +2415,7 @@ int rmenu_input_process(void *data, void *state)
if (g_extern.lifecycle_menu_state & (1 << MODE_LOAD_GAME)) if (g_extern.lifecycle_menu_state & (1 << MODE_LOAD_GAME))
{ {
if (g_extern.lifecycle_menu_state & (1 << MODE_INFO_DRAW)) if (g_extern.lifecycle_menu_state & (1 << MODE_INFO_DRAW))
rarch_settings_msg(S_MSG_LOADING_ROM, 100); rmenu_settings_msg(S_MSG_LOADING_ROM, 100);
g_extern.lifecycle_menu_state |= (1 << MODE_INIT); g_extern.lifecycle_menu_state |= (1 << MODE_INIT);
g_extern.lifecycle_menu_state &= ~(1 << MODE_LOAD_GAME); g_extern.lifecycle_menu_state &= ~(1 << MODE_LOAD_GAME);

2
frontend/menu/rmenu_gx.c
View File

@ -171,7 +171,7 @@ int rmenu_input_process(void *data, void *state)
if (g_extern.lifecycle_menu_state & (1 << MODE_LOAD_GAME)) if (g_extern.lifecycle_menu_state & (1 << MODE_LOAD_GAME))
{ {
if (g_extern.lifecycle_menu_state & (1 << MODE_INFO_DRAW)) if (g_extern.lifecycle_menu_state & (1 << MODE_INFO_DRAW))
rarch_settings_msg(S_MSG_LOADING_ROM, 100); rmenu_settings_msg(S_MSG_LOADING_ROM, 100);
if (g_extern.fullpath) if (g_extern.fullpath)
g_extern.lifecycle_menu_state |= (1 << MODE_INIT); g_extern.lifecycle_menu_state |= (1 << MODE_INIT);

17
console/rarch_console_settings.c → frontend/menu/rmenu_settings.c
View File

@ -14,15 +14,14 @@
* If not, see <http://www.gnu.org/licenses/>. * If not, see <http://www.gnu.org/licenses/>.
*/ */
#include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <stddef.h> #include <stddef.h>
#include <string.h> #include <string.h>
#include "../general.h" #include "../../general.h"
#include "rarch_console_settings.h" #include "rmenu_settings.h"
void rarch_settings_change(unsigned setting) void rmenu_settings_set(unsigned setting)
{ {
switch(setting) switch(setting)
{ {
@ -133,7 +132,7 @@ void rarch_settings_change(unsigned setting)
} }
} }
void rarch_settings_default(unsigned setting) void rmenu_settings_set_default(unsigned setting)
{ {
switch(setting) switch(setting)
{ {
@ -187,7 +186,7 @@ void rarch_settings_default(unsigned setting)
} }
} }
void rarch_settings_msg(unsigned setting, unsigned delay) void rmenu_settings_msg(unsigned setting, unsigned delay)
{ {
char str[PATH_MAX], tmp[PATH_MAX]; char str[PATH_MAX], tmp[PATH_MAX];
msg_queue_clear(g_extern.msg_queue); msg_queue_clear(g_extern.msg_queue);
@ -251,15 +250,15 @@ void rarch_settings_msg(unsigned setting, unsigned delay)
msg_queue_push(g_extern.msg_queue, str, 1, delay); msg_queue_push(g_extern.msg_queue, str, 1, delay);
} }
void rarch_settings_create_menu_item_label_w(wchar_t *strwbuf, unsigned setting, size_t size) void rmenu_settings_create_menu_item_label_w(wchar_t *strwbuf, unsigned setting, size_t size)
{ {
char str[PATH_MAX]; char str[PATH_MAX];
rarch_settings_create_menu_item_label(str, setting, sizeof(str)); rmenu_settings_create_menu_item_label(str, setting, sizeof(str));
convert_char_to_wchar(strwbuf, str, size); convert_char_to_wchar(strwbuf, str, size);
} }
void rarch_settings_create_menu_item_label(char * str, unsigned setting, size_t size) void rmenu_settings_create_menu_item_label(char * str, unsigned setting, size_t size)
{ {
switch (setting) switch (setting)
{ {

10
console/rarch_console_settings.h → frontend/menu/rmenu_settings.h
View File

@ -98,11 +98,11 @@ enum
S_LBL_ZIP_EXTRACT, S_LBL_ZIP_EXTRACT,
}; };
void rarch_settings_change(unsigned setting); void rmenu_settings_set(unsigned setting);
void rarch_settings_default(unsigned setting); void rmenu_settings_set_default(unsigned setting);
void rarch_settings_msg(unsigned setting, unsigned delay); void rmenu_settings_msg(unsigned setting, unsigned delay);
void rarch_settings_create_menu_item_label(char * str, unsigned setting, size_t size); void rmenu_settings_create_menu_item_label(char * str, unsigned setting, size_t size);
void rarch_settings_create_menu_item_label_w(wchar_t *strwbuf, unsigned setting, size_t size); void rmenu_settings_create_menu_item_label_w(wchar_t *strwbuf, unsigned setting, size_t size);
#endif #endif

106
frontend/menu/rmenu_xui.cpp
View File

@ -24,7 +24,7 @@
#include "utils/file_browser.h" #include "utils/file_browser.h"
#include "../../console/rarch_console.h" #include "../../console/rarch_console.h"
#include "../../console/rarch_console_settings.h" #include "rmenu_settings.h"
#include "../../console/rarch_console_video.h" #include "../../console/rarch_console_video.h"
#include "../../gfx/gfx_context.h" #include "../../gfx/gfx_context.h"
@ -132,7 +132,7 @@ static void browser_update(filebrowser_t * b, uint64_t input, const char *extens
ret = filebrowser_iterate(b, action); ret = filebrowser_iterate(b, action);
if(!ret) if(!ret)
rarch_settings_msg(S_MSG_DIR_LOADING_ERROR, S_DELAY_180); rmenu_settings_msg(S_MSG_DIR_LOADING_ERROR, S_DELAY_180);
} }
static void filebrowser_fetch_directory_entries(filebrowser_t * browser, uint64_t action, CXuiList * romlist, CXuiTextElement * rompath_title) static void filebrowser_fetch_directory_entries(filebrowser_t * browser, uint64_t action, CXuiList * romlist, CXuiTextElement * rompath_title)
@ -207,7 +207,7 @@ HRESULT CRetroArchFileBrowser::OnNotifyPress( HXUIOBJ hObjPressed, BOOL& bHandle
filebrowser_fetch_directory_entries(browser, action, &m_romlist, &m_rompathtitle); filebrowser_fetch_directory_entries(browser, action, &m_romlist, &m_rompathtitle);
if (g_extern.lifecycle_menu_state & (1 << MODE_INFO_DRAW)) if (g_extern.lifecycle_menu_state & (1 << MODE_INFO_DRAW))
rarch_settings_msg(S_MSG_CACHE_PARTITION, S_DELAY_180); rmenu_settings_msg(S_MSG_CACHE_PARTITION, S_DELAY_180);
} }
#endif #endif
@ -391,13 +391,13 @@ HRESULT CRetroArchSettings::OnInit(XUIMessageInit * pInitData, BOOL& bHandled)
m_settingslist.SetText(SETTING_HW_TEXTURE_FILTER, g_settings.video.smooth ? L"Hardware filtering shader #1: Linear interpolation" : L"Hardware filtering shader #1: Point filtering"); m_settingslist.SetText(SETTING_HW_TEXTURE_FILTER, g_settings.video.smooth ? L"Hardware filtering shader #1: Linear interpolation" : L"Hardware filtering shader #1: Point filtering");
m_settingslist.SetText(SETTING_HW_TEXTURE_FILTER_2, g_settings.video.second_pass_smooth ? L"Hardware filtering shader #2: Linear interpolation" : L"Hardware filtering shader #2: Point filtering"); m_settingslist.SetText(SETTING_HW_TEXTURE_FILTER_2, g_settings.video.second_pass_smooth ? L"Hardware filtering shader #2: Linear interpolation" : L"Hardware filtering shader #2: Point filtering");
m_settingslist.SetText(SETTING_SCALE_ENABLED, g_settings.video.render_to_texture ? L"Custom Scaling/Dual Shaders: ON" : L"Custom Scaling/Dual Shaders: OFF"); m_settingslist.SetText(SETTING_SCALE_ENABLED, g_settings.video.render_to_texture ? L"Custom Scaling/Dual Shaders: ON" : L"Custom Scaling/Dual Shaders: OFF");
rarch_settings_create_menu_item_label_w(strw_buffer, S_LBL_SHADER, sizeof(strw_buffer)); rmenu_settings_create_menu_item_label_w(strw_buffer, S_LBL_SHADER, sizeof(strw_buffer));
m_settingslist.SetText(SETTING_SHADER, strw_buffer); m_settingslist.SetText(SETTING_SHADER, strw_buffer);
rarch_settings_create_menu_item_label_w(strw_buffer, S_LBL_SHADER_2, sizeof(strw_buffer)); rmenu_settings_create_menu_item_label_w(strw_buffer, S_LBL_SHADER_2, sizeof(strw_buffer));
m_settingslist.SetText(SETTING_SHADER_2, strw_buffer); m_settingslist.SetText(SETTING_SHADER_2, strw_buffer);
rarch_settings_create_menu_item_label_w(strw_buffer, S_LBL_SCALE_FACTOR, sizeof(strw_buffer)); rmenu_settings_create_menu_item_label_w(strw_buffer, S_LBL_SCALE_FACTOR, sizeof(strw_buffer));
m_settingslist.SetText(SETTING_SCALE_FACTOR, strw_buffer); m_settingslist.SetText(SETTING_SCALE_FACTOR, strw_buffer);
rarch_settings_create_menu_item_label_w(strw_buffer, S_LBL_ZIP_EXTRACT, sizeof(strw_buffer)); rmenu_settings_create_menu_item_label_w(strw_buffer, S_LBL_ZIP_EXTRACT, sizeof(strw_buffer));
m_settingslist.SetText(SETTING_ZIP_EXTRACT, strw_buffer); m_settingslist.SetText(SETTING_ZIP_EXTRACT, strw_buffer);
return 0; return 0;
@ -417,11 +417,11 @@ HRESULT CRetroArchSettings::OnNotifyPress( HXUIOBJ hObjPressed, int & bHandled
switch(current_index) switch(current_index)
{ {
case SETTING_EMU_REWIND_ENABLED: case SETTING_EMU_REWIND_ENABLED:
rarch_settings_change(S_REWIND); rmenu_settings_set(S_REWIND);
m_settingslist.SetText(SETTING_EMU_REWIND_ENABLED, g_settings.rewind_enable ? L"Rewind: ON" : L"Rewind: OFF"); m_settingslist.SetText(SETTING_EMU_REWIND_ENABLED, g_settings.rewind_enable ? L"Rewind: ON" : L"Rewind: OFF");
if (g_extern.lifecycle_menu_state & (1 << MODE_INFO_DRAW)) if (g_extern.lifecycle_menu_state & (1 << MODE_INFO_DRAW))
rarch_settings_msg(S_MSG_RESTART_RARCH, S_DELAY_180); rmenu_settings_msg(S_MSG_RESTART_RARCH, S_DELAY_180);
break; break;
case SETTING_EMU_SHOW_INFO_MSG: case SETTING_EMU_SHOW_INFO_MSG:
if (g_extern.lifecycle_menu_state & (1 << MODE_INFO_DRAW)) if (g_extern.lifecycle_menu_state & (1 << MODE_INFO_DRAW))
@ -448,7 +448,7 @@ HRESULT CRetroArchSettings::OnNotifyPress( HXUIOBJ hObjPressed, int & bHandled
g_extern.console.screen.gamma_correction = g_extern.console.screen.gamma_correction ? 0 : 1; g_extern.console.screen.gamma_correction = g_extern.console.screen.gamma_correction ? 0 : 1;
m_settingslist.SetText(SETTING_GAMMA_CORRECTION_ENABLED, g_extern.console.screen.gamma_correction ? L"Gamma correction: ON" : L"Gamma correction: OFF"); m_settingslist.SetText(SETTING_GAMMA_CORRECTION_ENABLED, g_extern.console.screen.gamma_correction ? L"Gamma correction: ON" : L"Gamma correction: OFF");
if (g_extern.lifecycle_menu_state & (1 << MODE_INFO_DRAW)) if (g_extern.lifecycle_menu_state & (1 << MODE_INFO_DRAW))
rarch_settings_msg(S_MSG_RESTART_RARCH, S_DELAY_180); rmenu_settings_msg(S_MSG_RESTART_RARCH, S_DELAY_180);
break; break;
case SETTING_SHADER: case SETTING_SHADER:
g_extern.lifecycle_menu_state |= (1 << MODE_LOAD_FIRST_SHADER); g_extern.lifecycle_menu_state |= (1 << MODE_LOAD_FIRST_SHADER);
@ -460,7 +460,7 @@ HRESULT CRetroArchSettings::OnNotifyPress( HXUIOBJ hObjPressed, int & bHandled
hCur = app.hShaderBrowser; hCur = app.hShaderBrowser;
if (g_extern.lifecycle_menu_state & (1 << MODE_INFO_DRAW)) if (g_extern.lifecycle_menu_state & (1 << MODE_INFO_DRAW))
rarch_settings_msg(S_MSG_SELECT_SHADER, S_DELAY_180); rmenu_settings_msg(S_MSG_SELECT_SHADER, S_DELAY_180);
NavigateForward(app.hShaderBrowser); NavigateForward(app.hShaderBrowser);
break; break;
@ -473,7 +473,7 @@ HRESULT CRetroArchSettings::OnNotifyPress( HXUIOBJ hObjPressed, int & bHandled
hCur = app.hShaderBrowser; hCur = app.hShaderBrowser;
if (g_extern.lifecycle_menu_state & (1 << MODE_INFO_DRAW)) if (g_extern.lifecycle_menu_state & (1 << MODE_INFO_DRAW))
rarch_settings_msg(S_MSG_SELECT_SHADER, S_DELAY_180); rmenu_settings_msg(S_MSG_SELECT_SHADER, S_DELAY_180);
NavigateForward(app.hShaderBrowser); NavigateForward(app.hShaderBrowser);
break; break;
@ -499,7 +499,7 @@ HRESULT CRetroArchSettings::OnNotifyPress( HXUIOBJ hObjPressed, int & bHandled
g_extern.file_state.zip_extract_mode++; g_extern.file_state.zip_extract_mode++;
else else
g_extern.file_state.zip_extract_mode = 0; g_extern.file_state.zip_extract_mode = 0;
rarch_settings_create_menu_item_label_w(strw_buffer, S_LBL_ZIP_EXTRACT, sizeof(strw_buffer)); rmenu_settings_create_menu_item_label_w(strw_buffer, S_LBL_ZIP_EXTRACT, sizeof(strw_buffer));
m_settingslist.SetText(SETTING_ZIP_EXTRACT, strw_buffer); m_settingslist.SetText(SETTING_ZIP_EXTRACT, strw_buffer);
break; break;
} }
@ -522,11 +522,11 @@ HRESULT CRetroArchSettings::OnControlNavigate(XUIMessageControlNavigate *pContro
switch(current_index) switch(current_index)
{ {
case SETTING_EMU_REWIND_ENABLED: case SETTING_EMU_REWIND_ENABLED:
rarch_settings_change(S_REWIND); rmenu_settings_set(S_REWIND);
m_settingslist.SetText(SETTING_EMU_REWIND_ENABLED, g_settings.rewind_enable ? L"Rewind: ON" : L"Rewind: OFF"); m_settingslist.SetText(SETTING_EMU_REWIND_ENABLED, g_settings.rewind_enable ? L"Rewind: ON" : L"Rewind: OFF");
if (g_extern.lifecycle_menu_state & (1 << MODE_INFO_DRAW)) if (g_extern.lifecycle_menu_state & (1 << MODE_INFO_DRAW))
rarch_settings_msg(S_MSG_RESTART_RARCH, S_DELAY_180); rmenu_settings_msg(S_MSG_RESTART_RARCH, S_DELAY_180);
break; break;
case SETTING_EMU_SHOW_INFO_MSG: case SETTING_EMU_SHOW_INFO_MSG:
if (g_extern.lifecycle_menu_state & (1 << MODE_INFO_DRAW)) if (g_extern.lifecycle_menu_state & (1 << MODE_INFO_DRAW))
@ -553,16 +553,16 @@ HRESULT CRetroArchSettings::OnControlNavigate(XUIMessageControlNavigate *pContro
g_extern.console.screen.gamma_correction = g_extern.console.screen.gamma_correction ? 0 : 1; g_extern.console.screen.gamma_correction = g_extern.console.screen.gamma_correction ? 0 : 1;
m_settingslist.SetText(SETTING_GAMMA_CORRECTION_ENABLED, g_extern.console.screen.gamma_correction ? L"Gamma correction: ON" : L"Gamma correction: OFF"); m_settingslist.SetText(SETTING_GAMMA_CORRECTION_ENABLED, g_extern.console.screen.gamma_correction ? L"Gamma correction: ON" : L"Gamma correction: OFF");
if (g_extern.lifecycle_menu_state & (1 << MODE_INFO_DRAW)) if (g_extern.lifecycle_menu_state & (1 << MODE_INFO_DRAW))
rarch_settings_msg(S_MSG_RESTART_RARCH, S_DELAY_180); rmenu_settings_msg(S_MSG_RESTART_RARCH, S_DELAY_180);
break; break;
case SETTING_SCALE_FACTOR: case SETTING_SCALE_FACTOR:
if(device_ptr->fbo_inited) if(device_ptr->fbo_inited)
{ {
if((g_settings.video.fbo.scale_x > MIN_SCALING_FACTOR)) if((g_settings.video.fbo.scale_x > MIN_SCALING_FACTOR))
{ {
rarch_settings_change(S_SCALE_FACTOR_DECREMENT); rmenu_settings_set(S_SCALE_FACTOR_DECREMENT);
device_ptr->ctx_driver->set_fbo(FBO_REINIT); device_ptr->ctx_driver->set_fbo(FBO_REINIT);
rarch_settings_create_menu_item_label_w(strw_buffer, S_LBL_SCALE_FACTOR, sizeof(strw_buffer)); rmenu_settings_create_menu_item_label_w(strw_buffer, S_LBL_SCALE_FACTOR, sizeof(strw_buffer));
m_settingslist.SetText(SETTING_SCALE_FACTOR, strw_buffer); m_settingslist.SetText(SETTING_SCALE_FACTOR, strw_buffer);
} }
} }
@ -570,7 +570,7 @@ HRESULT CRetroArchSettings::OnControlNavigate(XUIMessageControlNavigate *pContro
case SETTING_ZIP_EXTRACT: case SETTING_ZIP_EXTRACT:
if(g_extern.file_state.zip_extract_mode) if(g_extern.file_state.zip_extract_mode)
g_extern.file_state.zip_extract_mode--; g_extern.file_state.zip_extract_mode--;
rarch_settings_create_menu_item_label_w(strw_buffer, S_LBL_ZIP_EXTRACT, sizeof(strw_buffer)); rmenu_settings_create_menu_item_label_w(strw_buffer, S_LBL_ZIP_EXTRACT, sizeof(strw_buffer));
m_settingslist.SetText(SETTING_ZIP_EXTRACT, strw_buffer); m_settingslist.SetText(SETTING_ZIP_EXTRACT, strw_buffer);
break; break;
case SETTING_HW_TEXTURE_FILTER: case SETTING_HW_TEXTURE_FILTER:
@ -621,23 +621,23 @@ HRESULT CRetroArchSettings::OnControlNavigate(XUIMessageControlNavigate *pContro
g_extern.console.screen.gamma_correction = g_extern.console.screen.gamma_correction ? 0 : 1; g_extern.console.screen.gamma_correction = g_extern.console.screen.gamma_correction ? 0 : 1;
m_settingslist.SetText(SETTING_GAMMA_CORRECTION_ENABLED, g_extern.console.screen.gamma_correction ? L"Gamma correction: ON" : L"Gamma correction: OFF"); m_settingslist.SetText(SETTING_GAMMA_CORRECTION_ENABLED, g_extern.console.screen.gamma_correction ? L"Gamma correction: ON" : L"Gamma correction: OFF");
if (g_extern.lifecycle_menu_state & (1 << MODE_INFO_DRAW)) if (g_extern.lifecycle_menu_state & (1 << MODE_INFO_DRAW))
rarch_settings_msg(S_MSG_RESTART_RARCH, S_DELAY_180); rmenu_settings_msg(S_MSG_RESTART_RARCH, S_DELAY_180);
break; break;
case SETTING_EMU_REWIND_ENABLED: case SETTING_EMU_REWIND_ENABLED:
rarch_settings_change(S_REWIND); rmenu_settings_set(S_REWIND);
m_settingslist.SetText(SETTING_EMU_REWIND_ENABLED, g_settings.rewind_enable ? L"Rewind: ON" : L"Rewind: OFF"); m_settingslist.SetText(SETTING_EMU_REWIND_ENABLED, g_settings.rewind_enable ? L"Rewind: ON" : L"Rewind: OFF");
if (g_extern.lifecycle_menu_state & (1 << MODE_INFO_DRAW)) if (g_extern.lifecycle_menu_state & (1 << MODE_INFO_DRAW))
rarch_settings_msg(S_MSG_RESTART_RARCH, S_DELAY_180); rmenu_settings_msg(S_MSG_RESTART_RARCH, S_DELAY_180);
break; break;
case SETTING_SCALE_FACTOR: case SETTING_SCALE_FACTOR:
if(device_ptr->fbo_inited) if(device_ptr->fbo_inited)
{ {
if((g_settings.video.fbo.scale_x < MAX_SCALING_FACTOR)) if((g_settings.video.fbo.scale_x < MAX_SCALING_FACTOR))
{ {
rarch_settings_change(S_SCALE_FACTOR_INCREMENT); rmenu_settings_set(S_SCALE_FACTOR_INCREMENT);
device_ptr->ctx_driver->set_fbo(FBO_REINIT); device_ptr->ctx_driver->set_fbo(FBO_REINIT);
rarch_settings_create_menu_item_label_w(strw_buffer, S_LBL_SCALE_FACTOR, sizeof(strw_buffer)); rmenu_settings_create_menu_item_label_w(strw_buffer, S_LBL_SCALE_FACTOR, sizeof(strw_buffer));
m_settingslist.SetText(SETTING_SCALE_FACTOR, strw_buffer); m_settingslist.SetText(SETTING_SCALE_FACTOR, strw_buffer);
} }
} }
@ -645,7 +645,7 @@ HRESULT CRetroArchSettings::OnControlNavigate(XUIMessageControlNavigate *pContro
case SETTING_ZIP_EXTRACT: case SETTING_ZIP_EXTRACT:
if(g_extern.file_state.zip_extract_mode < ZIP_EXTRACT_TO_CACHE_DIR) if(g_extern.file_state.zip_extract_mode < ZIP_EXTRACT_TO_CACHE_DIR)
g_extern.file_state.zip_extract_mode++; g_extern.file_state.zip_extract_mode++;
rarch_settings_create_menu_item_label_w(strw_buffer, S_LBL_ZIP_EXTRACT, sizeof(strw_buffer)); rmenu_settings_create_menu_item_label_w(strw_buffer, S_LBL_ZIP_EXTRACT, sizeof(strw_buffer));
m_settingslist.SetText(SETTING_ZIP_EXTRACT, strw_buffer); m_settingslist.SetText(SETTING_ZIP_EXTRACT, strw_buffer);
break; break;
case SETTING_HW_TEXTURE_FILTER: case SETTING_HW_TEXTURE_FILTER:
@ -696,16 +696,16 @@ HRESULT CRetroArchQuickMenu::OnInit(XUIMessageInit * pInitData, BOOL& bHandled)
GetChildById(L"XuiQuickMenuList", &m_quickmenulist); GetChildById(L"XuiQuickMenuList", &m_quickmenulist);
GetChildById(L"XuiBackButton", &m_back); GetChildById(L"XuiBackButton", &m_back);
rarch_settings_create_menu_item_label_w(strw_buffer, S_LBL_ROTATION, sizeof(strw_buffer)); rmenu_settings_create_menu_item_label_w(strw_buffer, S_LBL_ROTATION, sizeof(strw_buffer));
m_quickmenulist.SetText(MENU_ITEM_ORIENTATION, strw_buffer); m_quickmenulist.SetText(MENU_ITEM_ORIENTATION, strw_buffer);
rarch_settings_create_menu_item_label_w(strw_buffer, S_LBL_ASPECT_RATIO, sizeof(strw_buffer)); rmenu_settings_create_menu_item_label_w(strw_buffer, S_LBL_ASPECT_RATIO, sizeof(strw_buffer));
m_quickmenulist.SetText(MENU_ITEM_KEEP_ASPECT_RATIO, strw_buffer); m_quickmenulist.SetText(MENU_ITEM_KEEP_ASPECT_RATIO, strw_buffer);
rarch_settings_create_menu_item_label_w(strw_buffer, S_LBL_LOAD_STATE_SLOT, sizeof(strw_buffer)); rmenu_settings_create_menu_item_label_w(strw_buffer, S_LBL_LOAD_STATE_SLOT, sizeof(strw_buffer));
m_quickmenulist.SetText(MENU_ITEM_LOAD_STATE, strw_buffer); m_quickmenulist.SetText(MENU_ITEM_LOAD_STATE, strw_buffer);
rarch_settings_create_menu_item_label_w(strw_buffer, S_LBL_SAVE_STATE_SLOT, sizeof(strw_buffer)); rmenu_settings_create_menu_item_label_w(strw_buffer, S_LBL_SAVE_STATE_SLOT, sizeof(strw_buffer));
m_quickmenulist.SetText(MENU_ITEM_SAVE_STATE, strw_buffer); m_quickmenulist.SetText(MENU_ITEM_SAVE_STATE, strw_buffer);
return 0; return 0;
@ -726,18 +726,18 @@ HRESULT CRetroArchQuickMenu::OnControlNavigate(XUIMessageControlNavigate *pContr
case MENU_ITEM_LOAD_STATE: case MENU_ITEM_LOAD_STATE:
case MENU_ITEM_SAVE_STATE: case MENU_ITEM_SAVE_STATE:
rarch_state_slot_decrease(); rarch_state_slot_decrease();
rarch_settings_create_menu_item_label_w(strw_buffer, S_LBL_LOAD_STATE_SLOT, sizeof(strw_buffer)); rmenu_settings_create_menu_item_label_w(strw_buffer, S_LBL_LOAD_STATE_SLOT, sizeof(strw_buffer));
m_quickmenulist.SetText(MENU_ITEM_LOAD_STATE, strw_buffer); m_quickmenulist.SetText(MENU_ITEM_LOAD_STATE, strw_buffer);
rarch_settings_create_menu_item_label_w(strw_buffer, S_LBL_SAVE_STATE_SLOT, sizeof(strw_buffer)); rmenu_settings_create_menu_item_label_w(strw_buffer, S_LBL_SAVE_STATE_SLOT, sizeof(strw_buffer));
m_quickmenulist.SetText(MENU_ITEM_SAVE_STATE, strw_buffer); m_quickmenulist.SetText(MENU_ITEM_SAVE_STATE, strw_buffer);
break; break;
case MENU_ITEM_KEEP_ASPECT_RATIO: case MENU_ITEM_KEEP_ASPECT_RATIO:
rarch_settings_change(S_ASPECT_RATIO_DECREMENT); rmenu_settings_set(S_ASPECT_RATIO_DECREMENT);
aspectratio_changed = true; aspectratio_changed = true;
break; break;
case MENU_ITEM_ORIENTATION: case MENU_ITEM_ORIENTATION:
rarch_settings_change(S_ROTATION_DECREMENT); rmenu_settings_set(S_ROTATION_DECREMENT);
rarch_settings_create_menu_item_label_w(strw_buffer, S_LBL_ROTATION, sizeof(strw_buffer)); rmenu_settings_create_menu_item_label_w(strw_buffer, S_LBL_ROTATION, sizeof(strw_buffer));
m_quickmenulist.SetText(MENU_ITEM_ORIENTATION, strw_buffer); m_quickmenulist.SetText(MENU_ITEM_ORIENTATION, strw_buffer);
driver.video->set_rotation(driver.video_data, g_extern.console.screen.orientation); driver.video->set_rotation(driver.video_data, g_extern.console.screen.orientation);
break; break;
@ -751,18 +751,18 @@ HRESULT CRetroArchQuickMenu::OnControlNavigate(XUIMessageControlNavigate *pContr
case MENU_ITEM_LOAD_STATE: case MENU_ITEM_LOAD_STATE:
case MENU_ITEM_SAVE_STATE: case MENU_ITEM_SAVE_STATE:
rarch_state_slot_increase(); rarch_state_slot_increase();
rarch_settings_create_menu_item_label_w(strw_buffer, S_LBL_LOAD_STATE_SLOT, sizeof(strw_buffer)); rmenu_settings_create_menu_item_label_w(strw_buffer, S_LBL_LOAD_STATE_SLOT, sizeof(strw_buffer));
m_quickmenulist.SetText(MENU_ITEM_LOAD_STATE, strw_buffer); m_quickmenulist.SetText(MENU_ITEM_LOAD_STATE, strw_buffer);
rarch_settings_create_menu_item_label_w(strw_buffer, S_LBL_SAVE_STATE_SLOT, sizeof(strw_buffer)); rmenu_settings_create_menu_item_label_w(strw_buffer, S_LBL_SAVE_STATE_SLOT, sizeof(strw_buffer));
m_quickmenulist.SetText(MENU_ITEM_SAVE_STATE, strw_buffer); m_quickmenulist.SetText(MENU_ITEM_SAVE_STATE, strw_buffer);
break; break;
case MENU_ITEM_KEEP_ASPECT_RATIO: case MENU_ITEM_KEEP_ASPECT_RATIO:
rarch_settings_change(S_ASPECT_RATIO_INCREMENT); rmenu_settings_set(S_ASPECT_RATIO_INCREMENT);
aspectratio_changed = true; aspectratio_changed = true;
break; break;
case MENU_ITEM_ORIENTATION: case MENU_ITEM_ORIENTATION:
rarch_settings_change(S_ROTATION_INCREMENT); rmenu_settings_set(S_ROTATION_INCREMENT);
rarch_settings_create_menu_item_label_w(strw_buffer, S_LBL_ROTATION, sizeof(strw_buffer)); rmenu_settings_create_menu_item_label_w(strw_buffer, S_LBL_ROTATION, sizeof(strw_buffer));
m_quickmenulist.SetText(MENU_ITEM_ORIENTATION, strw_buffer); m_quickmenulist.SetText(MENU_ITEM_ORIENTATION, strw_buffer);
driver.video->set_rotation(driver.video_data, g_extern.console.screen.orientation); driver.video->set_rotation(driver.video_data, g_extern.console.screen.orientation);
break; break;
@ -778,7 +778,7 @@ HRESULT CRetroArchQuickMenu::OnControlNavigate(XUIMessageControlNavigate *pContr
if(aspectratio_changed) if(aspectratio_changed)
{ {
driver.video->set_aspect_ratio(driver.video_data, g_settings.video.aspect_ratio_idx); driver.video->set_aspect_ratio(driver.video_data, g_settings.video.aspect_ratio_idx);
rarch_settings_create_menu_item_label_w(strw_buffer, S_LBL_ASPECT_RATIO, sizeof(strw_buffer)); rmenu_settings_create_menu_item_label_w(strw_buffer, S_LBL_ASPECT_RATIO, sizeof(strw_buffer));
m_quickmenulist.SetText(MENU_ITEM_KEEP_ASPECT_RATIO, strw_buffer); m_quickmenulist.SetText(MENU_ITEM_KEEP_ASPECT_RATIO, strw_buffer);
} }
@ -828,18 +828,18 @@ HRESULT CRetroArchQuickMenu::OnNotifyPress( HXUIOBJ hObjPressed, int & bHandled
} }
break; break;
case MENU_ITEM_KEEP_ASPECT_RATIO: case MENU_ITEM_KEEP_ASPECT_RATIO:
rarch_settings_default(S_DEF_ASPECT_RATIO); rmenu_settings_set_default(S_DEF_ASPECT_RATIO);
driver.video->set_aspect_ratio(driver.video_data, g_settings.video.aspect_ratio_idx); driver.video->set_aspect_ratio(driver.video_data, g_settings.video.aspect_ratio_idx);
rarch_settings_create_menu_item_label_w(strw_buffer, S_LBL_ASPECT_RATIO, sizeof(strw_buffer)); rmenu_settings_create_menu_item_label_w(strw_buffer, S_LBL_ASPECT_RATIO, sizeof(strw_buffer));
m_quickmenulist.SetText(MENU_ITEM_KEEP_ASPECT_RATIO, strw_buffer); m_quickmenulist.SetText(MENU_ITEM_KEEP_ASPECT_RATIO, strw_buffer);
break; break;
case MENU_ITEM_OVERSCAN_AMOUNT: case MENU_ITEM_OVERSCAN_AMOUNT:
if (g_extern.lifecycle_menu_state & (1 << MODE_INFO_DRAW)) if (g_extern.lifecycle_menu_state & (1 << MODE_INFO_DRAW))
rarch_settings_msg(S_MSG_NOT_IMPLEMENTED, S_DELAY_180); rmenu_settings_msg(S_MSG_NOT_IMPLEMENTED, S_DELAY_180);
break; break;
case MENU_ITEM_ORIENTATION: case MENU_ITEM_ORIENTATION:
rarch_settings_default(S_DEF_ROTATION); rmenu_settings_set_default(S_DEF_ROTATION);
rarch_settings_create_menu_item_label_w(strw_buffer, S_LBL_ROTATION, sizeof(strw_buffer)); rmenu_settings_create_menu_item_label_w(strw_buffer, S_LBL_ROTATION, sizeof(strw_buffer));
m_quickmenulist.SetText(MENU_ITEM_ORIENTATION, strw_buffer); m_quickmenulist.SetText(MENU_ITEM_ORIENTATION, strw_buffer);
driver.video->set_rotation(driver.video_data, g_extern.console.screen.orientation); driver.video->set_rotation(driver.video_data, g_extern.console.screen.orientation);
break; break;
@ -847,13 +847,13 @@ HRESULT CRetroArchQuickMenu::OnNotifyPress( HXUIOBJ hObjPressed, int & bHandled
input_loop = INPUT_LOOP_RESIZE_MODE; input_loop = INPUT_LOOP_RESIZE_MODE;
if (g_extern.lifecycle_menu_state & (1 << MODE_INFO_DRAW)) if (g_extern.lifecycle_menu_state & (1 << MODE_INFO_DRAW))
rarch_settings_msg(S_MSG_RESIZE_SCREEN, S_DELAY_270); rmenu_settings_msg(S_MSG_RESIZE_SCREEN, S_DELAY_270);
break; break;
case MENU_ITEM_FRAME_ADVANCE: case MENU_ITEM_FRAME_ADVANCE:
if (g_extern.main_is_init) if (g_extern.main_is_init)
{ {
g_extern.lifecycle_state |= (1ULL << RARCH_FRAMEADVANCE); g_extern.lifecycle_state |= (1ULL << RARCH_FRAMEADVANCE);
rarch_settings_change(S_FRAME_ADVANCE); rmenu_settings_set(S_FRAME_ADVANCE);
process_input_ret = -1; process_input_ret = -1;
} }
break; break;
@ -921,7 +921,7 @@ HRESULT CRetroArchShaderBrowser::OnNotifyPress( HXUIOBJ hObjPressed, BOOL& bHand
{ {
driver.video->set_shader(driver.video_data, (enum rarch_shader_type)g_settings.video.shader_type, g_settings.video.cg_shader_path, RARCH_SHADER_INDEX_PASS0); driver.video->set_shader(driver.video_data, (enum rarch_shader_type)g_settings.video.shader_type, g_settings.video.cg_shader_path, RARCH_SHADER_INDEX_PASS0);
if (g_extern.lifecycle_menu_state & (1 << MODE_INFO_DRAW)) if (g_extern.lifecycle_menu_state & (1 << MODE_INFO_DRAW))
rarch_settings_msg(S_MSG_SHADER_LOADING_SUCCEEDED, S_DELAY_180); rmenu_settings_msg(S_MSG_SHADER_LOADING_SUCCEEDED, S_DELAY_180);
} }
else else
RARCH_ERR("Shaders are unsupported on this platform.\n"); RARCH_ERR("Shaders are unsupported on this platform.\n");
@ -935,7 +935,7 @@ HRESULT CRetroArchShaderBrowser::OnNotifyPress( HXUIOBJ hObjPressed, BOOL& bHand
{ {
driver.video->set_shader(driver.video_data, (enum rarch_shader_type)g_settings.video.shader_type, g_settings.video.second_pass_shader, RARCH_SHADER_INDEX_PASS1); driver.video->set_shader(driver.video_data, (enum rarch_shader_type)g_settings.video.shader_type, g_settings.video.second_pass_shader, RARCH_SHADER_INDEX_PASS1);
if (g_extern.lifecycle_menu_state & (1 << MODE_INFO_DRAW)) if (g_extern.lifecycle_menu_state & (1 << MODE_INFO_DRAW))
rarch_settings_msg(S_MSG_SHADER_LOADING_SUCCEEDED, S_DELAY_180); rmenu_settings_msg(S_MSG_SHADER_LOADING_SUCCEEDED, S_DELAY_180);
} }
else else
RARCH_ERR("Shaders are unsupported on this platform.\n"); RARCH_ERR("Shaders are unsupported on this platform.\n");
@ -1014,7 +1014,7 @@ HRESULT CRetroArchMain::OnInit(XUIMessageInit * pInitData, BOOL& bHandled)
convert_char_to_wchar(strw_buffer, g_extern.title_buf, sizeof(strw_buffer)); convert_char_to_wchar(strw_buffer, g_extern.title_buf, sizeof(strw_buffer));
m_core.SetText(strw_buffer); m_core.SetText(strw_buffer);
rarch_settings_create_menu_item_label_w(strw_buffer, S_LBL_RARCH_VERSION, sizeof(strw_buffer)); rmenu_settings_create_menu_item_label_w(strw_buffer, S_LBL_RARCH_VERSION, sizeof(strw_buffer));
m_title.SetText(strw_buffer); m_title.SetText(strw_buffer);
return 0; return 0;
@ -1059,7 +1059,7 @@ HRESULT CRetroArchMain::OnNotifyPress( HXUIOBJ hObjPressed, int & bHandled )
hCur = app.hControlsMenu; hCur = app.hControlsMenu;
if (g_extern.lifecycle_menu_state & (1 << MODE_INFO_DRAW)) if (g_extern.lifecycle_menu_state & (1 << MODE_INFO_DRAW))
rarch_settings_msg(S_MSG_CHANGE_CONTROLS, S_DELAY_180); rmenu_settings_msg(S_MSG_CHANGE_CONTROLS, S_DELAY_180);
NavigateForward(app.hControlsMenu); NavigateForward(app.hControlsMenu);
} }
@ -1072,7 +1072,7 @@ HRESULT CRetroArchMain::OnNotifyPress( HXUIOBJ hObjPressed, int & bHandled )
hCur = app.hCoreBrowser; hCur = app.hCoreBrowser;
if (g_extern.lifecycle_menu_state & (1 << MODE_INFO_DRAW)) if (g_extern.lifecycle_menu_state & (1 << MODE_INFO_DRAW))
rarch_settings_msg(S_MSG_SELECT_LIBRETRO_CORE, S_DELAY_180); rmenu_settings_msg(S_MSG_SELECT_LIBRETRO_CORE, S_DELAY_180);
NavigateForward(app.hCoreBrowser); NavigateForward(app.hCoreBrowser);
} }
@ -1227,7 +1227,7 @@ bool rmenu_iterate(void)
if (g_extern.lifecycle_menu_state & (1 << MODE_LOAD_GAME)) if (g_extern.lifecycle_menu_state & (1 << MODE_LOAD_GAME))
{ {
if (g_extern.lifecycle_menu_state & (1 << MODE_INFO_DRAW)) if (g_extern.lifecycle_menu_state & (1 << MODE_INFO_DRAW))
rarch_settings_msg(S_MSG_LOADING_ROM, 100); rmenu_settings_msg(S_MSG_LOADING_ROM, 100);
g_extern.lifecycle_menu_state |= (1 << MODE_INIT); g_extern.lifecycle_menu_state |= (1 << MODE_INIT);
g_extern.lifecycle_menu_state &= ~(1 << MODE_LOAD_GAME); g_extern.lifecycle_menu_state &= ~(1 << MODE_LOAD_GAME);

2
frontend/platform/platform_gx.c
View File

@ -23,8 +23,6 @@
#include "platform_inl.h" #include "platform_inl.h"
#include "../../console/rarch_console.h" #include "../../console/rarch_console.h"
#include "../../console/rarch_console_input.h"
#include "../../console/rarch_console_settings.h"
#include "../../file.h" #include "../../file.h"
#if defined(HW_RVL) && !defined(IS_SALAMANDER) #if defined(HW_RVL) && !defined(IS_SALAMANDER)

1
frontend/platform/platform_ps3.c
View File

@ -22,7 +22,6 @@
#include "../../ps3/ps3_input.h" #include "../../ps3/ps3_input.h"
#include "../../console/rarch_console.h" #include "../../console/rarch_console.h"
#include "../../console/rarch_console_settings.h"
#include "../../conf/config_file.h" #include "../../conf/config_file.h"
#include "../../general.h" #include "../../general.h"
#include "../../file.h" #include "../../file.h"