From aa89791b609674c5e7ec51865b581b1021224d3a Mon Sep 17 00:00:00 2001 From: twinaphex Date: Tue, 25 Sep 2018 15:40:16 +0200 Subject: [PATCH] Update --- menu/cbs/menu_cbs_get_value.c | 25 ------------------------- menu/menu_setting.c | 12 ++++++++++++ 2 files changed, 12 insertions(+), 25 deletions(-) diff --git a/menu/cbs/menu_cbs_get_value.c b/menu/cbs/menu_cbs_get_value.c index 921a51b623..069c91a1d3 100644 --- a/menu/cbs/menu_cbs_get_value.c +++ b/menu/cbs/menu_cbs_get_value.c @@ -228,27 +228,6 @@ static void menu_action_setting_disp_set_label_shader_filter_pass( } } -static void menu_action_setting_disp_set_label_filter( - file_list_t* list, - unsigned *w, unsigned type, unsigned i, - const char *label, - char *s, size_t len, - const char *entry_label, - const char *path, - char *s2, size_t len2) -{ - settings_t *settings = config_get_ptr(); - - *s = '\0'; - *w = 19; - strlcpy(s2, path, len2); - strlcpy(s, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NOT_AVAILABLE), len); - - if (settings && *settings->paths.path_softfilter_plugin) - fill_short_pathname_representation(s, - settings->paths.path_softfilter_plugin, len); -} - #ifdef HAVE_NETWORKING static void menu_action_setting_disp_set_label_netplay_mitm_server( file_list_t* list, @@ -1381,10 +1360,6 @@ static int menu_cbs_init_bind_get_string_representation_compare_label( BIND_ACTION_GET_VALUE(cbs, menu_action_setting_disp_set_label_shader_default_filter); break; - case MENU_ENUM_LABEL_VIDEO_FILTER: - BIND_ACTION_GET_VALUE(cbs, - menu_action_setting_disp_set_label_filter); - break; case MENU_ENUM_LABEL_CONFIGURATIONS: BIND_ACTION_GET_VALUE(cbs, menu_action_setting_disp_set_label_configurations); diff --git a/menu/menu_setting.c b/menu/menu_setting.c index 25dcd64b29..6558f12423 100644 --- a/menu/menu_setting.c +++ b/menu/menu_setting.c @@ -175,6 +175,16 @@ static int setting_action_ok_uint(void *data, bool wraparound) return 0; } +static void setting_get_string_representation_video_filter(void *data, + char *s, size_t len) +{ + rarch_setting_t *setting = (rarch_setting_t*)data; + if (!setting) + return; + + fill_short_pathname_representation(s, setting->value.target.string, len); +} + static void setting_get_string_representation_state_slot(void *data, char *s, size_t len) { @@ -5252,6 +5262,8 @@ static bool setting_append_list( parent_group, general_write_handler, general_read_handler); + (*list)[list_info->index - 1].get_string_representation = + &setting_get_string_representation_video_filter; menu_settings_list_current_add_values(list, list_info, "filt"); menu_settings_list_current_add_cmd(list, list_info, CMD_EVENT_REINIT); settings_data_list_current_add_flags(list, list_info, SD_FLAG_LAKKA_ADVANCED);