mirror of
https://github.com/libretro/RetroArch
synced 2025-03-31 19:21:06 +00:00
Fixed compiling with --disable-menu (#14535)
This commit is contained in:
parent
03c901dfb8
commit
72a076a58d
@ -415,7 +415,7 @@ static const input_device_driver_t *input_joypad_init_first(void *data)
|
|||||||
}
|
}
|
||||||
|
|
||||||
bool input_driver_set_rumble(
|
bool input_driver_set_rumble(
|
||||||
unsigned port, unsigned joy_idx,
|
unsigned port, unsigned joy_idx,
|
||||||
enum retro_rumble_effect effect, uint16_t strength)
|
enum retro_rumble_effect effect, uint16_t strength)
|
||||||
{
|
{
|
||||||
const input_device_driver_t *primary_joypad;
|
const input_device_driver_t *primary_joypad;
|
||||||
@ -2547,8 +2547,8 @@ void joypad_driver_reinit(void *data, const char *joypad_driver_name)
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Retrieves the sensor state associated with the provided port and ID.
|
* Retrieves the sensor state associated with the provided port and ID.
|
||||||
*
|
*
|
||||||
* @param port
|
* @param port
|
||||||
* @param id Sensor ID
|
* @param id Sensor ID
|
||||||
*
|
*
|
||||||
@ -2564,7 +2564,7 @@ float input_get_sensor_state(unsigned port, unsigned id)
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Sets the rumble state. Used by RETRO_ENVIRONMENT_GET_RUMBLE_INTERFACE.
|
* Sets the rumble state. Used by RETRO_ENVIRONMENT_GET_RUMBLE_INTERFACE.
|
||||||
*
|
*
|
||||||
* @param port User number.
|
* @param port User number.
|
||||||
* @param effect Rumble effect.
|
* @param effect Rumble effect.
|
||||||
* @param strength Strength of rumble effect.
|
* @param strength Strength of rumble effect.
|
||||||
@ -2578,7 +2578,7 @@ bool input_set_rumble_state(unsigned port,
|
|||||||
unsigned joy_idx = settings->uints.input_joypad_index[port];
|
unsigned joy_idx = settings->uints.input_joypad_index[port];
|
||||||
uint16_t scaled_strength = strength;
|
uint16_t scaled_strength = strength;
|
||||||
|
|
||||||
/* If gain setting is not suported, do software gain control */
|
/* If gain setting is not suported, do software gain control */
|
||||||
if (input_driver_st.primary_joypad)
|
if (input_driver_st.primary_joypad)
|
||||||
{
|
{
|
||||||
if (!input_driver_st.primary_joypad->set_rumble_gain)
|
if (!input_driver_st.primary_joypad->set_rumble_gain)
|
||||||
@ -2610,7 +2610,7 @@ bool input_set_rumble_gain(unsigned gain)
|
|||||||
|
|
||||||
uint64_t input_driver_get_capabilities(void)
|
uint64_t input_driver_get_capabilities(void)
|
||||||
{
|
{
|
||||||
if ( !input_driver_st.current_driver ||
|
if ( !input_driver_st.current_driver ||
|
||||||
!input_driver_st.current_driver->get_capabilities)
|
!input_driver_st.current_driver->get_capabilities)
|
||||||
return 0;
|
return 0;
|
||||||
return input_driver_st.current_driver->get_capabilities(input_driver_st.current_data);
|
return input_driver_st.current_driver->get_capabilities(input_driver_st.current_data);
|
||||||
@ -2700,7 +2700,7 @@ bool video_driver_init_input(
|
|||||||
/* This should never really happen as tmp (driver.input) is always
|
/* This should never really happen as tmp (driver.input) is always
|
||||||
* found before this in find_driver_input(), or we have aborted
|
* found before this in find_driver_input(), or we have aborted
|
||||||
* in a similar fashion anyways. */
|
* in a similar fashion anyways. */
|
||||||
if ( !input_driver_st.current_driver ||
|
if ( !input_driver_st.current_driver ||
|
||||||
!(new_data = input_driver_init_wrap(
|
!(new_data = input_driver_init_wrap(
|
||||||
input_driver_st.current_driver,
|
input_driver_st.current_driver,
|
||||||
settings->arrays.input_joypad_driver)))
|
settings->arrays.input_joypad_driver)))
|
||||||
@ -2710,7 +2710,7 @@ bool video_driver_init_input(
|
|||||||
}
|
}
|
||||||
|
|
||||||
input_driver_st.current_data = new_data;
|
input_driver_st.current_data = new_data;
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -3173,7 +3173,7 @@ void input_driver_init_command(
|
|||||||
if (input_stdin_cmd_enable)
|
if (input_stdin_cmd_enable)
|
||||||
{
|
{
|
||||||
input_driver_state_t *input_st = &input_driver_st;
|
input_driver_state_t *input_st = &input_driver_st;
|
||||||
bool grab_stdin =
|
bool grab_stdin =
|
||||||
input_st->current_driver->grab_stdin &&
|
input_st->current_driver->grab_stdin &&
|
||||||
input_st->current_driver->grab_stdin(input_st->current_data);
|
input_st->current_driver->grab_stdin(input_st->current_data);
|
||||||
if (grab_stdin)
|
if (grab_stdin)
|
||||||
@ -3371,7 +3371,7 @@ static void input_overlay_loaded(retro_task_t *task,
|
|||||||
{
|
{
|
||||||
#ifdef HAVE_MENU
|
#ifdef HAVE_MENU
|
||||||
/* We can't display when the menu is up */
|
/* We can't display when the menu is up */
|
||||||
if ( data->hide_in_menu
|
if ( data->hide_in_menu
|
||||||
&& (menu_state_get_ptr()->flags & MENU_ST_FLAG_ALIVE))
|
&& (menu_state_get_ptr()->flags & MENU_ST_FLAG_ALIVE))
|
||||||
goto abort_load;
|
goto abort_load;
|
||||||
#endif
|
#endif
|
||||||
@ -4092,8 +4092,8 @@ void input_driver_poll(void)
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* This rarch_joypad_info_t struct contains the device index + autoconfig binds for the
|
/* This rarch_joypad_info_t struct contains the device index + autoconfig binds for the
|
||||||
* controller to be queried, and also (for unknown reasons) the analog axis threshold
|
* controller to be queried, and also (for unknown reasons) the analog axis threshold
|
||||||
* when mapping analog stick to dpad input. */
|
* when mapping analog stick to dpad input. */
|
||||||
for (i = 0; i < max_users; i++)
|
for (i = 0; i < max_users; i++)
|
||||||
{
|
{
|
||||||
@ -4923,7 +4923,7 @@ int16_t input_state_internal(unsigned port, unsigned device,
|
|||||||
INP_FLAG_BLOCK_LIBRETRO_INPUT);
|
INP_FLAG_BLOCK_LIBRETRO_INPUT);
|
||||||
#else
|
#else
|
||||||
bool input_blocked = (input_st->flags &
|
bool input_blocked = (input_st->flags &
|
||||||
INP_FLAG_BLOCK_LIBETRO_INPUT);
|
INP_FLAG_BLOCK_LIBRETRO_INPUT);
|
||||||
#endif
|
#endif
|
||||||
bool bitmask_enabled = false;
|
bool bitmask_enabled = false;
|
||||||
unsigned max_users = settings->uints.input_max_users;
|
unsigned max_users = settings->uints.input_max_users;
|
||||||
@ -5110,7 +5110,7 @@ INP_FLAG_BLOCK_LIBETRO_INPUT);
|
|||||||
int16_t input_driver_state_wrapper(unsigned port, unsigned device,
|
int16_t input_driver_state_wrapper(unsigned port, unsigned device,
|
||||||
unsigned idx, unsigned id)
|
unsigned idx, unsigned id)
|
||||||
{
|
{
|
||||||
input_driver_state_t
|
input_driver_state_t
|
||||||
*input_st = &input_driver_st;
|
*input_st = &input_driver_st;
|
||||||
int16_t result = 0;
|
int16_t result = 0;
|
||||||
#ifdef HAVE_BSV_MOVIE
|
#ifdef HAVE_BSV_MOVIE
|
||||||
@ -5665,9 +5665,9 @@ void input_keyboard_event(bool down, unsigned code,
|
|||||||
{
|
{
|
||||||
static bool deferred_wait_keys;
|
static bool deferred_wait_keys;
|
||||||
runloop_state_t *runloop_st = runloop_state_get_ptr();
|
runloop_state_t *runloop_st = runloop_state_get_ptr();
|
||||||
retro_keyboard_event_t
|
retro_keyboard_event_t
|
||||||
*key_event = &runloop_st->key_event;
|
*key_event = &runloop_st->key_event;
|
||||||
input_driver_state_t
|
input_driver_state_t
|
||||||
*input_st = &input_driver_st;
|
*input_st = &input_driver_st;
|
||||||
#ifdef HAVE_ACCESSIBILITY
|
#ifdef HAVE_ACCESSIBILITY
|
||||||
access_state_t *access_st = access_state_get_ptr();
|
access_state_t *access_st = access_state_get_ptr();
|
||||||
@ -5833,7 +5833,7 @@ void input_keyboard_event(bool down, unsigned code,
|
|||||||
input_mapper_t *handle = &input_st->mapper;
|
input_mapper_t *handle = &input_st->mapper;
|
||||||
struct retro_keybind hotkey = input_config_binds[0][RARCH_ENABLE_HOTKEY];
|
struct retro_keybind hotkey = input_config_binds[0][RARCH_ENABLE_HOTKEY];
|
||||||
bool hotkey_pressed =
|
bool hotkey_pressed =
|
||||||
(input_st->input_hotkey_block_counter > 0)
|
(input_st->input_hotkey_block_counter > 0)
|
||||||
|| (hotkey.key == code);
|
|| (hotkey.key == code);
|
||||||
|
|
||||||
if (!(MAPPER_GET_KEY(handle, code)) &&
|
if (!(MAPPER_GET_KEY(handle, code)) &&
|
||||||
|
@ -2576,8 +2576,10 @@ bool command_event(enum event_command cmd, void *data)
|
|||||||
command_playlist_update_write(
|
command_playlist_update_write(
|
||||||
NULL, *playlist_index, &entry);
|
NULL, *playlist_index, &entry);
|
||||||
|
|
||||||
|
#ifdef HAVE_MENU
|
||||||
/* Update playlist metadata */
|
/* Update playlist metadata */
|
||||||
menu_driver_ctl(RARCH_MENU_CTL_REFRESH_THUMBNAIL_IMAGE, &i);
|
menu_driver_ctl(RARCH_MENU_CTL_REFRESH_THUMBNAIL_IMAGE, &i);
|
||||||
|
#endif
|
||||||
|
|
||||||
runloop_msg_queue_push(msg_hash_to_str(MSG_RESET_CORE_ASSOCIATION), 1, 180, true, NULL, MESSAGE_QUEUE_ICON_DEFAULT, MESSAGE_QUEUE_CATEGORY_INFO);
|
runloop_msg_queue_push(msg_hash_to_str(MSG_RESET_CORE_ASSOCIATION), 1, 180, true, NULL, MESSAGE_QUEUE_ICON_DEFAULT, MESSAGE_QUEUE_CATEGORY_INFO);
|
||||||
break;
|
break;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user