Unicode paths on windows correctly handled

for mp3, sf2, scm and scp Closes #1301
surge-synthesizer · Sep 30, 2024 · fd58c8b · fd58c8b
1 parent d7fce38
commit fd58c8b
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 2 deletions.
diff --git a/libs/sst/libgig-modified b/libs/sst/libgig-modified
diff --git a/resources/test_samples/聲音不好.flac b/resources/test_samples/聲音不好.flac
diff --git a/resources/test_samples/聲音不好.mp3 b/resources/test_samples/聲音不好.mp3
diff --git a/src/sample/loaders/load_mp3.cpp b/src/sample/loaders/load_mp3.cpp
@@ -37,11 +37,23 @@ bool Sample::parseMP3(const fs::path &p)
 {
  mp3dec_t mp3d;
  mp3dec_file_info_t info;
+#if WIN32
+ int count =
+ MultiByteToWideChar(CP_UTF8, 0, p.u8string().c_str(), p.u8string().length(), NULL, 0);
+ std::wstring wstr(count, 0);
+ MultiByteToWideChar(CP_UTF8, 0, p.u8string().c_str(), p.u8string().length(), &wstr[0], count);
+ if (mp3dec_load_w(&mp3d, &wstr[0], &info, nullptr, nullptr))
+ {
+ SCLOG("Failed to parse MP3");
+ return false;
+ }
+#else
  if (mp3dec_load(&mp3d, p.u8string().c_str(), &info, nullptr, nullptr))
  {
  SCLOG("Failed to parse MP3");
  return false;
  }
+#endif
 
  if (info.channels < 1 || info.channels > 2)
  return false;

diff --git a/src/sample/sample.cpp b/src/sample/sample.cpp
@@ -146,7 +146,7 @@ bool Sample::loadFromSF2(const fs::path &p, sf2::File *f, int sampleIndex)
 
  auto s = sfsample;
 
- auto fnp = fs::path{f->GetRiffFile()->GetFileName()};
+ auto fnp = fs::path(fs::u8path(f->GetRiffFile()->GetFileName()));
  displayName = fmt::format("{} - ({} @ {})", s->Name, fnp.filename().u8string(), sampleIndex);
 
  if (frameSize == 2 && channels == 1 && sfsample->SampleType == sf2::Sample::MONO_SAMPLE)