diff options
author | npwoods <npwoods@mess.org> | 2022-06-15 06:57:23 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-06-15 20:57:23 +1000 |
commit | 699630ed167692e6d8d953caadd228bbd87c19aa (patch) | |
tree | 3b85ee6f8ceb4bcc5e97419206bb89200185faf4 /src/osd/modules/render | |
parent | fe1e26a9fb437de24661a5cb16f82ec94cdb14fc (diff) |
osdcore.h: Changed osd_subst_env to accept a std::string_view and return a std::string. (#9928)
Diffstat (limited to 'src/osd/modules/render')
-rw-r--r-- | src/osd/modules/render/bgfx/chainmanager.cpp | 6 | ||||
-rw-r--r-- | src/osd/modules/render/bgfx/effectmanager.cpp | 3 | ||||
-rw-r--r-- | src/osd/modules/render/bgfx/shadermanager.cpp | 4 |
3 files changed, 4 insertions, 9 deletions
diff --git a/src/osd/modules/render/bgfx/chainmanager.cpp b/src/osd/modules/render/bgfx/chainmanager.cpp index afbb7a99500..b9bee6d87a8 100644 --- a/src/osd/modules/render/bgfx/chainmanager.cpp +++ b/src/osd/modules/render/bgfx/chainmanager.cpp @@ -73,8 +73,7 @@ void chain_manager::refresh_available_chains() m_available_chains.clear(); m_available_chains.push_back(chain_desc("none", "")); - std::string chains_path; - osd_subst_env(chains_path, util::string_format("%s" PATH_SEPARATOR "chains", m_options.bgfx_path())); + const std::string chains_path = osd_subst_env(util::string_format("%s" PATH_SEPARATOR "chains", m_options.bgfx_path())); find_available_chains(chains_path, ""); destroy_unloaded_chains(); @@ -151,8 +150,7 @@ bgfx_chain* chain_manager::load_chain(std::string name, uint32_t screen_index) { name = name + ".json"; } - std::string path; - osd_subst_env(path, util::string_format("%s" PATH_SEPARATOR "chains" PATH_SEPARATOR, m_options.bgfx_path())); + std::string path = osd_subst_env(util::string_format("%s" PATH_SEPARATOR "chains" PATH_SEPARATOR, m_options.bgfx_path())); path += name; bx::FileReader reader; diff --git a/src/osd/modules/render/bgfx/effectmanager.cpp b/src/osd/modules/render/bgfx/effectmanager.cpp index 98bc9a72097..8fc2899482a 100644 --- a/src/osd/modules/render/bgfx/effectmanager.cpp +++ b/src/osd/modules/render/bgfx/effectmanager.cpp @@ -31,8 +31,7 @@ static bool prepare_effect_document(std::string &name, osd_options &options, rap full_name = full_name + ".json"; } - std::string path; - osd_subst_env(path, util::string_format("%s" PATH_SEPARATOR "effects" PATH_SEPARATOR, options.bgfx_path())); + std::string path = osd_subst_env(util::string_format("%s" PATH_SEPARATOR "effects" PATH_SEPARATOR, options.bgfx_path())); path += full_name; bx::FileReader reader; diff --git a/src/osd/modules/render/bgfx/shadermanager.cpp b/src/osd/modules/render/bgfx/shadermanager.cpp index dd131e719a5..484c14c8936 100644 --- a/src/osd/modules/render/bgfx/shadermanager.cpp +++ b/src/osd/modules/render/bgfx/shadermanager.cpp @@ -116,9 +116,7 @@ std::string shader_manager::make_path_string(osd_options &options, std::string n fatalerror("Unknown BGFX renderer type %d", bgfx::getRendererType()); } shader_path += PATH_SEPARATOR; - osd_subst_env(shader_path, shader_path); - - return shader_path; + return osd_subst_env(shader_path); } const bgfx::Memory* shader_manager::load_mem(std::string name) |