CTCaer/RetroArch
1
0
Fork 0
mirror of https://github.com/CTCaer/RetroArch.git synced 2024-12-20 09:48:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

(Main) Take out HAVE_SCREENSHOTS ifdef

Browse Source 
Create RARCH_CMD_TAKE_SCREENSHOT
This commit is contained in:
twinaphex 2014-07-22 03:17:47 +02:00
parent 78610e4d90
commit 72be4b17e7
4 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
frontend/menu/backend/menu_common_backend.c
View File

@ -3824,12 +3824,10 @@ static int menu_common_setting_set(unsigned setting, unsigned action)
else if (action == MENU_ACTION_RIGHT) else if (action == MENU_ACTION_RIGHT)
g_extern.state_slot++; g_extern.state_slot++;
break; break;
#ifdef HAVE_SCREENSHOTS
case MENU_SETTINGS_SCREENSHOT: case MENU_SETTINGS_SCREENSHOT:
if (action == MENU_ACTION_OK) if (action == MENU_ACTION_OK)
rarch_take_screenshot(); rarch_main_command(RARCH_CMD_TAKE_SCREENSHOT);
break; break;
#endif
case MENU_SETTINGS_RESTART_GAME: case MENU_SETTINGS_RESTART_GAME:
if (action == MENU_ACTION_OK) if (action == MENU_ACTION_OK)
{ {

2
frontend/menu/backend/menu_lakka_backend.c
View File

@ -368,7 +368,7 @@ static int menu_lakka_iterate(unsigned action)
return -1; return -1;
break; break;
case 3: case 3:
rarch_take_screenshot(); rarch_main_command(RARCH_CMD_TAKE_SCREENSHOT);
break; break;
case 4: case 4:
global_alpha = 0.0; global_alpha = 0.0;

1
general.h
View File

@ -93,6 +93,7 @@ enum basic_event
RARCH_CMD_LOAD_CONTENT, RARCH_CMD_LOAD_CONTENT,
RARCH_CMD_LOAD_STATE, RARCH_CMD_LOAD_STATE,
RARCH_CMD_SAVE_STATE, RARCH_CMD_SAVE_STATE,
RARCH_CMD_TAKE_SCREENSHOT,
RARCH_CMD_QUIT, RARCH_CMD_QUIT,
}; };

9
retroarch.c
View File

@ -78,7 +78,6 @@ static void check_fast_forward_button(void)
old_hold_button_state = new_hold_button_state; old_hold_button_state = new_hold_button_state;
} }
#if defined(HAVE_SCREENSHOTS) && !defined(_XBOX1)
static bool take_screenshot_viewport(void) static bool take_screenshot_viewport(void)
{ {
struct rarch_viewport vp = {0}; struct rarch_viewport vp = {0};
@ -192,7 +191,6 @@ void rarch_take_screenshot(void)
else else
msg_queue_push(g_extern.msg_queue, msg, 1, 180); msg_queue_push(g_extern.msg_queue, msg, 1, 180);
} }
#endif
static void readjust_audio_input_rate(void) static void readjust_audio_input_rate(void)
{ {
@ -2601,7 +2599,6 @@ static void check_disk(void)
old_pressed_next = pressed_next; old_pressed_next = pressed_next;
} }
#if defined(HAVE_SCREENSHOTS) && !defined(_XBOX)
static void check_screenshot(void) static void check_screenshot(void)
{ {
static bool old_pressed; static bool old_pressed;
@ -2611,7 +2608,6 @@ static void check_screenshot(void)
old_pressed = pressed; old_pressed = pressed;
} }
#endif
static void check_mute(void) static void check_mute(void)
{ {
@ -2742,9 +2738,7 @@ static void do_state_checks(void)
{ {
rarch_check_block_hotkey(); rarch_check_block_hotkey();
#if defined(HAVE_SCREENSHOTS) && !defined(_XBOX)
check_screenshot(); check_screenshot();
#endif
check_mute(); check_mute();
check_volume(); check_volume();
@ -3103,6 +3097,9 @@ void rarch_main_command(unsigned action)
case RARCH_CMD_SAVE_STATE: case RARCH_CMD_SAVE_STATE:
rarch_save_state(); rarch_save_state();
break; break;
case RARCH_CMD_TAKE_SCREENSHOT:
rarch_take_screenshot();
break;
case RARCH_CMD_QUIT: case RARCH_CMD_QUIT:
g_extern.system.shutdown = true; g_extern.system.shutdown = true;
break; break;