gaming/RetroArch
gaming/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2024-07-08 20:25:47 +00:00
Code Issues Projects Releases Wiki Activity

Rename rarch_cmd_state to event_cmd_state and move to command_event.h

Browse Source
This commit is contained in:
twinaphex 2015-04-13 11:41:44 +02:00
parent a13a701f40
commit 62960177fe
3 changed files with 42 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
command_event.h
View File

@ -195,6 +195,42 @@ enum event_command
EVENT_CMD_DATA_RUNLOOP_FREE,
};
typedef struct event_cmd_state
{
bool fullscreen_toggle;
bool overlay_next_pressed;
bool grab_mouse_pressed;
bool menu_pressed;
bool quit_key_pressed;
bool screenshot_pressed;
bool mute_pressed;
bool osk_pressed;
bool volume_up_pressed;
bool volume_down_pressed;
bool reset_pressed;
bool disk_prev_pressed;
bool disk_next_pressed;
bool disk_eject_pressed;
bool movie_record;
bool save_state_pressed;
bool load_state_pressed;
bool slowmotion_pressed;
bool shader_next_pressed;
bool shader_prev_pressed;
bool fastforward_pressed;
bool hold_pressed;
bool old_hold_pressed;
bool state_slot_increase;
bool state_slot_decrease;
bool pause_pressed;
bool frameadvance_pressed;
bool rewind_pressed;
bool netplay_flip_pressed;
bool cheat_index_plus_pressed;
bool cheat_index_minus_pressed;
bool cheat_toggle_pressed;
} event_cmd_state_t;
/**
* event_disk_control_append_image:
* @path : Path to disk image.

39
retroarch.h
View File

@ -19,13 +19,12 @@
#include <boolean.h>
#include "core_info.h"
#include "command_event.h"
#ifdef __cplusplus
extern "C" {
#endif
#include "command_event.h"
enum action_state
{
RARCH_ACTION_STATE_NONE = 0,
@ -49,42 +48,6 @@ struct rarch_main_wrap
bool touched;
};
typedef struct rarch_cmd_state
{
bool fullscreen_toggle;
bool overlay_next_pressed;
bool grab_mouse_pressed;
bool menu_pressed;
bool quit_key_pressed;
bool screenshot_pressed;
bool mute_pressed;
bool osk_pressed;
bool volume_up_pressed;
bool volume_down_pressed;
bool reset_pressed;
bool disk_prev_pressed;
bool disk_next_pressed;
bool disk_eject_pressed;
bool movie_record;
bool save_state_pressed;
bool load_state_pressed;
bool slowmotion_pressed;
bool shader_next_pressed;
bool shader_prev_pressed;
bool fastforward_pressed;
bool hold_pressed;
bool old_hold_pressed;
bool state_slot_increase;
bool state_slot_decrease;
bool pause_pressed;
bool frameadvance_pressed;
bool rewind_pressed;
bool netplay_flip_pressed;
bool cheat_index_plus_pressed;
bool cheat_index_minus_pressed;
bool cheat_toggle_pressed;
} rarch_cmd_state_t;
void rarch_main_alloc(void);
void rarch_main_new(void);

10
runloop.c
View File

@ -443,7 +443,7 @@ static void do_state_check_menu_toggle(void)
*
* Returns: 0.
**/
static int do_pre_state_checks(rarch_cmd_state_t *cmd)
static int do_pre_state_checks(event_cmd_state_t *cmd)
{
runloop_t *runloop = rarch_main_get_ptr();
global_t *global = global_get_ptr();
@ -513,7 +513,7 @@ static int do_pause_state_checks(
*
* Returns: 1 if RetroArch is in pause mode, 0 otherwise.
**/
static int do_state_checks(rarch_cmd_state_t *cmd)
static int do_state_checks(event_cmd_state_t *cmd)
{
driver_t *driver = driver_get_ptr();
runloop_t *runloop = rarch_main_get_ptr();
@ -611,7 +611,7 @@ static int do_state_checks(rarch_cmd_state_t *cmd)
*
* Returns: 1 if any of the above conditions are true, otherwise 0.
**/
static INLINE int time_to_exit(rarch_cmd_state_t *cmd)
static INLINE int time_to_exit(event_cmd_state_t *cmd)
{
runloop_t *runloop = rarch_main_get_ptr();
global_t *global = global_get_ptr();
@ -1020,7 +1020,7 @@ bool rarch_main_is_idle(void)
return runloop->is_idle;
}
static void rarch_main_cmd_get_state(rarch_cmd_state_t *cmd,
static void rarch_main_cmd_get_state(event_cmd_state_t *cmd,
retro_input_t input, retro_input_t old_input,
retro_input_t trigger_input)
{
@ -1079,7 +1079,7 @@ int rarch_main_iterate(void)
{
unsigned i;
retro_input_t trigger_input;
rarch_cmd_state_t cmd = {0};
event_cmd_state_t cmd = {0};
runloop_t *runloop = rarch_main_get_ptr();
int ret = 0;
static retro_input_t last_input = 0;