sam/sfizz-ui
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Save paths in an agnostic format

Browse source
This commit is contained in:
Paul Fd 2023-12-06 22:23:19 +01:00 • committed by Paul Ferrand
parent 338d946b9a
commit 5e4cee48c4
3 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
plugins/common/plugin/NativeHelpers.cpp
View file

@ -14,10 +14,11 @@
#if defined(_WIN32) #if defined(_WIN32)
const fs::path toPlatformAgnosticPath(std::string& filePath) const fs::path toPlatformAgnosticPath(const std::string& filePath)
{ {
std::replace(filePath.begin(), filePath.end(), '\\', '/'); std::string p { filePath };
return fs::u8path(filePath); std::replace(p.begin(), p.end(), '\\', '/');
return fs::u8path(p);
} }
const fs::path fromPlatformAgnosticPath(const char *filePath) const fs::path fromPlatformAgnosticPath(const char *filePath)
{ {
@ -26,7 +27,7 @@ const fs::path fromPlatformAgnosticPath(const char *filePath)
return fs::u8path(p); return fs::u8path(p);
} }
#else #else
const fs::path toPlatformAgnosticPath(std::string& filePath) const fs::path toPlatformAgnosticPath(const std::string& filePath)
{ {
return fs::u8path(filePath); return fs::u8path(filePath);
} }

2
plugins/common/plugin/NativeHelpers.h
View file

@ -13,7 +13,7 @@
const fs::path& getUserDocumentsDirectory(); const fs::path& getUserDocumentsDirectory();
const fs::path toPlatformAgnosticPath(std::string& filePath); const fs::path toPlatformAgnosticPath(const std::string& filePath);
const fs::path fromPlatformAgnosticPath(const char *filePath); const fs::path fromPlatformAgnosticPath(const char *filePath);
#if !defined(_WIN32) && !defined(__APPLE__) #if !defined(_WIN32) && !defined(__APPLE__)

4
plugins/vst/SfizzVstState.cpp
View file

@ -122,7 +122,7 @@ tresult SfizzVstState::store(IBStream* state) const
if (!s.writeInt64u(currentStateVersion)) if (!s.writeInt64u(currentStateVersion))
return kResultFalse; return kResultFalse;
if (!s.writeStr8(sfzFile.c_str())) if (!s.writeStr8(toPlatformAgnosticPath(sfzFile).string().c_str()))
return kResultFalse; return kResultFalse;
if (!s.writeFloat(volume)) if (!s.writeFloat(volume))
@ -137,7 +137,7 @@ tresult SfizzVstState::store(IBStream* state) const
if (!s.writeInt32(preloadSize)) if (!s.writeInt32(preloadSize))
return kResultFalse; return kResultFalse;
if (!s.writeStr8(scalaFile.c_str())) if (!s.writeStr8(toPlatformAgnosticPath(scalaFile).string().c_str()))
return kResultFalse; return kResultFalse;
if (!s.writeInt32(scalaRootKey)) if (!s.writeInt32(scalaRootKey))