CTCaer/RetroArch
1
0
Fork 0
mirror of https://github.com/CTCaer/RetroArch.git synced 2025-01-20 09:52:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Cleanups

Browse Source
This commit is contained in:
twinaphex 2015-07-01 01:07:22 +02:00
parent 09340c97c1
commit fab966d768
2 changed files with 27 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
retroarch.c
View File

@ -1351,34 +1351,28 @@ void rarch_main_set_state(unsigned cmd)
{
case RARCH_ACTION_STATE_MENU_RUNNING:
#ifdef HAVE_MENU
menu_driver_toggle(true);
/* Menu should always run with vsync on. */
event_command(EVENT_CMD_VIDEO_SET_BLOCKING_STATE);
/* Stop all rumbling before entering the menu. */
event_command(EVENT_CMD_RUMBLE_STOP);
if (settings->menu.pause_libretro)
event_command(EVENT_CMD_AUDIO_STOP);
/* Override keyboard callback to redirect to menu instead.
* We'll use this later for something ...
* FIXME: This should probably be moved to menu_common somehow. */
if (global)
{
menu_handle_t *menu = menu_driver_get_ptr();
if (!menu)
return;
menu_driver_toggle(true);
/* Menu should always run with vsync on. */
event_command(EVENT_CMD_VIDEO_SET_BLOCKING_STATE);
/* Stop all rumbling before entering the menu. */
event_command(EVENT_CMD_RUMBLE_STOP);
if (settings->menu.pause_libretro)
event_command(EVENT_CMD_AUDIO_STOP);
/* Override keyboard callback to redirect to menu instead.
* We'll use this later for something ...
* FIXME: This should probably be moved to menu_common somehow. */
if (global)
{
global->frontend_key_event = system->key_event;
system->key_event = menu_input_key_event;
system->frame_time_last = 0;
}
menu_entries_set_refresh();
menu_driver_set_alive();
global->frontend_key_event = system->key_event;
system->key_event = menu_input_key_event;
system->frame_time_last = 0;
}
menu_entries_set_refresh();
menu_driver_set_alive();
#endif
break;
case RARCH_ACTION_STATE_LOAD_CONTENT:

14
screenshot.c
View File

@ -383,13 +383,13 @@ bool screenshot_dump(const char *folder, const void *frame,
if (!out_buffer)
return false;
scaler.in_width = width;
scaler.in_height = height;
scaler.out_width = width;
scaler.out_height = height;
scaler.in_stride = -pitch;
scaler.out_stride = width * 3;
scaler.out_fmt = SCALER_FMT_BGR24;
scaler.in_width = width;
scaler.in_height = height;
scaler.out_width = width;
scaler.out_height = height;
scaler.in_stride = -pitch;
scaler.out_stride = width * 3;
scaler.out_fmt = SCALER_FMT_BGR24;
scaler.scaler_type = SCALER_TYPE_POINT;
if (bgr24)