diff --git a/xLights/AudioManager.cpp b/xLights/AudioManager.cpp index 3da49e3492..056fc6907d 100644 --- 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 index 3b2731e61a..2e7ebbb3ef 100644 --- 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 index e1851d38db..f96deea4d6 100644 --- 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)) {