etc/obs-StreamFX
0
0
Fork 0
mirror of https://github.com/Xaymar/obs-StreamFX synced 2024-11-14 07:45:06 +00:00
Code Issues Projects Releases Packages Wiki Activity

util/library: Fix unicode support

Browse source 
Related: #359
This commit is contained in:
Michael Fabian 'Xaymar' Dirks 2020-11-28 23:31:51 +01:00
parent 55ad82aac0
commit 0a71af9d6a
1 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
source/util/util-library.cpp
View file

@ -54,7 +54,7 @@ util::library::library(std::filesystem::path file) : _library(nullptr)
throw std::runtime_error("Failed to load library."); throw std::runtime_error("Failed to load library.");
} }
#elif defined(ST_UNIX) #elif defined(ST_UNIX)
_library = dlopen(file.string().c_str(), RTLD_LAZY); _library = dlopen(file.u8string().c_str(), RTLD_LAZY);
if (!_library) { if (!_library) {
if (char* error = dlerror(); error) if (char* error = dlerror(); error)
throw std::runtime_error(error); throw std::runtime_error(error);
@ -86,9 +86,7 @@ static std::unordered_map<std::string, std::weak_ptr<::util::library>> libraries
std::shared_ptr<::util::library> util::library::load(std::filesystem::path file) std::shared_ptr<::util::library> util::library::load(std::filesystem::path file)
{ {
std::string utf8_name = file.string(); auto kv = libraries.find(file.u8string());
auto kv = libraries.find(utf8_name);
if (kv != libraries.end()) { if (kv != libraries.end()) {
if (auto ptr = kv->second.lock(); ptr) if (auto ptr = kv->second.lock(); ptr)
return ptr; return ptr;
@ -96,12 +94,12 @@ std::shared_ptr<::util::library> util::library::load(std::filesystem::path file)
} }
auto ptr = std::make_shared<::util::library>(file); auto ptr = std::make_shared<::util::library>(file);
libraries.emplace(utf8_name, ptr); libraries.emplace(file.u8string(), ptr);
return ptr; return ptr;
} }
std::shared_ptr<::util::library> util::library::load(std::string_view name) std::shared_ptr<::util::library> util::library::load(std::string_view name)
{ {
return load(std::filesystem::path(name)); return load(std::filesystem::u8path(name));
} }