Parse blacklist with parse_str_tokenize

pull/398/head
Alessandro Toia 4 years ago
parent 7c80dc53ef
commit ef05ab2f20

@ -184,6 +184,20 @@ parse_load_value(const char *str)
}
static std::vector<std::string>
parse_str_tokenize(const char *str)
{
std::vector<std::string> data;
std::stringstream ss(str);
std::string token;
while (std::getline(ss, token, ',')) {
trim(token);
data.push_back(token);
}
return data;
}
static unsigned
parse_unsigned(const char *str)
{
@ -362,7 +376,7 @@ parse_font_glyph_ranges(const char *str)
#define parse_cpu_load_color(s) parse_load_color(s)
#define parse_gpu_load_value(s) parse_load_value(s)
#define parse_cpu_load_value(s) parse_load_value(s)
#define parse_blacklist(s) parse_str(s)
#define parse_blacklist(s) parse_str_tokenize(s)
static bool
parse_help(const char *str)

@ -198,7 +198,8 @@ struct overlay_params {
std::string pci_dev;
std::string media_player_name;
std::string cpu_text, gpu_text;
std::string blacklist;
//std::string blacklist;
std::vector<std::string> blacklist;
unsigned log_interval;
std::vector<media_player_order> media_player_order;
std::vector<std::string> benchmark_percentiles;

@ -2082,11 +2082,8 @@ static VkResult overlay_CreateInstance(
parse_overlay_config(&instance_data->params, getenv("MANGOHUD_CONFIG"));
//check for blacklist item in the config file
std::stringstream ss(instance_data->params.blacklist);
std::string token;
while (std::getline(ss, token, ',')) {
trim(token);
add_blacklist(token);
for (auto& item : instance_data->params.blacklist) {
add_blacklist(item);
}
if (!is_blacklisted()) {

Loading…
Cancel
Save