fix(logging): Handling wchar_t on Windows.

Signed-off-by: Axel Nana <[email protected]>
AmplitudeAudio · Jun 22, 2024 · 8785005 · 8785005
1 parent 8ee12f6
commit 8785005
Show file tree

Hide file tree

Showing 11 changed files with 38 additions and 33 deletions.
diff --git a/include/SparkyStudios/Audio/Amplitude/Core/Log.h b/include/SparkyStudios/Audio/Amplitude/Core/Log.h
@@ -15,7 +15,9 @@
 #ifndef SPARK_AUDIO_LOG_H
 #define SPARK_AUDIO_LOG_H
 
-#include <fmt/format.h>
+#include <fmt/chrono.h>
+#include <fmt/std.h>
+#include <fmt/xchar.h>
 
 #include <SparkyStudios/Audio/Amplitude/Core/Common.h>
 
@@ -34,7 +36,7 @@
 #define amLog(_level_, _message_, ...)                                                                                                     \
     if (amLogger != nullptr)                                                                                                               \
     {                                                                                                                                      \
-        amLogger->_level_(fmt::format(_message_, ##__VA_ARGS__), __FILE__, __LINE__);                                                      \
+        amLogger->_level_(fmt::format((_message_), ##__VA_ARGS__), __FILE__, __LINE__);                                                    \
     }                                                                                                                                      \
     (void)0
 

diff --git a/src/Core/Codecs/AMS/Codec.cpp b/src/Core/Codecs/AMS/Codec.cpp
@@ -535,7 +535,7 @@ namespace SparkyStudios::Audio::Amplitude
 
         if (!ReadHeader(_file, m_format, _blockSize))
         {
-            amLogError("The AMS codec cannot handle the file: '{}'", file->GetPath());
+            amLogError("The AMS codec cannot handle the file: '{}'", AM_OS_STRING_TO_STRING(file->GetPath()));
             return false;
         }
 
@@ -598,7 +598,7 @@ namespace SparkyStudios::Audio::Amplitude
 
         if (!WriteHeader(_file, m_format, _samplesPerBlock))
         {
-            amLogError("The AMS codec was unable to write the file: '{}'", file->GetPath());
+            amLogError("The AMS codec was unable to write the file: '{}'", AM_OS_STRING_TO_STRING(file->GetPath()));
             return false;
         }
 

diff --git a/src/Core/Codecs/MP3/Codec.cpp b/src/Core/Codecs/MP3/Codec.cpp
@@ -64,7 +64,7 @@ namespace SparkyStudios::Audio::Amplitude
     {
         if (!m_codec->CanHandleFile(file))
         {
-            amLogError("The MP3 codec cannot handle the file: '{}'", file->GetPath());
+            amLogError("The MP3 codec cannot handle the file: '{}'", AM_OS_STRING_TO_STRING(file->GetPath()));
             return false;
         }
 
@@ -73,14 +73,14 @@ namespace SparkyStudios::Audio::Amplitude
 
         if (drmp3_init(&_mp3, onRead, onSeek, _file.get(), &codec->m_allocationCallbacks) == DRMP3_FALSE)
         {
-            amLogError("Cannot load the MP3 file: '{}'", file->GetPath());
+            amLogError("Cannot load the MP3 file: '{}'", AM_OS_STRING_TO_STRING(file->GetPath()));
             return false;
         }
 
         const drmp3_uint64 framesCount = drmp3_get_pcm_frame_count(&_mp3);
         if (framesCount == DRMP3_FALSE)
         {
-            amLogError("Cannot load the MP3 file: '{}'.", file->GetPath());
+            amLogError("Cannot load the MP3 file: '{}'.", AM_OS_STRING_TO_STRING(file->GetPath()));
             return false;
         }
 

diff --git a/src/Core/Codecs/WAV/Codec.cpp b/src/Core/Codecs/WAV/Codec.cpp
@@ -70,7 +70,7 @@ namespace SparkyStudios::Audio::Amplitude
     {
         if (!m_codec->CanHandleFile(file))
         {
-            amLogError("The WAV codec cannot handle the file: '{}'.", file->GetPath());
+            amLogError("The WAV codec cannot handle the file: '{}'.", AM_OS_STRING_TO_STRING(file->GetPath()));
             return false;
         }
 
@@ -79,7 +79,7 @@ namespace SparkyStudios::Audio::Amplitude
 
         if (drwav_init(&_wav, onRead, onSeek, _file.get(), &codec->m_allocationCallbacks) == DRWAV_FALSE)
         {
-            amLogError("Cannot load the WAV file: '{}'.", file->GetPath());
+            amLogError("Cannot load the WAV file: '{}'.", AM_OS_STRING_TO_STRING(file->GetPath()));
             return false;
         }
 
@@ -141,7 +141,8 @@ namespace SparkyStudios::Audio::Amplitude
         if (!_isFormatSet)
         {
             amLogError(
-                "The WAV codec cannot open the file '{}' without a format set. Have you missed to call SetFormat()?", file->GetPath());
+                "The WAV codec cannot open the file '{}' without a format set. Have you missed to call SetFormat()?",
+                AM_OS_STRING_TO_STRING(file->GetPath()));
             return false;
         }
 
@@ -158,7 +159,7 @@ namespace SparkyStudios::Audio::Amplitude
         if (drwav_init_write_sequential_pcm_frames(
                 &_wav, &format, m_format.GetFramesCount(), onWrite, _file.get(), &codec->m_allocationCallbacks) == DRWAV_FALSE)
         {
-            amLogError("Cannot load the WAV file: '{}'.", file->GetPath());
+            amLogError("Cannot load the WAV file: '{}'.", AM_OS_STRING_TO_STRING(file->GetPath()));
             return false;
         }
 

diff --git a/src/Core/Drivers/MiniAudio/Driver.cpp b/src/Core/Drivers/MiniAudio/Driver.cpp
@@ -44,19 +44,19 @@ namespace SparkyStudios::Audio::Amplitude
         switch (level)
         {
         case MA_LOG_LEVEL_DEBUG:
-            amLogger->Debug(pMessage, __FILE__, __LINE__);
+            amLogDebug("{}", pMessage);
             break;
         case MA_LOG_LEVEL_INFO:
-            amLogger->Info(pMessage, __FILE__, __LINE__);
+            amLogInfo("{}", pMessage);
             break;
         case MA_LOG_LEVEL_WARNING:
-            amLogger->Warning(pMessage, __FILE__, __LINE__);
+            amLogWarning("{}", pMessage);
             break;
         case MA_LOG_LEVEL_ERROR:
-            amLogger->Error(pMessage, __FILE__, __LINE__);
+            amLogError("{}", pMessage);
             break;
         default:
-            amLogger->Critical(pMessage, __FILE__, __LINE__);
+            amLogCritical("{}", pMessage);
             break;
         }
     }

diff --git a/src/Core/Engine.cpp b/src/Core/Engine.cpp
@@ -222,26 +222,26 @@ namespace SparkyStudios::Audio::Amplitude
 
         if (!plugin->has_symbol("RegisterPlugin"))
         {
-            amLogError("LoadPlugin fail on '{}'. The library doesn't export a RegisterPlugin symbol.", pluginLibraryName);
+            amLogError("LoadPlugin fail on '{}'. The library doesn't export a RegisterPlugin symbol.", AM_OS_STRING_TO_STRING(pluginLibraryName));
             return nullptr;
         }
 
         if (!plugin->has_symbol("PluginName"))
         {
-            amLogError("LoadPlugin fail on '{}'. The library doesn't export a PluginName symbol.", pluginLibraryName);
+            amLogError("LoadPlugin fail on '{}'. The library doesn't export a PluginName symbol.", AM_OS_STRING_TO_STRING(pluginLibraryName));
             return nullptr;
         }
 
         if (!plugin->has_symbol("PluginVersion"))
         {
-            amLogError("LoadPlugin fail on '{}'. The library doesn't export a PluginVersion symbol.", pluginLibraryName);
+            amLogError("LoadPlugin fail on '{}'. The library doesn't export a PluginVersion symbol.", AM_OS_STRING_TO_STRING(pluginLibraryName));
             return nullptr;
         }
 
         if (const auto registerFunc = plugin->get_function<bool(Engine*, MemoryManager*)>("RegisterPlugin");
             !registerFunc(amEngine, amMemory))
         {
-            amLogError("LoadPlugin fail on '{}'. The plugin registration has failed.", pluginLibraryName);
+            amLogError("LoadPlugin fail on '{}'. The plugin registration has failed.", AM_OS_STRING_TO_STRING(pluginLibraryName));
             return nullptr;
         }
 
@@ -550,7 +550,7 @@ namespace SparkyStudios::Audio::Amplitude
     {
         if (const AmOsString& configFilePath = _fs->ResolvePath(configFile); !LoadFile(_fs->OpenFile(configFilePath), &_configSrc))
         {
-            amLogError("Could not load audio config file at path '{}'.", configFile);
+            amLogError("Could not load audio config file at path '{}'.", AM_OS_STRING_TO_STRING(configFile));
             return false;
         }
 
@@ -850,7 +850,7 @@ namespace SparkyStudios::Audio::Amplitude
     {
         if (const auto findIt = _state->sound_bank_id_map.find(filename); findIt == _state->sound_bank_id_map.end())
         {
-            amLogWarning("Cannot deinitialize Soundbank '{}'. Soundbank not loaded.", filename);
+            amLogWarning("Cannot deinitialize Soundbank '{}'. Soundbank not loaded.", AM_OS_STRING_TO_STRING(filename));
             AMPLITUDE_ASSERT(0);
         }
         else

diff --git a/src/Mixer/Mixer.cpp b/src/Mixer/Mixer.cpp
@@ -246,7 +246,7 @@ namespace SparkyStudios::Audio::Amplitude
     static void OnSoundStarted(Mixer* mixer, MixerLayer* layer)
     {
         const auto* sound = layer->snd->sound.get();
-        amLogDebug("Started sound: {}.", sound->GetSound()->GetPath());
+        amLogDebug("Started sound: {}.", AM_OS_STRING_TO_STRING(sound->GetSound()->GetPath()));
 
         const auto* channel = sound->GetChannel();
         auto* channelState = channel->GetParentChannelState();
@@ -257,7 +257,7 @@ namespace SparkyStudios::Audio::Amplitude
     static void OnSoundPaused(Mixer* mixer, MixerLayer* layer)
     {
         const auto* sound = layer->snd->sound.get();
-        amLogDebug("Paused sound: {}.", sound->GetSound()->GetPath());
+        amLogDebug("Paused sound: {}.", AM_OS_STRING_TO_STRING(sound->GetSound()->GetPath()));
 
         const auto* channel = sound->GetChannel();
         auto* channelState = channel->GetParentChannelState();
@@ -268,7 +268,7 @@ namespace SparkyStudios::Audio::Amplitude
     static void OnSoundResumed(Mixer* mixer, MixerLayer* layer)
     {
         const auto* sound = layer->snd->sound.get();
-        amLogDebug("Resumed sound: {}.", sound->GetSound()->GetPath());
+        amLogDebug("Resumed sound: {}.", AM_OS_STRING_TO_STRING(sound->GetSound()->GetPath()));
 
         const auto* channel = sound->GetChannel();
         auto* channelState = channel->GetParentChannelState();
@@ -279,7 +279,7 @@ namespace SparkyStudios::Audio::Amplitude
     static void OnSoundStopped(Mixer* mixer, MixerLayer* layer)
     {
         const auto* sound = layer->snd->sound.get();
-        amLogDebug("Stopped sound: {}.", sound->GetSound()->GetPath());
+        amLogDebug("Stopped sound: {}.", AM_OS_STRING_TO_STRING(sound->GetSound()->GetPath()));
 
         const auto* channel = sound->GetChannel();
         auto* channelState = channel->GetParentChannelState();
@@ -293,7 +293,7 @@ namespace SparkyStudios::Audio::Amplitude
     static bool OnSoundLooped(Mixer* mixer, MixerLayer* layer)
     {
         auto* sound = layer->snd->sound.get();
-        amLogDebug("Looped sound: {}.", sound->GetSound()->GetPath());
+        amLogDebug("Looped sound: {}.", AM_OS_STRING_TO_STRING(sound->GetSound()->GetPath()));
 
         Mixer::IncrementSoundLoopCount(sound);
 
@@ -322,7 +322,7 @@ namespace SparkyStudios::Audio::Amplitude
     static void OnSoundEnded(Mixer* mixer, MixerLayer* layer)
     {
         auto* sound = layer->snd->sound.get();
-        amLogDebug("Ended sound: {}.", sound->GetSound()->GetPath());
+        amLogDebug("Ended sound: {}.", AM_OS_STRING_TO_STRING(sound->GetSound()->GetPath()));
 
         RealChannel* channel = sound->GetChannel();
         auto* channelState = channel->GetParentChannelState();

diff --git a/src/Mixer/RealChannel.cpp b/src/Mixer/RealChannel.cpp
@@ -152,7 +152,7 @@ namespace SparkyStudios::Audio::Amplitude
         if (!success)
         {
             _channelLayersId[layer] = kAmInvalidObjectId;
-            amLogError("Could not play sound '{}'.", _activeSounds[layer]->GetSound()->GetPath());
+            amLogError("Could not play sound '{}'.", AM_OS_STRING_TO_STRING(_activeSounds[layer]->GetSound()->GetPath()));
         }
 
         return success;

diff --git a/src/Sound/Sound.cpp b/src/Sound/Sound.cpp
@@ -136,7 +136,7 @@ namespace SparkyStudios::Audio::Amplitude
 
         if (!loader->Exists(filename))
         {
-            amLogError("Cannot load the sound: the file \"{}\" does not exist.", filename);
+            amLogError("Cannot load the sound: the file \"{}\" does not exist.", AM_OS_STRING_TO_STRING(filename));
             return;
         }
 
@@ -145,14 +145,14 @@ namespace SparkyStudios::Audio::Amplitude
         _codec = Codec::FindCodecForFile(file);
         if (_codec == nullptr)
         {
-            amLogError("Cannot load the sound: unable to find codec for '{}'.", filename);
+            amLogError("Cannot load the sound: unable to find codec for '{}'.", AM_OS_STRING_TO_STRING(filename));
             return;
         }
 
         _decoder = _codec->CreateDecoder();
         if (!_decoder->Open(file))
         {
-            amLogError("Cannot load the sound: unable to initialize a decoder for '{}'.", filename);
+            amLogError("Cannot load the sound: unable to initialize a decoder for '{}'.", AM_OS_STRING_TO_STRING(filename));
             return;
         }
 
@@ -287,7 +287,7 @@ namespace SparkyStudios::Audio::Amplitude
             _decoder = _parent->_codec->CreateDecoder();
             if (!_decoder->Open(file))
             {
-                amLogError("Cannot load the sound: unable to initialize a decoder for '{}'.", filename);
+                amLogError("Cannot load the sound: unable to initialize a decoder for '{}'.", AM_OS_STRING_TO_STRING(filename));
                 return;
             }
         }

diff --git a/tools/amac/main.cpp b/tools/amac/main.cpp
@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include <cstdarg>
 #include <iostream>
 
 #include <SparkyStudios/Audio/Amplitude/Amplitude.h>

diff --git a/tools/ampk/main.cpp b/tools/ampk/main.cpp
@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include <cstdarg>
 #include <iostream>
 
 #include <SparkyStudios/Audio/Amplitude/Amplitude.h>