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/frontend/mame | |
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/frontend/mame')
-rw-r--r-- | src/frontend/mame/clifront.cpp | 6 | ||||
-rw-r--r-- | src/frontend/mame/luaengine.cpp | 8 | ||||
-rw-r--r-- | src/frontend/mame/mame.cpp | 5 |
3 files changed, 5 insertions, 14 deletions
diff --git a/src/frontend/mame/clifront.cpp b/src/frontend/mame/clifront.cpp index 28f2caa8b02..b081c5f45a5 100644 --- a/src/frontend/mame/clifront.cpp +++ b/src/frontend/mame/clifront.cpp @@ -1707,10 +1707,8 @@ void cli_frontend::execute_commands(std::string_view exename) path_iterator iter(m_options.plugins_path()); std::string pluginpath; while (iter.next(pluginpath)) - { - osd_subst_env(pluginpath, pluginpath); - plugin_opts.scan_directory(pluginpath, true); - } + plugin_opts.scan_directory(osd_subst_env(pluginpath), true); + emu_file file_plugin(OPEN_FLAG_WRITE | OPEN_FLAG_CREATE | OPEN_FLAG_CREATE_PATHS); if (file_plugin.open("plugin.ini")) throw emu_fatalerror("Unable to create file plugin.ini\n"); diff --git a/src/frontend/mame/luaengine.cpp b/src/frontend/mame/luaengine.cpp index 5738e6f2cd2..fbfd3f0c829 100644 --- a/src/frontend/mame/luaengine.cpp +++ b/src/frontend/mame/luaengine.cpp @@ -716,13 +716,7 @@ void lua_engine::initialize() static_cast<char const *(*)(char const *)>(&lang_translate), static_cast<char const *(*)(char const *, char const *)>(&lang_translate)); emu["pid"] = &osd_getpid; - emu["subst_env"] = - [] (const std::string &str) - { - std::string result; - osd_subst_env(result, str); - return result; - }; + emu.set_function("subst_env", &osd_subst_env); emu["device_enumerator"] = sol::overload( [] (device_t &dev) { return devenum<device_enumerator>(dev); }, [] (device_t &dev, int maxdepth) { return devenum<device_enumerator>(dev, maxdepth); }); diff --git a/src/frontend/mame/mame.cpp b/src/frontend/mame/mame.cpp index 75e487f8753..5d8420c9f49 100644 --- a/src/frontend/mame/mame.cpp +++ b/src/frontend/mame/mame.cpp @@ -143,7 +143,7 @@ void mame_machine_manager::start_luaengine() while (iter.next(pluginpath)) { // user may specify environment variables; subsitute them - osd_subst_env(pluginpath, pluginpath); + pluginpath = osd_subst_env(pluginpath); // and then scan the directory recursively m_plugins->scan_directory(pluginpath, true); @@ -202,8 +202,7 @@ void mame_machine_manager::start_luaengine() std::error_condition const filerr = file.open("boot.lua"); if (!filerr) { - std::string exppath; - osd_subst_env(exppath, file.fullpath()); + const std::string exppath = osd_subst_env(file.fullpath()); auto &l(*lua()); auto load_result = l.load_script(exppath); if (!load_result.valid()) |