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

Add action OK fraction callbacks

Browse Source
This commit is contained in:
twinaphex 2014-10-15 00:56:20 +02:00
parent 88aa5e62e3
commit 9ade7b5245
2 changed files with 85 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
frontend/menu/menu_action.c
View File

@ -57,67 +57,8 @@ int menu_action_setting_unsigned_integer(
int menu_action_setting_fraction(
rarch_setting_t *setting, unsigned action)
{
if (!strcmp(setting->name, "video_refresh_rate_auto"))
{
switch (action)
{
case MENU_ACTION_START:
g_extern.measure_data.frame_time_samples_count = 0;
break;
case MENU_ACTION_OK:
{
double video_refresh_rate, deviation = 0.0;
unsigned sample_points = 0;
if (driver_monitor_fps_statistics(&video_refresh_rate,
&deviation, &sample_points))
{
driver_set_monitor_refresh_rate(video_refresh_rate);
/* Incase refresh rate update forced non-block video. */
rarch_main_command(RARCH_CMD_VIDEO_SET_BLOCKING_STATE);
}
if (setting->cmd_trigger.idx != RARCH_CMD_NONE)
setting->cmd_trigger.triggered = true;
}
break;
}
}
else
{
switch (action)
{
case MENU_ACTION_LEFT:
*setting->value.fraction =
*setting->value.fraction - setting->step;
if (setting->enforce_minrange)
{
if (*setting->value.fraction < setting->min)
*setting->value.fraction = setting->min;
}
break;
case MENU_ACTION_OK:
if (setting->cmd_trigger.idx != RARCH_CMD_NONE)
setting->cmd_trigger.triggered = true;
/* fall-through */
case MENU_ACTION_RIGHT:
*setting->value.fraction =
*setting->value.fraction + setting->step;
if (setting->enforce_maxrange)
{
if (*setting->value.fraction > setting->max)
*setting->value.fraction = setting->max;
}
break;
case MENU_ACTION_START:
*setting->value.fraction = setting->default_value.fraction;
break;
}
}
if (setting->action_ok)
setting->action_ok(setting, action);
return menu_action_setting_apply(setting);
}

83
settings_data.c
View File

@ -775,6 +775,85 @@ static int setting_data_uint_action_ok_default(void *data, unsigned action)
return 0;
}
static int setting_data_fraction_action_ok_video_refresh_rate_auto(
void *data, unsigned action)
{
rarch_setting_t *setting = (rarch_setting_t*)data;
if (!setting)
return -1;
switch (action)
{
case MENU_ACTION_START:
g_extern.measure_data.frame_time_samples_count = 0;
break;
case MENU_ACTION_OK:
{
double video_refresh_rate, deviation = 0.0;
unsigned sample_points = 0;
if (driver_monitor_fps_statistics(&video_refresh_rate,
&deviation, &sample_points))
{
driver_set_monitor_refresh_rate(video_refresh_rate);
/* Incase refresh rate update forced non-block video. */
rarch_main_command(RARCH_CMD_VIDEO_SET_BLOCKING_STATE);
}
if (setting->cmd_trigger.idx != RARCH_CMD_NONE)
setting->cmd_trigger.triggered = true;
}
break;
}
return 0;
}
static int setting_data_fraction_action_ok_default(
void *data, unsigned action)
{
rarch_setting_t *setting = (rarch_setting_t*)data;
if (!setting)
return -1;
switch (action)
{
case MENU_ACTION_LEFT:
*setting->value.fraction =
*setting->value.fraction - setting->step;
if (setting->enforce_minrange)
{
if (*setting->value.fraction < setting->min)
*setting->value.fraction = setting->min;
}
break;
case MENU_ACTION_OK:
if (setting->cmd_trigger.idx != RARCH_CMD_NONE)
setting->cmd_trigger.triggered = true;
/* fall-through */
case MENU_ACTION_RIGHT:
*setting->value.fraction =
*setting->value.fraction + setting->step;
if (setting->enforce_maxrange)
{
if (*setting->value.fraction > setting->max)
*setting->value.fraction = setting->max;
}
break;
case MENU_ACTION_START:
*setting->value.fraction = setting->default_value.fraction;
break;
}
return 0;
}
static int setting_data_uint_action_ok_linefeed(void *data, unsigned action)
{
rarch_setting_t *setting = (rarch_setting_t*)data;
@ -829,6 +908,8 @@ rarch_setting_t setting_data_float_setting(const char* name,
result.value.fraction = target;
result.original_value.fraction = *target;
result.default_value.fraction = default_value;
result.action_ok = setting_data_fraction_action_ok_default;
return result;
}
@ -3157,6 +3238,8 @@ static bool setting_data_append_list_video_options(
subgroup_info.name,
general_write_handler,
general_read_handler);
(*list)[list_info->index - 1].action_ok =
&setting_data_fraction_action_ok_video_refresh_rate_auto;
CONFIG_BOOL(
g_settings.video.force_srgb_disable,