From 4b3a9c6a149a40bac5ad95ae30db2757efa5214c Mon Sep 17 00:00:00 2001 From: Twinaphex Date: Mon, 16 Jul 2012 20:44:01 +0200 Subject: [PATCH] (PS3) menu - Remove useless trigger_st variable --- ps3/frontend/menu.c | 272 ++++++++++++++++++++++---------------------- 1 file changed, 135 insertions(+), 137 deletions(-) diff --git a/ps3/frontend/menu.c b/ps3/frontend/menu.c index 87dcca406e..20c6dca347 100644 --- a/ps3/frontend/menu.c +++ b/ps3/frontend/menu.c @@ -601,7 +601,6 @@ static void display_menubar(void) uint64_t state; uint16_t input_state = 0; -uint16_t trigger_st = 0; static uint64_t old_state = 0; static void control_update_wrap(uint64_t trigger_state) @@ -655,25 +654,25 @@ static void browser_update(filebrowser_t * b, const char *extensions) { filebrowser_action_t action = FILEBROWSER_ACTION_NOOP; - if (trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_DOWN)) + if (input_state & (1 << RETRO_DEVICE_ID_JOYPAD_DOWN)) action = FILEBROWSER_ACTION_DOWN; - else if (trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_UP)) + else if (input_state & (1 << RETRO_DEVICE_ID_JOYPAD_UP)) action = FILEBROWSER_ACTION_UP; - else if (trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_RIGHT)) + else if (input_state & (1 << RETRO_DEVICE_ID_JOYPAD_RIGHT)) action = FILEBROWSER_ACTION_RIGHT; - else if (trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_LEFT)) + else if (input_state & (1 << RETRO_DEVICE_ID_JOYPAD_LEFT)) action = FILEBROWSER_ACTION_LEFT; - else if (trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_R)) + else if (input_state & (1 << RETRO_DEVICE_ID_JOYPAD_R)) action = FILEBROWSER_ACTION_SCROLL_DOWN; - else if (trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_R2)) + else if (input_state & (1 << RETRO_DEVICE_ID_JOYPAD_R2)) action = FILEBROWSER_ACTION_SCROLL_DOWN_SMOOTH; - else if (trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_L2)) + else if (input_state & (1 << RETRO_DEVICE_ID_JOYPAD_L2)) action = FILEBROWSER_ACTION_SCROLL_UP_SMOOTH; - else if (trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_L)) + else if (input_state & (1 << RETRO_DEVICE_ID_JOYPAD_L)) action = FILEBROWSER_ACTION_SCROLL_UP; - else if (trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_A)) + else if (input_state & (1 << RETRO_DEVICE_ID_JOYPAD_A)) action = FILEBROWSER_ACTION_CANCEL; - else if (trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_START)) + else if (input_state & (1 << RETRO_DEVICE_ID_JOYPAD_START)) { action = FILEBROWSER_ACTION_RESET; filebrowser_set_root(b, "/"); @@ -768,7 +767,7 @@ static void select_file(void) browser_update(&tmpBrowser, extensions); - if (trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_B)) + if (input_state & (1 << RETRO_DEVICE_ID_JOYPAD_B)) { if(filebrowser_get_current_path_isdir(&tmpBrowser)) { @@ -825,7 +824,7 @@ static void select_file(void) menu_stack_decrement(); } } - else if (trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_X)) + else if (input_state & (1 << RETRO_DEVICE_ID_JOYPAD_X)) menu_stack_decrement(); display_menubar(); @@ -844,7 +843,7 @@ static void select_directory(void) { browser_update(&tmpBrowser, "empty"); - if (trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_Y)) + if (input_state & (1 << RETRO_DEVICE_ID_JOYPAD_Y)) { if(filebrowser_get_current_path_isdir(&tmpBrowser)) { @@ -867,7 +866,7 @@ static void select_directory(void) menu_stack_decrement(); } } - else if (trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_X)) + else if (input_state & (1 << RETRO_DEVICE_ID_JOYPAD_X)) { strlcpy(path, usrDirPath, sizeof(path)); switch(menu_id) @@ -887,7 +886,7 @@ static void select_directory(void) } menu_stack_decrement(); } - else if (trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_B)) + else if (input_state & (1 << RETRO_DEVICE_ID_JOYPAD_B)) { if(filebrowser_get_current_path_isdir(&tmpBrowser)) { @@ -915,13 +914,13 @@ static void set_keybind_digital(uint64_t default_retro_joypad_id) { unsigned keybind_action = KEYBIND_NOACTION; - if(trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_LEFT)) + if(input_state & (1 << RETRO_DEVICE_ID_JOYPAD_LEFT)) keybind_action = KEYBIND_DECREMENT; - if((trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_RIGHT)) || (trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_B))) + if((input_state & (1 << RETRO_DEVICE_ID_JOYPAD_RIGHT)) || (input_state & (1 << RETRO_DEVICE_ID_JOYPAD_B))) keybind_action = KEYBIND_INCREMENT; - if(trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_START)) + if(input_state & (1 << RETRO_DEVICE_ID_JOYPAD_START)) keybind_action = KEYBIND_DEFAULT; rarch_input_set_keybind(currently_selected_controller_menu, keybind_action, default_retro_joypad_id); @@ -1013,11 +1012,11 @@ static void producesettingentry(menu * menu_obj, unsigned switchvalue) switch(switchvalue) { case SETTING_CHANGE_RESOLUTION: - if(trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_RIGHT)) + if(input_state & (1 << RETRO_DEVICE_ID_JOYPAD_RIGHT)) rarch_settings_change(S_RESOLUTION_NEXT); - if(trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_LEFT)) + if(input_state & (1 << RETRO_DEVICE_ID_JOYPAD_LEFT)) rarch_settings_change(S_RESOLUTION_PREVIOUS); - if(trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_B)) + if(input_state & (1 << RETRO_DEVICE_ID_JOYPAD_B)) { if (g_console.supported_resolutions[g_console.current_resolution_index] == CELL_VIDEO_OUT_RESOLUTION_576) { @@ -1036,7 +1035,7 @@ static void producesettingentry(menu * menu_obj, unsigned switchvalue) break; /* case SETTING_PAL60_MODE: - if((trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_LEFT)) || (trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_RIGHT)) || (trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_B))) + if((input_state & (1 << RETRO_DEVICE_ID_JOYPAD_LEFT)) || (input_state & (1 << RETRO_DEVICE_ID_JOYPAD_RIGHT)) || (input_state & (1 << RETRO_DEVICE_ID_JOYPAD_B))) { if (Graphics->GetCurrentResolution() == CELL_VIDEO_OUT_RESOLUTION_576) { @@ -1052,7 +1051,7 @@ static void producesettingentry(menu * menu_obj, unsigned switchvalue) break; */ case SETTING_SHADER_PRESETS: - if((trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_LEFT)) || (trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_RIGHT)) || (trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_B))) + if((input_state & (1 << RETRO_DEVICE_ID_JOYPAD_LEFT)) || (input_state & (1 << RETRO_DEVICE_ID_JOYPAD_RIGHT)) || (input_state & (1 << RETRO_DEVICE_ID_JOYPAD_B))) { if(g_console.emulator_initialized) { @@ -1060,17 +1059,17 @@ static void producesettingentry(menu * menu_obj, unsigned switchvalue) menu_stack_push(menuStackindex, PRESET_CHOICE); } } - if(trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_START)) + if(input_state & (1 << RETRO_DEVICE_ID_JOYPAD_START)) strlcpy(g_console.cgp_path, "", sizeof(g_console.cgp_path)); break; case SETTING_SHADER: - if((trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_LEFT)) || (trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_RIGHT)) || (trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_B))) + if((input_state & (1 << RETRO_DEVICE_ID_JOYPAD_LEFT)) || (input_state & (1 << RETRO_DEVICE_ID_JOYPAD_RIGHT)) || (input_state & (1 << RETRO_DEVICE_ID_JOYPAD_B))) { menu_stack_increment(); menu_stack_push(menuStackindex, SHADER_CHOICE); set_shader = 0; } - if(trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_START)) + if(input_state & (1 << RETRO_DEVICE_ID_JOYPAD_START)) { rarch_load_shader(1, NULL); strlcpy(g_settings.video.cg_shader_path, DEFAULT_SHADER_FILE, sizeof(g_settings.video.cg_shader_path)); @@ -1078,13 +1077,13 @@ static void producesettingentry(menu * menu_obj, unsigned switchvalue) } break; case SETTING_SHADER_2: - if((trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_LEFT)) || (trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_RIGHT)) || (trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_B))) + if((input_state & (1 << RETRO_DEVICE_ID_JOYPAD_LEFT)) || (input_state & (1 << RETRO_DEVICE_ID_JOYPAD_RIGHT)) || (input_state & (1 << RETRO_DEVICE_ID_JOYPAD_B))) { menu_stack_increment(); menu_stack_push(menuStackindex, SHADER_CHOICE); set_shader = 1; } - if(trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_START)) + if(input_state & (1 << RETRO_DEVICE_ID_JOYPAD_START)) { rarch_load_shader(2, NULL); strlcpy(g_settings.video.second_pass_shader, DEFAULT_SHADER_FILE, sizeof(g_settings.video.second_pass_shader)); @@ -1092,67 +1091,67 @@ static void producesettingentry(menu * menu_obj, unsigned switchvalue) } break; case SETTING_FONT_SIZE: - if(trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_LEFT)) + if(input_state & (1 << RETRO_DEVICE_ID_JOYPAD_LEFT)) { if(g_console.menu_font_size > 0) g_console.menu_font_size -= 0.01f; } - if((trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_RIGHT)) || (trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_B))) + if((input_state & (1 << RETRO_DEVICE_ID_JOYPAD_RIGHT)) || (input_state & (1 << RETRO_DEVICE_ID_JOYPAD_B))) { if((g_console.menu_font_size < 2.0f)) g_console.menu_font_size += 0.01f; } - if(trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_START)) + if(input_state & (1 << RETRO_DEVICE_ID_JOYPAD_START)) g_console.menu_font_size = 1.0f; break; case SETTING_KEEP_ASPECT_RATIO: - if(trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_LEFT)) + if(input_state & (1 << RETRO_DEVICE_ID_JOYPAD_LEFT)) { rarch_settings_change(S_ASPECT_RATIO_DECREMENT); gfx_ctx_set_aspect_ratio(NULL, g_console.aspect_ratio_index); } - if(trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_RIGHT)) + if(input_state & (1 << RETRO_DEVICE_ID_JOYPAD_RIGHT)) { rarch_settings_change(S_ASPECT_RATIO_INCREMENT); gfx_ctx_set_aspect_ratio(NULL, g_console.aspect_ratio_index); } - if(trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_START)) + if(input_state & (1 << RETRO_DEVICE_ID_JOYPAD_START)) { rarch_settings_default(S_DEF_ASPECT_RATIO); gfx_ctx_set_aspect_ratio(NULL, g_console.aspect_ratio_index); } break; case SETTING_HW_TEXTURE_FILTER: - if((trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_LEFT)) || (trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_RIGHT)) || (trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_B))) + if((input_state & (1 << RETRO_DEVICE_ID_JOYPAD_LEFT)) || (input_state & (1 << RETRO_DEVICE_ID_JOYPAD_RIGHT)) || (input_state & (1 << RETRO_DEVICE_ID_JOYPAD_B))) { rarch_settings_change(S_HW_TEXTURE_FILTER); gfx_ctx_set_filtering(1, g_settings.video.smooth); } - if(trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_START)) + if(input_state & (1 << RETRO_DEVICE_ID_JOYPAD_START)) { rarch_settings_change(S_DEF_HW_TEXTURE_FILTER); gfx_ctx_set_filtering(1, g_settings.video.smooth); } break; case SETTING_HW_TEXTURE_FILTER_2: - if((trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_LEFT)) || (trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_RIGHT)) || (trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_B))) + if((input_state & (1 << RETRO_DEVICE_ID_JOYPAD_LEFT)) || (input_state & (1 << RETRO_DEVICE_ID_JOYPAD_RIGHT)) || (input_state & (1 << RETRO_DEVICE_ID_JOYPAD_B))) { rarch_settings_change(S_HW_TEXTURE_FILTER_2); gfx_ctx_set_filtering(2, g_settings.video.second_pass_smooth); } - if(trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_START)) + if(input_state & (1 << RETRO_DEVICE_ID_JOYPAD_START)) { rarch_settings_change(S_DEF_HW_TEXTURE_FILTER_2); gfx_ctx_set_filtering(2, g_settings.video.second_pass_smooth); } break; case SETTING_SCALE_ENABLED: - if((trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_LEFT)) || (trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_RIGHT)) || (trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_B))) + if((input_state & (1 << RETRO_DEVICE_ID_JOYPAD_LEFT)) || (input_state & (1 << RETRO_DEVICE_ID_JOYPAD_RIGHT)) || (input_state & (1 << RETRO_DEVICE_ID_JOYPAD_B))) { rarch_settings_change(S_SCALE_ENABLED); gfx_ctx_set_fbo(g_console.fbo_enabled); } - if(trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_START)) + if(input_state & (1 << RETRO_DEVICE_ID_JOYPAD_START)) { rarch_settings_default(S_DEF_SCALE_ENABLED); apply_scaling(FBO_DEINIT); @@ -1160,7 +1159,7 @@ static void producesettingentry(menu * menu_obj, unsigned switchvalue) } break; case SETTING_SCALE_FACTOR: - if(trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_LEFT)) + if(input_state & (1 << RETRO_DEVICE_ID_JOYPAD_LEFT)) { if(g_console.fbo_enabled) { @@ -1172,7 +1171,7 @@ static void producesettingentry(menu * menu_obj, unsigned switchvalue) } } } - if((trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_RIGHT)) || (trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_B))) + if((input_state & (1 << RETRO_DEVICE_ID_JOYPAD_RIGHT)) || (input_state & (1 << RETRO_DEVICE_ID_JOYPAD_B))) { if(g_console.fbo_enabled) { @@ -1184,7 +1183,7 @@ static void producesettingentry(menu * menu_obj, unsigned switchvalue) } } } - if(trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_START)) + if(input_state & (1 << RETRO_DEVICE_ID_JOYPAD_START)) { rarch_settings_default(S_DEF_SCALE_FACTOR); apply_scaling(FBO_DEINIT); @@ -1192,51 +1191,51 @@ static void producesettingentry(menu * menu_obj, unsigned switchvalue) } break; case SETTING_HW_OVERSCAN_AMOUNT: - if(trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_LEFT)) + if(input_state & (1 << RETRO_DEVICE_ID_JOYPAD_LEFT)) { rarch_settings_change(S_OVERSCAN_DECREMENT); gfx_ctx_set_overscan(); } - if((trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_RIGHT)) || (trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_B))) + if((input_state & (1 << RETRO_DEVICE_ID_JOYPAD_RIGHT)) || (input_state & (1 << RETRO_DEVICE_ID_JOYPAD_B))) { rarch_settings_change(S_OVERSCAN_INCREMENT); gfx_ctx_set_overscan(); } - if(trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_START)) + if(input_state & (1 << RETRO_DEVICE_ID_JOYPAD_START)) { rarch_settings_default(S_DEF_OVERSCAN); gfx_ctx_set_overscan(); } break; case SETTING_THROTTLE_MODE: - if((trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_LEFT)) || (trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_RIGHT)) || (trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_B))) + if((input_state & (1 << RETRO_DEVICE_ID_JOYPAD_LEFT)) || (input_state & (1 << RETRO_DEVICE_ID_JOYPAD_RIGHT)) || (input_state & (1 << RETRO_DEVICE_ID_JOYPAD_B))) { rarch_settings_change(S_THROTTLE); gfx_ctx_set_swap_interval(g_console.throttle_enable, true); } - if(trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_START)) + if(input_state & (1 << RETRO_DEVICE_ID_JOYPAD_START)) { rarch_settings_default(S_DEF_THROTTLE); gfx_ctx_set_swap_interval(g_console.throttle_enable, true); } break; case SETTING_TRIPLE_BUFFERING: - if((trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_LEFT)) || (trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_RIGHT)) || (trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_B))) + if((input_state & (1 << RETRO_DEVICE_ID_JOYPAD_LEFT)) || (input_state & (1 << RETRO_DEVICE_ID_JOYPAD_RIGHT)) || (input_state & (1 << RETRO_DEVICE_ID_JOYPAD_B))) { rarch_settings_change(S_TRIPLE_BUFFERING); video_gl.restart(); } - if(trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_START)) + if(input_state & (1 << RETRO_DEVICE_ID_JOYPAD_START)) { - bool old_buffer_trigger_state = g_console.triple_buffering_enable; + bool old_buffer_input_stateate = g_console.triple_buffering_enable; rarch_settings_default(S_DEF_TRIPLE_BUFFERING); - if(!old_buffer_trigger_state) + if(!old_buffer_input_stateate) video_gl.restart(); } break; case SETTING_ENABLE_SCREENSHOTS: - if((trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_LEFT)) || (trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_RIGHT)) || (trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_B))) + if((input_state & (1 << RETRO_DEVICE_ID_JOYPAD_LEFT)) || (input_state & (1 << RETRO_DEVICE_ID_JOYPAD_RIGHT)) || (input_state & (1 << RETRO_DEVICE_ID_JOYPAD_B))) { #if(CELL_SDK_VERSION > 0x340000) g_console.screenshots_enable = !g_console.screenshots_enable; @@ -1257,7 +1256,7 @@ static void producesettingentry(menu * menu_obj, unsigned switchvalue) } #endif } - if(trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_START)) + if(input_state & (1 << RETRO_DEVICE_ID_JOYPAD_START)) { #if(CELL_SDK_VERSION > 0x340000) g_console.screenshots_enable = true; @@ -1265,7 +1264,7 @@ static void producesettingentry(menu * menu_obj, unsigned switchvalue) } break; case SETTING_SAVE_SHADER_PRESET: - if((trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_LEFT)) || (trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_RIGHT)) || (trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_B))) + if((input_state & (1 << RETRO_DEVICE_ID_JOYPAD_LEFT)) || (input_state & (1 << RETRO_DEVICE_ID_JOYPAD_RIGHT)) || (input_state & (1 << RETRO_DEVICE_ID_JOYPAD_B))) rarch_filename_input_and_save(SHADER_PRESET_FILE); break; case SETTING_APPLY_SHADER_PRESET_ON_STARTUP: @@ -1273,31 +1272,31 @@ static void producesettingentry(menu * menu_obj, unsigned switchvalue) case SETTING_DEFAULT_VIDEO_ALL: break; case SETTING_SOUND_MODE: - if(trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_LEFT)) + if(input_state & (1 << RETRO_DEVICE_ID_JOYPAD_LEFT)) { if(g_console.sound_mode != SOUND_MODE_NORMAL) g_console.sound_mode--; } - if((trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_RIGHT)) || (trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_B))) + if((input_state & (1 << RETRO_DEVICE_ID_JOYPAD_RIGHT)) || (input_state & (1 << RETRO_DEVICE_ID_JOYPAD_B))) { if(g_console.sound_mode < SOUND_MODE_HEADSET) g_console.sound_mode++; } - if((trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_UP)) || (trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_DOWN))) + if((input_state & (1 << RETRO_DEVICE_ID_JOYPAD_UP)) || (input_state & (1 << RETRO_DEVICE_ID_JOYPAD_DOWN))) { if(g_console.sound_mode != SOUND_MODE_RSOUND) rarch_console_rsound_stop(); else rarch_console_rsound_start(g_settings.audio.device); } - if(trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_START)) + if(input_state & (1 << RETRO_DEVICE_ID_JOYPAD_START)) { g_console.sound_mode = SOUND_MODE_NORMAL; rarch_console_rsound_stop(); } break; case SETTING_RSOUND_SERVER_IP_ADDRESS: - if((trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_LEFT)) || (trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_RIGHT)) || (trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_B))) + if((input_state & (1 << RETRO_DEVICE_ID_JOYPAD_LEFT)) || (input_state & (1 << RETRO_DEVICE_ID_JOYPAD_RIGHT)) || (input_state & (1 << RETRO_DEVICE_ID_JOYPAD_B))) { oskutil_write_initial_message(&g_console.oskutil_handle, L"192.168.1.1"); oskutil_write_message(&g_console.oskutil_handle, L"Enter IP address for the RSound Server."); @@ -1314,58 +1313,58 @@ static void producesettingentry(menu * menu_obj, unsigned switchvalue) if(g_console.oskutil_handle.text_can_be_fetched) strlcpy(g_settings.audio.device, OUTPUT_TEXT_STRING(g_console.oskutil_handle), sizeof(g_settings.audio.device)); } - if(trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_START)) + if(input_state & (1 << RETRO_DEVICE_ID_JOYPAD_START)) strlcpy(g_settings.audio.device, "0.0.0.0", sizeof(g_settings.audio.device)); break; case SETTING_DEFAULT_AUDIO_ALL: break; case SETTING_EMU_CURRENT_SAVE_STATE_SLOT: - if(trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_LEFT)) + if(input_state & (1 << RETRO_DEVICE_ID_JOYPAD_LEFT)) rarch_settings_change(S_SAVESTATE_DECREMENT); - if((trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_RIGHT)) || (trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_B))) + if((input_state & (1 << RETRO_DEVICE_ID_JOYPAD_RIGHT)) || (input_state & (1 << RETRO_DEVICE_ID_JOYPAD_B))) rarch_settings_change(S_SAVESTATE_INCREMENT); - if(trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_START)) + if(input_state & (1 << RETRO_DEVICE_ID_JOYPAD_START)) rarch_settings_default(S_DEF_SAVE_STATE); break; case SETTING_EMU_SHOW_INFO_MSG: - if((trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_LEFT)) || (trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_RIGHT)) || (trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_B))) + if((input_state & (1 << RETRO_DEVICE_ID_JOYPAD_LEFT)) || (input_state & (1 << RETRO_DEVICE_ID_JOYPAD_RIGHT)) || (input_state & (1 << RETRO_DEVICE_ID_JOYPAD_B))) g_console.info_msg_enable = !g_console.info_msg_enable; - if(trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_START)) + if(input_state & (1 << RETRO_DEVICE_ID_JOYPAD_START)) g_console.info_msg_enable = true; break; case SETTING_EMU_REWIND_ENABLED: - if((trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_LEFT)) || (trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_RIGHT)) || (trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_B))) + if((input_state & (1 << RETRO_DEVICE_ID_JOYPAD_LEFT)) || (input_state & (1 << RETRO_DEVICE_ID_JOYPAD_RIGHT)) || (input_state & (1 << RETRO_DEVICE_ID_JOYPAD_B))) { rarch_settings_change(S_REWIND); if(g_console.info_msg_enable) rarch_settings_msg(S_MSG_RESTART_RARCH, S_DELAY_180); } - if(trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_START)) + if(input_state & (1 << RETRO_DEVICE_ID_JOYPAD_START)) g_settings.rewind_enable = false; break; case SETTING_RARCH_DEFAULT_EMU: - if((trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_LEFT)) || (trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_RIGHT)) || (trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_B))) + if((input_state & (1 << RETRO_DEVICE_ID_JOYPAD_LEFT)) || (input_state & (1 << RETRO_DEVICE_ID_JOYPAD_RIGHT)) || (input_state & (1 << RETRO_DEVICE_ID_JOYPAD_B))) { menu_stack_increment(); menu_stack_push(menuStackindex, LIBRETRO_CHOICE); set_libretro_core_as_launch = false; } - if(trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_START)) + if(input_state & (1 << RETRO_DEVICE_ID_JOYPAD_START)) { } break; case SETTING_EMU_AUDIO_MUTE: - if((trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_LEFT)) || (trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_RIGHT)) || (trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_B))) + if((input_state & (1 << RETRO_DEVICE_ID_JOYPAD_LEFT)) || (input_state & (1 << RETRO_DEVICE_ID_JOYPAD_RIGHT)) || (input_state & (1 << RETRO_DEVICE_ID_JOYPAD_B))) { g_extern.audio_data.mute = !g_extern.audio_data.mute; } - if(trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_START)) + if(input_state & (1 << RETRO_DEVICE_ID_JOYPAD_START)) g_extern.audio_data.mute = false; break; case SETTING_ENABLE_CUSTOM_BGM: - if((trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_LEFT)) || (trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_RIGHT)) || (trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_B))) + if((input_state & (1 << RETRO_DEVICE_ID_JOYPAD_LEFT)) || (input_state & (1 << RETRO_DEVICE_ID_JOYPAD_RIGHT)) || (input_state & (1 << RETRO_DEVICE_ID_JOYPAD_B))) { #if(CELL_SDK_VERSION > 0x340000) g_console.custom_bgm_enable = !g_console.custom_bgm_enable; @@ -1376,7 +1375,7 @@ static void producesettingentry(menu * menu_obj, unsigned switchvalue) #endif } - if(trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_START)) + if(input_state & (1 << RETRO_DEVICE_ID_JOYPAD_START)) { #if(CELL_SDK_VERSION > 0x340000) g_console.custom_bgm_enable = true; @@ -1388,82 +1387,82 @@ static void producesettingentry(menu * menu_obj, unsigned switchvalue) case SETTING_EMU_AUDIO_DEFAULT_ALL: break; case SETTING_PATH_DEFAULT_ROM_DIRECTORY: - if((trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_LEFT)) || (trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_RIGHT)) || (trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_B))) + if((input_state & (1 << RETRO_DEVICE_ID_JOYPAD_LEFT)) || (input_state & (1 << RETRO_DEVICE_ID_JOYPAD_RIGHT)) || (input_state & (1 << RETRO_DEVICE_ID_JOYPAD_B))) { menu_stack_increment(); menu_stack_push(menuStackindex, PATH_DEFAULT_ROM_DIR_CHOICE); } - if(trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_START)) + if(input_state & (1 << RETRO_DEVICE_ID_JOYPAD_START)) strlcpy(g_console.default_rom_startup_dir, "/", sizeof(g_console.default_rom_startup_dir)); break; case SETTING_PATH_SAVESTATES_DIRECTORY: - if((trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_LEFT)) || (trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_RIGHT)) || (trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_B))) + if((input_state & (1 << RETRO_DEVICE_ID_JOYPAD_LEFT)) || (input_state & (1 << RETRO_DEVICE_ID_JOYPAD_RIGHT)) || (input_state & (1 << RETRO_DEVICE_ID_JOYPAD_B))) { menu_stack_increment(); menu_stack_push(menuStackindex, PATH_SAVESTATES_DIR_CHOICE); } - if(trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_START)) + if(input_state & (1 << RETRO_DEVICE_ID_JOYPAD_START)) strlcpy(g_console.default_savestate_dir, usrDirPath, sizeof(g_console.default_savestate_dir)); break; case SETTING_PATH_SRAM_DIRECTORY: - if((trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_LEFT)) || (trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_RIGHT)) || (trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_B))) + if((input_state & (1 << RETRO_DEVICE_ID_JOYPAD_LEFT)) || (input_state & (1 << RETRO_DEVICE_ID_JOYPAD_RIGHT)) || (input_state & (1 << RETRO_DEVICE_ID_JOYPAD_B))) { menu_stack_increment(); menu_stack_push(menuStackindex, PATH_SRAM_DIR_CHOICE); } - if(trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_START)) + if(input_state & (1 << RETRO_DEVICE_ID_JOYPAD_START)) strlcpy(g_console.default_sram_dir, "", sizeof(g_console.default_sram_dir)); break; case SETTING_PATH_CHEATS: - if((trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_LEFT)) || (trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_RIGHT)) || (trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_B))) + if((input_state & (1 << RETRO_DEVICE_ID_JOYPAD_LEFT)) || (input_state & (1 << RETRO_DEVICE_ID_JOYPAD_RIGHT)) || (input_state & (1 << RETRO_DEVICE_ID_JOYPAD_B))) { menu_stack_increment(); menu_stack_push(menuStackindex, PATH_CHEATS_DIR_CHOICE); } - if(trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_START)) + if(input_state & (1 << RETRO_DEVICE_ID_JOYPAD_START)) strlcpy(g_settings.cheat_database, usrDirPath, sizeof(g_settings.cheat_database)); break; case SETTING_PATH_SYSTEM: - if((trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_LEFT)) || (trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_RIGHT)) || (trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_B))) + if((input_state & (1 << RETRO_DEVICE_ID_JOYPAD_LEFT)) || (input_state & (1 << RETRO_DEVICE_ID_JOYPAD_RIGHT)) || (input_state & (1 << RETRO_DEVICE_ID_JOYPAD_B))) { menu_stack_increment(); menu_stack_push(menuStackindex, PATH_SYSTEM_DIR_CHOICE); } - if(trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_START)) + if(input_state & (1 << RETRO_DEVICE_ID_JOYPAD_START)) strlcpy(g_settings.system_directory, systemDirPath, sizeof(g_settings.system_directory)); break; case SETTING_ENABLE_SRAM_PATH: - if((trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_LEFT)) || (trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_RIGHT))) + if((input_state & (1 << RETRO_DEVICE_ID_JOYPAD_LEFT)) || (input_state & (1 << RETRO_DEVICE_ID_JOYPAD_RIGHT))) { g_console.default_sram_dir_enable = !g_console.default_sram_dir_enable; menu_stack_refresh(items_generalsettings, menuStackindex); } - if(trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_START)) + if(input_state & (1 << RETRO_DEVICE_ID_JOYPAD_START)) { g_console.default_sram_dir_enable = true; menu_stack_refresh(items_generalsettings, menuStackindex); } break; case SETTING_ENABLE_STATE_PATH: - if((trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_LEFT)) || (trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_RIGHT))) + if((input_state & (1 << RETRO_DEVICE_ID_JOYPAD_LEFT)) || (input_state & (1 << RETRO_DEVICE_ID_JOYPAD_RIGHT))) { g_console.default_savestate_dir_enable = !g_console.default_savestate_dir_enable; menu_stack_refresh(items_generalsettings, menuStackindex); } - if(trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_START)) + if(input_state & (1 << RETRO_DEVICE_ID_JOYPAD_START)) { g_console.default_savestate_dir_enable = true; menu_stack_refresh(items_generalsettings, menuStackindex); } break; case SETTING_PATH_DEFAULT_ALL: - if((trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_LEFT)) || (trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_RIGHT)) || (trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_B)) || (trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_START))) + if((input_state & (1 << RETRO_DEVICE_ID_JOYPAD_LEFT)) || (input_state & (1 << RETRO_DEVICE_ID_JOYPAD_RIGHT)) || (input_state & (1 << RETRO_DEVICE_ID_JOYPAD_B)) || (input_state & (1 << RETRO_DEVICE_ID_JOYPAD_START))) { strlcpy(g_console.default_rom_startup_dir, "/", sizeof(g_console.default_rom_startup_dir)); strlcpy(g_console.default_savestate_dir, usrDirPath, sizeof(g_console.default_savestate_dir)); @@ -1474,30 +1473,30 @@ static void producesettingentry(menu * menu_obj, unsigned switchvalue) } break; case SETTING_CONTROLS_SCHEME: - if((trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_LEFT)) || (trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_RIGHT)) || (trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_B)) || (trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_START))) + if((input_state & (1 << RETRO_DEVICE_ID_JOYPAD_LEFT)) || (input_state & (1 << RETRO_DEVICE_ID_JOYPAD_RIGHT)) || (input_state & (1 << RETRO_DEVICE_ID_JOYPAD_B)) || (input_state & (1 << RETRO_DEVICE_ID_JOYPAD_START))) { menu_stack_increment(); menu_stack_push(menuStackindex, INPUT_PRESET_CHOICE); } - if(trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_START)) + if(input_state & (1 << RETRO_DEVICE_ID_JOYPAD_START)) menu_stack_refresh(items_generalsettings, menuStackindex); break; case SETTING_CONTROLS_NUMBER: - if(trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_LEFT)) + if(input_state & (1 << RETRO_DEVICE_ID_JOYPAD_LEFT)) { if(currently_selected_controller_menu != 0) currently_selected_controller_menu--; menu_stack_refresh(items_generalsettings, menuStackindex); } - if((trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_RIGHT)) || (trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_B))) + if((input_state & (1 << RETRO_DEVICE_ID_JOYPAD_RIGHT)) || (input_state & (1 << RETRO_DEVICE_ID_JOYPAD_B))) { if(currently_selected_controller_menu < 6) currently_selected_controller_menu++; menu_stack_refresh(items_generalsettings, menuStackindex); } - if(trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_START)) + if(input_state & (1 << RETRO_DEVICE_ID_JOYPAD_START)) currently_selected_controller_menu = 0; break; case SETTING_CONTROLS_RETRO_DEVICE_ID_JOYPAD_UP: @@ -1549,11 +1548,11 @@ static void producesettingentry(menu * menu_obj, unsigned switchvalue) set_keybind_digital(RETRO_DEVICE_ID_JOYPAD_R3); break; case SETTING_CONTROLS_SAVE_CUSTOM_CONTROLS: - if((trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_LEFT)) || (trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_RIGHT)) || (trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_B)) || (trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_START))) + if((input_state & (1 << RETRO_DEVICE_ID_JOYPAD_LEFT)) || (input_state & (1 << RETRO_DEVICE_ID_JOYPAD_RIGHT)) || (input_state & (1 << RETRO_DEVICE_ID_JOYPAD_B)) || (input_state & (1 << RETRO_DEVICE_ID_JOYPAD_START))) rarch_filename_input_and_save(INPUT_PRESET_FILE); break; case SETTING_CONTROLS_DEFAULT_ALL: - if((trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_LEFT)) || (trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_RIGHT)) || (trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_B)) || (trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_START))) + if((input_state & (1 << RETRO_DEVICE_ID_JOYPAD_LEFT)) || (input_state & (1 << RETRO_DEVICE_ID_JOYPAD_RIGHT)) || (input_state & (1 << RETRO_DEVICE_ID_JOYPAD_B)) || (input_state & (1 << RETRO_DEVICE_ID_JOYPAD_START))) { rarch_input_set_default_keybinds(currently_selected_controller_menu); menu_stack_refresh(items_generalsettings, menuStackindex); @@ -1620,13 +1619,13 @@ static void select_setting(void) settings_action_t action = SETTINGS_ACTION_NOOP; /* back to ROM menu if CIRCLE is pressed */ - if ((trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_L)) || (trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_A))) + if ((input_state & (1 << RETRO_DEVICE_ID_JOYPAD_L)) || (input_state & (1 << RETRO_DEVICE_ID_JOYPAD_A))) action = SETTINGS_ACTION_TAB_PREVIOUS; - else if (trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_R)) + else if (input_state & (1 << RETRO_DEVICE_ID_JOYPAD_R)) action = SETTINGS_ACTION_TAB_NEXT; - else if (trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_DOWN)) + else if (input_state & (1 << RETRO_DEVICE_ID_JOYPAD_DOWN)) action = SETTINGS_ACTION_DOWN; - else if (trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_UP)) + else if (input_state & (1 << RETRO_DEVICE_ID_JOYPAD_UP)) action = SETTINGS_ACTION_UP; if(action != SETTINGS_ACTION_NOOP) @@ -1703,9 +1702,9 @@ static void select_rom(void) menu_romselect_action_t action = MENU_ROMSELECT_ACTION_NOOP; - if (trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_SELECT)) + if (input_state & (1 << RETRO_DEVICE_ID_JOYPAD_SELECT)) action = MENU_ROMSELECT_ACTION_GOTO_SETTINGS; - else if (trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_B)) + else if (input_state & (1 << RETRO_DEVICE_ID_JOYPAD_B)) action = MENU_ROMSELECT_ACTION_OK; if (action != MENU_ROMSELECT_ACTION_NOOP) @@ -1744,14 +1743,14 @@ static void ingame_menu_resize(void) g_console.aspect_ratio_index = ASPECT_RATIO_CUSTOM; gfx_ctx_set_aspect_ratio(NULL, g_console.aspect_ratio_index); - if(trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_LEFT)) + if(input_state & (1 << RETRO_DEVICE_ID_JOYPAD_LEFT)) g_console.viewports.custom_vp.x -= 1; - else if(trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_RIGHT)) + else if(input_state & (1 << RETRO_DEVICE_ID_JOYPAD_RIGHT)) g_console.viewports.custom_vp.x += 1; - if(trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_UP)) + if(input_state & (1 << RETRO_DEVICE_ID_JOYPAD_UP)) g_console.viewports.custom_vp.y += 1; - else if(trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_DOWN)) + else if(input_state & (1 << RETRO_DEVICE_ID_JOYPAD_DOWN)) g_console.viewports.custom_vp.y -= 1; if (CTRL_RSTICK_LEFT(state) || CTRL_L1(state)) @@ -1764,7 +1763,7 @@ static void ingame_menu_resize(void) else if (CTRL_RSTICK_DOWN(state) || CTRL_R2(state)) g_console.viewports.custom_vp.height -= 1; - if (trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_X)) + if (input_state & (1 << RETRO_DEVICE_ID_JOYPAD_X)) { g_console.viewports.custom_vp.x = 0; g_console.viewports.custom_vp.y = 0; @@ -1772,10 +1771,10 @@ static void ingame_menu_resize(void) g_console.viewports.custom_vp.height = gl->win_height; } - if (trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_A)) + if (input_state & (1 << RETRO_DEVICE_ID_JOYPAD_A)) menu_stack_decrement(); - if(trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_Y)) { } + if(input_state & (1 << RETRO_DEVICE_ID_JOYPAD_Y)) { } else { display_menubar(); @@ -1844,7 +1843,7 @@ static void ingame_menu_screenshot(void) if(g_console.ingame_menu_enable) { - if(trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_A)) + if(input_state & (1 << RETRO_DEVICE_ID_JOYPAD_A)) { menu_stack_decrement(); gl->menu_render = true; @@ -1869,33 +1868,33 @@ static void ingame_menu(void) menuitem_colors[g_console.ingame_menu_item] = RED; - if(trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_A)) + if(input_state & (1 << RETRO_DEVICE_ID_JOYPAD_A)) rarch_settings_change(S_RETURN_TO_GAME); switch(g_console.ingame_menu_item) { case MENU_ITEM_LOAD_STATE: - if(trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_B)) + if(input_state & (1 << RETRO_DEVICE_ID_JOYPAD_B)) { rarch_load_state(); rarch_settings_change(S_RETURN_TO_GAME); } - if(trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_LEFT)) + if(input_state & (1 << RETRO_DEVICE_ID_JOYPAD_LEFT)) rarch_state_slot_decrease(); - if(trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_RIGHT)) + if(input_state & (1 << RETRO_DEVICE_ID_JOYPAD_RIGHT)) rarch_state_slot_increase(); strlcpy(comment, "Press LEFT or RIGHT to change the current save state slot.\nPress CROSS to load the state from the currently selected save state slot.", sizeof(comment)); break; case MENU_ITEM_SAVE_STATE: - if(trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_B)) + if(input_state & (1 << RETRO_DEVICE_ID_JOYPAD_B)) { rarch_save_state(); rarch_settings_change(S_RETURN_TO_GAME); } - if(trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_LEFT)) + if(input_state & (1 << RETRO_DEVICE_ID_JOYPAD_LEFT)) rarch_state_slot_decrease(); - if(trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_RIGHT)) + if(input_state & (1 << RETRO_DEVICE_ID_JOYPAD_RIGHT)) rarch_state_slot_increase(); strlcpy(comment, "Press LEFT or RIGHT to change the current save state slot.\nPress CROSS to save the state to the currently selected save state slot.", sizeof(comment)); @@ -1909,19 +1908,19 @@ static void ingame_menu(void) strlcpy(comment, "Press LEFT or RIGHT to change the [Overscan] settings.\nPress START to reset back to default values.", sizeof(comment)); break; case MENU_ITEM_ORIENTATION: - if(trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_LEFT)) + if(input_state & (1 << RETRO_DEVICE_ID_JOYPAD_LEFT)) { rarch_settings_change(S_ROTATION_DECREMENT); video_gl.set_rotation(NULL, g_console.screen_orientation); } - if((trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_RIGHT)) || (trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_B))) + if((input_state & (1 << RETRO_DEVICE_ID_JOYPAD_RIGHT)) || (input_state & (1 << RETRO_DEVICE_ID_JOYPAD_B))) { rarch_settings_change(S_ROTATION_INCREMENT); video_gl.set_rotation(NULL, g_console.screen_orientation); } - if(trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_START)) + if(input_state & (1 << RETRO_DEVICE_ID_JOYPAD_START)) { rarch_settings_default(S_DEF_ROTATION); video_gl.set_rotation(NULL, g_console.screen_orientation); @@ -1933,7 +1932,7 @@ static void ingame_menu(void) strlcpy(comment, "Press LEFT or RIGHT to change the [Scaling] settings.\nPress START to reset back to default values.", sizeof(comment)); break; case MENU_ITEM_FRAME_ADVANCE: - if((trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_B)) || (trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_R2)) || (trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_L2))) + if((input_state & (1 << RETRO_DEVICE_ID_JOYPAD_B)) || (input_state & (1 << RETRO_DEVICE_ID_JOYPAD_R2)) || (input_state & (1 << RETRO_DEVICE_ID_JOYPAD_L2))) { rarch_settings_change(S_FRAME_ADVANCE); g_console.ingame_menu_item = MENU_ITEM_FRAME_ADVANCE; @@ -1941,7 +1940,7 @@ static void ingame_menu(void) strlcpy(comment, "Press 'CROSS', 'L2' or 'R2' button to step one frame. Pressing the button\nrapidly will advance the frame more slowly.", sizeof(comment)); break; case MENU_ITEM_RESIZE_MODE: - if(trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_B)) + if(input_state & (1 << RETRO_DEVICE_ID_JOYPAD_B)) { menu_stack_increment(); menu_stack_push(menuStackindex, INGAME_MENU_RESIZE); @@ -1949,7 +1948,7 @@ static void ingame_menu(void) strlcpy(comment, "Allows you to resize the screen by moving around the two analog sticks.\nPress TRIANGLE to reset to default values, and CIRCLE to go back.", sizeof(comment)); break; case MENU_ITEM_SCREENSHOT_MODE: - if(trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_B)) + if(input_state & (1 << RETRO_DEVICE_ID_JOYPAD_B)) { menu_stack_increment(); menu_stack_push(menuStackindex, INGAME_MENU_SCREENSHOT); @@ -1957,13 +1956,13 @@ static void ingame_menu(void) strlcpy(comment, "Allows you to take a screenshot without any text clutter.\nPress CIRCLE to go back to the in-game menu while in 'Screenshot Mode'.", sizeof(comment)); break; case MENU_ITEM_RETURN_TO_GAME: - if(trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_B)) + if(input_state & (1 << RETRO_DEVICE_ID_JOYPAD_B)) rarch_settings_change(S_RETURN_TO_GAME); strlcpy(comment, "Press 'CROSS' to return back to the game.", sizeof(comment)); break; case MENU_ITEM_RESET: - if(trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_B)) + if(input_state & (1 << RETRO_DEVICE_ID_JOYPAD_B)) { rarch_settings_change(S_RETURN_TO_GAME); rarch_game_reset(); @@ -1971,14 +1970,14 @@ static void ingame_menu(void) strlcpy(comment, "Press 'CROSS' to reset the game.", sizeof(comment)); break; case MENU_ITEM_RETURN_TO_MENU: - if(trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_B)) + if(input_state & (1 << RETRO_DEVICE_ID_JOYPAD_B)) { rarch_settings_change(S_RETURN_TO_MENU); } strlcpy(comment, "Press 'CROSS' to return to the ROM Browser menu.", sizeof(comment)); break; case MENU_ITEM_CHANGE_LIBRETRO: - if(trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_B)) + if(input_state & (1 << RETRO_DEVICE_ID_JOYPAD_B)) { menu_stack_increment(); menu_stack_push(menuStackindex, LIBRETRO_CHOICE); @@ -1988,7 +1987,7 @@ static void ingame_menu(void) break; #ifdef HAVE_MULTIMAN case MENU_ITEM_RETURN_TO_MULTIMAN: - if(trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_B)) + if(input_state & (1 << RETRO_DEVICE_ID_JOYPAD_B)) { if(path_file_exists(MULTIMAN_EXECUTABLE)) { @@ -2002,26 +2001,26 @@ static void ingame_menu(void) break; #endif case MENU_ITEM_RETURN_TO_DASHBOARD: - if(trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_B)) + if(input_state & (1 << RETRO_DEVICE_ID_JOYPAD_B)) rarch_settings_change(S_RETURN_TO_DASHBOARD); strlcpy(comment, "Press 'CROSS' to quit the emulator and return to the XMB.", sizeof(comment)); break; } - if(trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_UP)) + if(input_state & (1 << RETRO_DEVICE_ID_JOYPAD_UP)) { if(g_console.ingame_menu_item > 0) g_console.ingame_menu_item--; } - if(trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_DOWN)) + if(input_state & (1 << RETRO_DEVICE_ID_JOYPAD_DOWN)) { if(g_console.ingame_menu_item < (MENU_ITEM_LAST-1)) g_console.ingame_menu_item++; } - if((trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_L3)) && (trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_R3))) + if((input_state & (1 << RETRO_DEVICE_ID_JOYPAD_L3)) && (input_state & (1 << RETRO_DEVICE_ID_JOYPAD_R3))) rarch_settings_change(S_RETURN_TO_GAME); display_menubar(); @@ -2124,7 +2123,7 @@ void menu_loop(void) unsigned menu_category_id = menuStack[menuStackindex].category_id; state = cell_pad_input_poll_device(0); - uint64_t trigger_state = state & ~old_state; + uint64_t trig_state = state & ~old_state; { //second button input @@ -2143,13 +2142,12 @@ void menu_loop(void) if(IS_TIMER_EXPIRED(gl)) { first_held = false; - trigger_state = held_state; + trig_state = held_state; } } } - control_update_wrap(trigger_state); - trigger_st = input_state; + control_update_wrap(trig_state); gfx_ctx_clear();