mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-23 01:21:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Try to reduce variable sizes

Browse Source
This commit is contained in:
twinaphex 2017-09-08 05:58:48 +02:00
parent 8b054c2a67
commit c3bb76a05e
3 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
audio/audio_driver.c
View File

@ -953,7 +953,8 @@ static int audio_mixer_find_index(audio_mixer_sound_t *sound)
return -1; return -1;
} }
static void audio_mixer_play_stop_cb(audio_mixer_sound_t *sound, unsigned reason) static void audio_mixer_play_stop_cb(
audio_mixer_sound_t *sound, unsigned reason)
{ {
int idx = audio_mixer_find_index(sound); int idx = audio_mixer_find_index(sound);

6
gfx/video_driver.c
View File

@ -124,8 +124,10 @@ typedef struct video_pixel_scaler
void *scaler_out; void *scaler_out;
} video_pixel_scaler_t; } video_pixel_scaler_t;
static void (*video_driver_cb_shader_use)(void *data, void *shader_data, unsigned index, bool set_active); static void (*video_driver_cb_shader_use)(void *data,
static bool (*video_driver_cb_shader_set_mvp)(void *data, void *shader_data, const math_matrix_4x4 *mat); void *shader_data, unsigned index, bool set_active);
static bool (*video_driver_cb_shader_set_mvp)(void *data,
void *shader_data, const math_matrix_4x4 *mat);
bool (*video_driver_cb_has_focus)(void); bool (*video_driver_cb_has_focus)(void);
/* Opaque handles to currently running window. /* Opaque handles to currently running window.

27
input/input_driver.c
View File

@ -228,7 +228,7 @@ static const char *bind_user_prefix[MAX_USERS] = {
"input_player16", "input_player16",
}; };
static const unsigned buttons[] = { static const uint8_t buttons[] = {
RETRO_DEVICE_ID_JOYPAD_R, RETRO_DEVICE_ID_JOYPAD_R,
RETRO_DEVICE_ID_JOYPAD_L, RETRO_DEVICE_ID_JOYPAD_L,
RETRO_DEVICE_ID_JOYPAD_X, RETRO_DEVICE_ID_JOYPAD_X,
@ -545,7 +545,7 @@ void input_poll(void)
{ {
size_t i; size_t i;
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
unsigned max_users = input_driver_max_users; uint8_t max_users = (uint8_t)input_driver_max_users;
current_input->poll(current_input_data); current_input->poll(current_input_data);
@ -716,7 +716,7 @@ void state_tracker_update_input(uint16_t *input1, uint16_t *input2)
unsigned i; unsigned i;
const struct retro_keybind *binds[MAX_USERS]; const struct retro_keybind *binds[MAX_USERS];
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
unsigned max_users = input_driver_max_users; uint8_t max_users = (uint8_t)input_driver_max_users;
for (i = 0; i < max_users; i++) for (i = 0; i < max_users; i++)
{ {
@ -786,16 +786,15 @@ void state_tracker_update_input(uint16_t *input1, uint16_t *input2)
*/ */
uint64_t input_menu_keys_pressed(void *data, uint64_t last_input) uint64_t input_menu_keys_pressed(void *data, uint64_t last_input)
{ {
unsigned i; unsigned i, port;
rarch_joypad_info_t joypad_info; rarch_joypad_info_t joypad_info;
uint64_t ret = 0; uint64_t ret = 0;
const struct retro_keybind *binds[MAX_USERS] = {NULL}; const struct retro_keybind *binds[MAX_USERS] = {NULL};
settings_t *settings = (settings_t*)data; settings_t *settings = (settings_t*)data;
const struct retro_keybind *binds_norm = NULL; const struct retro_keybind *binds_norm = NULL;
const struct retro_keybind *binds_auto = NULL; const struct retro_keybind *binds_auto = NULL;
unsigned max_users = input_driver_max_users; uint8_t max_users = (uint8_t)input_driver_max_users;
unsigned port; uint8_t port_max =
unsigned port_max =
settings->bools.input_all_users_control_menu settings->bools.input_all_users_control_menu
? max_users : 1; ? max_users : 1;
@ -2044,7 +2043,6 @@ void input_keyboard_event(bool down, unsigned code,
bool input_keyboard_ctl(enum rarch_input_keyboard_ctl_state state, void *data) bool input_keyboard_ctl(enum rarch_input_keyboard_ctl_state state, void *data)
{ {
switch (state) switch (state)
{ {
case RARCH_INPUT_KEYBOARD_CTL_LINE_FREE: case RARCH_INPUT_KEYBOARD_CTL_LINE_FREE:
@ -2210,14 +2208,9 @@ unsigned input_config_translate_str_to_bind_id(const char *str)
static void parse_hat(struct retro_keybind *bind, const char *str) static void parse_hat(struct retro_keybind *bind, const char *str)
{ {
uint16_t hat;
uint16_t hat_dir = 0; uint16_t hat_dir = 0;
char *dir = NULL; char *dir = NULL;
uint16_t hat = strtoul(str, &dir, 0);
if (!bind || !str || !isdigit((int)*str))
return;
hat = strtoul(str, &dir, 0);
if (!dir) if (!dir)
{ {
@ -2265,7 +2258,11 @@ void input_config_parse_joy_button(void *data, const char *prefix,
else else
{ {
if (*btn == 'h') if (*btn == 'h')
parse_hat(bind, btn + 1); {
const char *str = btn + 1;
if (bind && str && isdigit((int)*str))
parse_hat(bind, str);
}
else else
bind->joykey = strtoull(tmp, NULL, 0); bind->joykey = strtoull(tmp, NULL, 0);
} }