From 1e71cc06626a2fb87c5de54a23542ba9d76cdeb8 Mon Sep 17 00:00:00 2001 From: Yukino Song Date: Mon, 26 May 2025 17:24:41 +0800 Subject: [PATCH] Make clang happy --- src/config.cpp | 58 +++++++++++++++++++++++++------------------------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/src/config.cpp b/src/config.cpp index 42edfbfb..b8b35264 100644 --- a/src/config.cpp +++ b/src/config.cpp @@ -52,7 +52,7 @@ namespace config { namespace nv { - nvenc::nvenc_two_pass twopass_from_view(const std::string_view &preset) { + nvenc::nvenc_two_pass twopass_from_view(const ::std::string_view &preset) { if (preset == "disabled") { return nvenc::nvenc_two_pass::disabled; } @@ -189,7 +189,7 @@ namespace config { }; template - std::optional quality_from_view(const std::string_view &quality_type, const std::optional(&original)) { + ::std::optional quality_from_view(const ::std::string_view &quality_type, const ::std::optional(&original)) { #define _CONVERT_(x) \ if (quality_type == #x##sv) \ return (int) T::x @@ -201,7 +201,7 @@ namespace config { } template - std::optional rc_from_view(const std::string_view &rc, const std::optional(&original)) { + ::std::optional rc_from_view(const ::std::string_view &rc, const ::std::optional(&original)) { #define _CONVERT_(x) \ if (rc == #x##sv) \ return (int) T::x @@ -214,7 +214,7 @@ namespace config { } template - std::optional usage_from_view(const std::string_view &usage, const std::optional(&original)) { + ::std::optional usage_from_view(const ::std::string_view &usage, const ::std::optional(&original)) { #define _CONVERT_(x) \ if (usage == #x##sv) \ return (int) T::x @@ -227,7 +227,7 @@ namespace config { return original; } - int coder_from_view(const std::string_view &coder) { + int coder_from_view(const ::std::string_view &coder) { if (coder == "auto"sv) { return _auto; } @@ -259,7 +259,7 @@ namespace config { disabled = false ///< Disabled }; - std::optional preset_from_view(const std::string_view &preset) { + ::std::optional preset_from_view(const ::std::string_view &preset) { #define _CONVERT_(x) \ if (preset == #x##sv) \ return x @@ -274,7 +274,7 @@ namespace config { return std::nullopt; } - std::optional coder_from_view(const std::string_view &coder) { + ::std::optional coder_from_view(const ::std::string_view &coder) { if (coder == "auto"sv) { return _auto; } @@ -297,7 +297,7 @@ namespace config { cavlc ///< CAVLC }; - int coder_from_view(const std::string_view &coder) { + int coder_from_view(const ::std::string_view &coder) { if (coder == "auto"sv) { return _auto; } @@ -311,7 +311,7 @@ namespace config { return -1; } - int allow_software_from_view(const std::string_view &software) { + int allow_software_from_view(const ::std::string_view &software) { if (software == "allowed"sv || software == "forced") { return 1; } @@ -319,7 +319,7 @@ namespace config { return 0; } - int force_software_from_view(const std::string_view &software) { + int force_software_from_view(const ::std::string_view &software) { if (software == "forced") { return 1; } @@ -327,7 +327,7 @@ namespace config { return 0; } - int rt_from_view(const std::string_view &rt) { + int rt_from_view(const ::std::string_view &rt) { if (rt == "disabled" || rt == "off" || rt == "0") { return 0; } @@ -338,7 +338,7 @@ namespace config { } // namespace vt namespace sw { - int svtav1_preset_from_view(const std::string_view &preset) { + int svtav1_preset_from_view(const ::std::string_view &preset) { #define _CONVERT_(x, y) \ if (preset == #x##sv) \ return y @@ -357,7 +357,7 @@ namespace config { } // namespace sw namespace dd { - video_t::dd_t::config_option_e config_option_from_view(const std::string_view value) { + video_t::dd_t::config_option_e config_option_from_view(const ::std::string_view value) { #define _CONVERT_(x) \ if (value == #x##sv) \ return video_t::dd_t::config_option_e::x @@ -370,7 +370,7 @@ namespace config { return video_t::dd_t::config_option_e::disabled; // Default to this if value is invalid } - video_t::dd_t::resolution_option_e resolution_option_from_view(const std::string_view value) { + video_t::dd_t::resolution_option_e resolution_option_from_view(const ::std::string_view value) { #define _CONVERT_2_ARG_(str, val) \ if (value == #str##sv) \ return video_t::dd_t::resolution_option_e::val @@ -383,7 +383,7 @@ namespace config { return video_t::dd_t::resolution_option_e::disabled; // Default to this if value is invalid } - video_t::dd_t::refresh_rate_option_e refresh_rate_option_from_view(const std::string_view value) { + video_t::dd_t::refresh_rate_option_e refresh_rate_option_from_view(const ::std::string_view value) { #define _CONVERT_2_ARG_(str, val) \ if (value == #str##sv) \ return video_t::dd_t::refresh_rate_option_e::val @@ -396,7 +396,7 @@ namespace config { return video_t::dd_t::refresh_rate_option_e::disabled; // Default to this if value is invalid } - video_t::dd_t::hdr_option_e hdr_option_from_view(const std::string_view value) { + video_t::dd_t::hdr_option_e hdr_option_from_view(const ::std::string_view value) { #define _CONVERT_2_ARG_(str, val) \ if (value == #str##sv) \ return video_t::dd_t::hdr_option_e::val @@ -408,7 +408,7 @@ namespace config { return video_t::dd_t::hdr_option_e::disabled; // Default to this if value is invalid } - video_t::dd_t::mode_remapping_t mode_remapping_from_view(const std::string_view value) { + video_t::dd_t::mode_remapping_t mode_remapping_from_view(const ::std::string_view value) { const auto parse_entry_list {[](const auto &entry_list, auto &output_field) { for (auto &[_, entry] : entry_list) { auto requested_resolution = entry.template get_optional("requested_resolution"s); @@ -641,9 +641,9 @@ namespace config { } std::pair< - std::string_view::const_iterator, - std::optional>> - parse_option(std::string_view::const_iterator begin, std::string_view::const_iterator end) { + ::std::string_view::const_iterator, + ::std::optional>> + parse_option(::std::string_view::const_iterator begin, ::std::string_view::const_iterator end) { begin = std::find_if_not(begin, end, whitespace); auto endl = std::find_if(begin, end, endline); auto endc = std::find(begin, endl, '#'); @@ -681,7 +681,7 @@ namespace config { ); } - std::unordered_map parse_config(const std::string_view &file_content) { + std::unordered_map parse_config(const ::std::string_view &file_content) { std::unordered_map vars; auto pos = std::begin(file_content); @@ -726,7 +726,7 @@ namespace config { } } - void string_restricted_f(std::unordered_map &vars, const std::string &name, std::string &input, const std::vector &allowed_vals) { + void string_restricted_f(std::unordered_map &vars, const std::string &name, std::string &input, const std::vector<::std::string_view> &allowed_vals) { std::string temp; string_f(vars, name, temp); @@ -777,7 +777,7 @@ namespace config { return; } - std::string_view val = it->second; + ::std::string_view val = it->second; // If value is something like: "756" instead of 756 if (val.size() >= 2 && val[0] == '"') { @@ -794,14 +794,14 @@ namespace config { vars.erase(it); } - void int_f(std::unordered_map &vars, const std::string &name, std::optional &input) { + void int_f(std::unordered_map &vars, const std::string &name, ::std::optional &input) { auto it = vars.find(name); if (it == std::end(vars)) { return; } - std::string_view val = it->second; + ::std::string_view val = it->second; // If value is something like: "756" instead of 756 if (val.size() >= 2 && val[0] == '"') { @@ -828,7 +828,7 @@ namespace config { } template - void int_f(std::unordered_map &vars, const std::string &name, std::optional &input, F &&f) { + void int_f(std::unordered_map &vars, const std::string &name, ::std::optional &input, F &&f) { std::string tmp; string_f(vars, name, tmp); if (!tmp.empty()) { @@ -1005,7 +1005,7 @@ namespace config { // That is, if you set only 30 fps in the configuration file, it will not work because by default, during initialization the list includes 10, 30, 60, 90 and 120 fps. input.clear(); for (auto &el : list) { - std::string_view val = el; + ::std::string_view val = el; // If value is something like: "756" instead of 756 if (val.size() >= 2 && val[0] == '"') { @@ -1070,9 +1070,9 @@ namespace config { return ret; } - std::vector &get_supported_gamepad_options() { + std::vector<::std::string_view> &get_supported_gamepad_options() { const auto options = platf::supported_gamepads(nullptr); - static std::vector opts {}; + static std::vector<::std::string_view> opts {}; opts.reserve(options.size()); for (auto &opt : options) { opts.emplace_back(opt.name);