mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-09 09:39:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

(PS3) Use rarch_settings_create_menu_item_label in PS3 port now too

Browse Source
This commit is contained in:
Twinaphex 2012-05-29 22:22:47 +02:00
parent 841304619d
commit 369e99efa8
3 changed files with 45 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
console/console_settings.c
View File

@ -83,14 +83,19 @@ void rarch_settings_change(unsigned setting)
g_console.ingame_menu_item = 0; g_console.ingame_menu_item = 0;
g_console.mode_switch = MODE_MENU; g_console.mode_switch = MODE_MENU;
break; break;
case S_ROTATION_DECREMENT: case S_ROTATION_DECREMENT:
if(g_console.screen_orientation > 0) if(g_console.screen_orientation > 0)
g_console.screen_orientation--; g_console.screen_orientation--;
break; break;
case S_ROTATION_INCREMENT: case S_ROTATION_INCREMENT:
if(g_console.screen_orientation < LAST_ORIENTATION) if(g_console.screen_orientation < LAST_ORIENTATION)
g_console.screen_orientation++; g_console.screen_orientation++;
break; break;
case S_START_RARCH:
g_console.menu_enable = false;
g_console.initialize_rarch_enable = 1;
g_console.mode_switch = MODE_EMULATION;
break;
case S_REWIND: case S_REWIND:
g_settings.rewind_enable = !g_settings.rewind_enable; g_settings.rewind_enable = !g_settings.rewind_enable;
break; break;

1
console/console_settings.h
View File

@ -45,6 +45,7 @@ enum
S_SCALE_ENABLED, S_SCALE_ENABLED,
S_SCALE_FACTOR_DECREMENT, S_SCALE_FACTOR_DECREMENT,
S_SCALE_FACTOR_INCREMENT, S_SCALE_FACTOR_INCREMENT,
S_START_RARCH,
S_THROTTLE, S_THROTTLE,
S_TRIPLE_BUFFERING S_TRIPLE_BUFFERING
}; };

102
ps3/menu.c
View File

@ -53,6 +53,7 @@ filebrowser_t browser; /* main file browser->for rom browser*/
filebrowser_t tmpBrowser; /* tmp file browser->for everything else*/ filebrowser_t tmpBrowser; /* tmp file browser->for everything else*/
uint32_t set_shader = 0; uint32_t set_shader = 0;
static uint32_t currently_selected_controller_menu = 0; static uint32_t currently_selected_controller_menu = 0;
static char strw_buffer[PATH_MAX];
static menu menu_filebrowser = { static menu menu_filebrowser = {
"FILE BROWSER |", /* title*/ "FILE BROWSER |", /* title*/
@ -1283,26 +1284,20 @@ static void producesettingentry(menu * menu_obj, uint64_t switchvalue)
case SETTING_KEEP_ASPECT_RATIO: case SETTING_KEEP_ASPECT_RATIO:
if(CTRL_LEFT(state) || CTRL_LSTICK_LEFT(state)) if(CTRL_LEFT(state) || CTRL_LSTICK_LEFT(state))
{ {
if(g_console.aspect_ratio_index > 0) rarch_settings_change(S_ASPECT_RATIO_DECREMENT);
{ gfx_ctx_set_aspect_ratio(NULL, g_console.aspect_ratio_index);
rarch_settings_change(S_ASPECT_RATIO_DECREMENT); set_delay = DELAY_SMALL;
gfx_ctx_set_aspect_ratio(NULL, g_console.aspect_ratio_index);
set_delay = DELAY_SMALL;
}
} }
if(CTRL_RIGHT(state) || CTRL_LSTICK_RIGHT(state)) if(CTRL_RIGHT(state) || CTRL_LSTICK_RIGHT(state))
{ {
if(g_console.aspect_ratio_index < ASPECT_RATIO_END-1) rarch_settings_change(S_ASPECT_RATIO_INCREMENT);
{ gfx_ctx_set_aspect_ratio(NULL, g_console.aspect_ratio_index);
rarch_settings_change(S_ASPECT_RATIO_INCREMENT); set_delay = DELAY_SMALL;
gfx_ctx_set_aspect_ratio(NULL, g_console.aspect_ratio_index);
set_delay = DELAY_SMALL;
}
} }
if(CTRL_START(state)) if(CTRL_START(state))
{ {
rarch_settings_default(S_DEF_ASPECT_RATIO); rarch_settings_default(S_DEF_ASPECT_RATIO);
gfx_ctx_set_aspect_ratio(NULL, g_console.aspect_ratio_index); gfx_ctx_set_aspect_ratio(NULL, g_console.aspect_ratio_index);
} }
break; break;
case SETTING_HW_TEXTURE_FILTER: case SETTING_HW_TEXTURE_FILTER:
@ -1948,10 +1943,8 @@ static void select_rom(void)
rarch_extract_zipfile(rom_path_temp); rarch_extract_zipfile(rom_path_temp);
else else
{ {
g_console.menu_enable = false;
snprintf(g_console.rom_path, sizeof(g_console.rom_path), "%s/%s", FILEBROWSER_GET_CURRENT_DIRECTORY_NAME(browser), FILEBROWSER_GET_CURRENT_FILENAME(browser)); snprintf(g_console.rom_path, sizeof(g_console.rom_path), "%s/%s", FILEBROWSER_GET_CURRENT_DIRECTORY_NAME(browser), FILEBROWSER_GET_CURRENT_FILENAME(browser));
g_console.initialize_rarch_enable = 1; rarch_settings_change(S_START_RARCH);
g_console.mode_switch = MODE_EMULATION;
} }
} }
} }
@ -1990,7 +1983,7 @@ static void select_rom(void)
static void ingame_menu(uint32_t menu_id) static void ingame_menu(uint32_t menu_id)
{ {
char comment[256], msg_temp[256]; char comment[256];
static uint32_t menuitem_colors[MENU_ITEM_LAST]; static uint32_t menuitem_colors[MENU_ITEM_LAST];
uint64_t state, stuck_in_loop; uint64_t state, stuck_in_loop;
static uint64_t blocking; static uint64_t blocking;
@ -2064,21 +2057,15 @@ static void ingame_menu(uint32_t menu_id)
case MENU_ITEM_KEEP_ASPECT_RATIO: case MENU_ITEM_KEEP_ASPECT_RATIO:
if(CTRL_LEFT(state) || CTRL_LSTICK_LEFT(state)) if(CTRL_LEFT(state) || CTRL_LSTICK_LEFT(state))
{ {
if(g_console.aspect_ratio_index > 0) rarch_settings_change(S_ASPECT_RATIO_DECREMENT);
{ gfx_ctx_set_aspect_ratio(NULL, g_console.aspect_ratio_index);
rarch_settings_change(S_ASPECT_RATIO_DECREMENT); set_delay = DELAY_MEDIUM;
gfx_ctx_set_aspect_ratio(NULL, g_console.aspect_ratio_index);
set_delay = DELAY_MEDIUM;
}
} }
if(CTRL_RIGHT(state) || CTRL_LSTICK_RIGHT(state)) if(CTRL_RIGHT(state) || CTRL_LSTICK_RIGHT(state))
{ {
if(g_console.aspect_ratio_index < ASPECT_RATIO_END-1) rarch_settings_change(S_ASPECT_RATIO_INCREMENT);
{ gfx_ctx_set_aspect_ratio(NULL, g_console.aspect_ratio_index);
rarch_settings_change(S_ASPECT_RATIO_INCREMENT); set_delay = DELAY_MEDIUM;
gfx_ctx_set_aspect_ratio(NULL, g_console.aspect_ratio_index);
set_delay = DELAY_MEDIUM;
}
} }
if(CTRL_START(state)) if(CTRL_START(state))
{ {
@ -2110,29 +2097,21 @@ static void ingame_menu(uint32_t menu_id)
case MENU_ITEM_ORIENTATION: case MENU_ITEM_ORIENTATION:
if(CTRL_LEFT(state) || CTRL_LSTICK_LEFT(state) || CTRL_CROSS(state) || CTRL_LSTICK_LEFT(state)) if(CTRL_LEFT(state) || CTRL_LSTICK_LEFT(state) || CTRL_CROSS(state) || CTRL_LSTICK_LEFT(state))
{ {
bool should_rotate_decrement = g_console.screen_orientation > ORIENTATION_NORMAL; rarch_settings_change(S_ROTATION_DECREMENT);
if(should_rotate_decrement) video_gl.set_rotation(NULL, g_console.screen_orientation);
{ set_delay = DELAY_MEDIUM;
rarch_settings_change(S_ROTATION_DECREMENT);
video_gl.set_rotation(NULL, g_console.screen_orientation);
set_delay = DELAY_MEDIUM;
}
} }
if(CTRL_RIGHT(state) || CTRL_LSTICK_RIGHT(state) || CTRL_CROSS(state) || CTRL_LSTICK_RIGHT(state)) if(CTRL_RIGHT(state) || CTRL_LSTICK_RIGHT(state) || CTRL_CROSS(state) || CTRL_LSTICK_RIGHT(state))
{ {
bool should_rotate_increment = (g_console.screen_orientation+1) < ORIENTATION_END; rarch_settings_change(S_ROTATION_INCREMENT);
if(should_rotate_increment) video_gl.set_rotation(NULL, g_console.screen_orientation);
{ set_delay = DELAY_MEDIUM;
rarch_settings_change(S_ROTATION_INCREMENT);
video_gl.set_rotation(NULL, g_console.screen_orientation);
set_delay = DELAY_MEDIUM;
}
} }
if(CTRL_START(state)) if(CTRL_START(state))
{ {
g_console.screen_orientation = ORIENTATION_NORMAL; rarch_settings_default(S_DEF_ROTATION);
video_gl.set_rotation(NULL, g_console.screen_orientation); video_gl.set_rotation(NULL, g_console.screen_orientation);
} }
strlcpy(comment, "Press LEFT or RIGHT to change the [Orientation] settings.\nPress START to reset back to default values.", sizeof(comment)); strlcpy(comment, "Press LEFT or RIGHT to change the [Orientation] settings.\nPress START to reset back to default values.", sizeof(comment));
@ -2241,7 +2220,7 @@ static void ingame_menu(uint32_t menu_id)
cellDbgFontPuts (0.09f, 0.05f, FONT_SIZE, RED, "QUICK MENU"); cellDbgFontPuts (0.09f, 0.05f, FONT_SIZE, RED, "QUICK MENU");
cellDbgFontPrintf (0.3f, 0.05f, 0.82f, WHITE, "Libretro core: %s", id); cellDbgFontPrintf (0.3f, 0.05f, 0.82f, WHITE, "Libretro core: %s", id);
cellDbgFontPrintf (0.9f, 0.09f, 0.82f, WHITE, "v%s", EMULATOR_VERSION); cellDbgFontPrintf (0.8f, 0.09f, 0.82f, WHITE, "v%s", EMULATOR_VERSION);
cellDbgFontPrintf(x_position, 0.14f, 1.4f, WHITE, "Resize Mode"); cellDbgFontPrintf(x_position, 0.14f, 1.4f, WHITE, "Resize Mode");
cellDbgFontPrintf(x_position, ypos, font_size, GREEN, "Viewport X: #%d", g_console.viewports.custom_vp.x); cellDbgFontPrintf(x_position, ypos, font_size, GREEN, "Viewport X: #%d", g_console.viewports.custom_vp.x);
@ -2411,37 +2390,26 @@ static void ingame_menu(uint32_t menu_id)
} }
switch(g_console.screen_orientation)
{
case ORIENTATION_NORMAL:
snprintf(msg_temp, sizeof(msg_temp), "Normal");
break;
case ORIENTATION_VERTICAL:
snprintf(msg_temp, sizeof(msg_temp), "Vertical");
break;
case ORIENTATION_FLIPPED:
snprintf(msg_temp, sizeof(msg_temp), "Flipped");
break;
case ORIENTATION_FLIPPED_ROTATED:
snprintf(msg_temp, sizeof(msg_temp), "Flipped Rotated");
break;
}
cellDbgFontPrintf(x_position, 0.14f, 1.4f, WHITE, "Quick Menu"); cellDbgFontPrintf(x_position, 0.14f, 1.4f, WHITE, "Quick Menu");
cellDbgFontPrintf(x_position, ypos, font_size, MENU_ITEM_SELECTED(MENU_ITEM_LOAD_STATE), "Load State #%d", g_extern.state_slot); rarch_settings_create_menu_item_label(strw_buffer, S_LBL_LOAD_STATE_SLOT, sizeof(strw_buffer));
cellDbgFontPrintf(x_position, ypos, font_size, MENU_ITEM_SELECTED(MENU_ITEM_LOAD_STATE), strw_buffer);
cellDbgFontPrintf(x_position, ypos+(ypos_increment*MENU_ITEM_SAVE_STATE), font_size, MENU_ITEM_SELECTED(MENU_ITEM_SAVE_STATE), "Save State #%d", g_extern.state_slot); rarch_settings_create_menu_item_label(strw_buffer, S_LBL_SAVE_STATE_SLOT, sizeof(strw_buffer));
cellDbgFontPrintf(x_position, ypos+(ypos_increment*MENU_ITEM_SAVE_STATE), font_size, MENU_ITEM_SELECTED(MENU_ITEM_SAVE_STATE), strw_buffer);
cellDbgFontDraw(); cellDbgFontDraw();
cellDbgFontPrintf(x_position, (ypos+(ypos_increment*MENU_ITEM_KEEP_ASPECT_RATIO)), font_size, MENU_ITEM_SELECTED(MENU_ITEM_KEEP_ASPECT_RATIO), "Aspect Ratio: %s", aspectratio_lut[g_console.aspect_ratio_index].name); rarch_settings_create_menu_item_label(strw_buffer, S_LBL_ASPECT_RATIO, sizeof(strw_buffer));
cellDbgFontPrintf(x_position, (ypos+(ypos_increment*MENU_ITEM_KEEP_ASPECT_RATIO)), font_size, MENU_ITEM_SELECTED(MENU_ITEM_KEEP_ASPECT_RATIO), strw_buffer);
cellDbgFontPrintf(x_position, (ypos+(ypos_increment*MENU_ITEM_OVERSCAN_AMOUNT)), font_size, MENU_ITEM_SELECTED(MENU_ITEM_OVERSCAN_AMOUNT), "Overscan: %f", g_console.overscan_amount); cellDbgFontPrintf(x_position, (ypos+(ypos_increment*MENU_ITEM_OVERSCAN_AMOUNT)), font_size, MENU_ITEM_SELECTED(MENU_ITEM_OVERSCAN_AMOUNT), "Overscan: %f", g_console.overscan_amount);
cellDbgFontPrintf (x_position, (ypos+(ypos_increment*MENU_ITEM_ORIENTATION)), font_size, MENU_ITEM_SELECTED(MENU_ITEM_ORIENTATION), "Orientation: %s", msg_temp); rarch_settings_create_menu_item_label(strw_buffer, S_LBL_ROTATION, sizeof(strw_buffer));
cellDbgFontPrintf (x_position, (ypos+(ypos_increment*MENU_ITEM_ORIENTATION)), font_size, MENU_ITEM_SELECTED(MENU_ITEM_ORIENTATION), strw_buffer);
cellDbgFontDraw(); cellDbgFontDraw();
cellDbgFontPrintf (x_position, (ypos+(ypos_increment*MENU_ITEM_SCALE_FACTOR)), font_size, MENU_ITEM_SELECTED(MENU_ITEM_SCALE_FACTOR), "Scale Factor: %d", (int)(g_settings.video.fbo_scale_x)); rarch_settings_create_menu_item_label(strw_buffer, S_LBL_SCALE_FACTOR, sizeof(strw_buffer));
cellDbgFontPrintf (x_position, (ypos+(ypos_increment*MENU_ITEM_SCALE_FACTOR)), font_size, MENU_ITEM_SELECTED(MENU_ITEM_SCALE_FACTOR), strw_buffer);
cellDbgFontDraw(); cellDbgFontDraw();
cellDbgFontPrintf(x_position, (ypos+(ypos_increment*MENU_ITEM_RESIZE_MODE)), font_size, MENU_ITEM_SELECTED(MENU_ITEM_RESIZE_MODE), "Resize Mode"); cellDbgFontPrintf(x_position, (ypos+(ypos_increment*MENU_ITEM_RESIZE_MODE)), font_size, MENU_ITEM_SELECTED(MENU_ITEM_RESIZE_MODE), "Resize Mode");