Allow UTF8 characters in song and filename #4515

xLightsSequencer · Apr 30, 2024 · 5cf48a5 · 5cf48a5
1 parent 019c30a
commit 5cf48a5
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/xLights/AudioManager.cpp b/xLights/AudioManager.cpp
@@ -26,6 +26,7 @@
 #include "../xSchedule/md5.h"
 #include "ExternalHooks.h"
 #include "Parallel.h"
+#include "UtilFunctions.h"
 
 extern "C"
 {
@@ -2096,7 +2097,7 @@ int AudioManager::OpenMediaFile()
     #endif
 
 	AVFormatContext* formatContext = nullptr;
-	int res = avformat_open_input(&formatContext, _audio_file.c_str(), nullptr, nullptr);
+	int res = avformat_open_input(&formatContext, ToUTF8(_audio_file).c_str(), nullptr, nullptr);
 	if (res != 0)
 	{
 		logger_base.error("avformat_open_input Error opening the file %s => %d.", (const char *) _audio_file.c_str(), res);

diff --git a/xLights/controllers/FPPConnectDialog.cpp b/xLights/controllers/FPPConnectDialog.cpp
@@ -658,7 +658,7 @@ void FPPConnectDialog::LoadSequencesFromFolder(wxString dir) const
                         case SP_XmlPullEvent::eCData:
                             if (isMedia) {
                                 SP_XmlCDataEvent * stagEvent = (SP_XmlCDataEvent*)event;
-                                mediaName = wxString::FromAscii(stagEvent->getText()).ToStdString();
+                                mediaName = FromUTF8(stagEvent->getText());
                                 done = true;
                             }
                             break;

diff --git a/xLights/xLightsXmlFile.cpp b/xLights/xLightsXmlFile.cpp
@@ -1141,7 +1141,7 @@ bool xLightsXmlFile::LoadSequence(const wxString& ShowDir, bool ignore_audio, co
                             audio = nullptr;
                         }
                         if (::FileExists(mf) && mf.IsFileReadable()) {
-                            mediaFileName = ToUTF8(media_file);
+                            mediaFileName = media_file.ToStdString();
                         }
                         else {
                             if (!::FileExists(mf)) {