Fix issues caused by merge

novelrt · Jul 29, 2024 · ff50ad2 · ff50ad2
1 parent d85d52c
commit ff50ad2
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/src/NovelRT/Ecs/Audio/AudioSystem.cpp b/src/NovelRT/Ecs/Audio/AudioSystem.cpp
@@ -190,7 +190,7 @@ namespace NovelRT::Ecs::Audio
                     {
                         _mixer->SetSourceVolume(emitter.handle, emitter.volume);
                         _logger.logDebug("Entity ID {} - Emitter Volume {} -> {}", entity, soundContext.Volume,
-                                            emitter.volume);
+                                         emitter.volume);
                     }
                     if (_mixer->GetSourceState(emitter.handle) != NovelRT::Audio::AudioSourceState::SOURCE_PLAYING)
                     {

diff --git a/src/NovelRT/ResourceManagement/Desktop/DesktopResourceLoader.cpp b/src/NovelRT/ResourceManagement/Desktop/DesktopResourceLoader.cpp
@@ -419,11 +419,11 @@ namespace NovelRT::ResourceManagement::Desktop
         }
 
         sf_close(file);
-        
+
         auto relativePathForAssetDatabase = std::filesystem::relative(filePath, _resourcesRootDirectory);
         uuids::uuid databaseHandle = RegisterAsset(relativePathForAssetDatabase);
 
-        if(info.samplerate != _sampleRate)
+        if (info.samplerate != _sampleRate)
         {
             _logger.logDebug("Detected sample rate of {0}", info.samplerate);
             info.samplerate > 44100 ? _logger.logDebug("Downscaling...") : _logger.logDebug("Upscaling...");
@@ -437,7 +437,7 @@ namespace NovelRT::ResourceManagement::Desktop
             _logger.logDebug("Scaling by ratio of {0:f}", rate);
             conversionInfo.src_ratio = rate;
             int result = src_simple(&conversionInfo, SRC_SINC_MEDIUM_QUALITY, info.channels);
-            if(result != 0)
+            if (result != 0)
             {
                 std::string err = src_strerror(result);
                 _logger.logErrorLine(err);

diff --git a/thirdparty/CMakeLists.txt b/thirdparty/CMakeLists.txt
@@ -58,8 +58,8 @@ thirdparty_module(Ogg
   OVERRIDE_FIND_PACKAGE
 )
 thirdparty_module(OpenAL
-  URL https://github.com/kcat/openal-soft/archive/c03603b58d4cf6a25d36bca00305970bc9f163b4.zip
-  URL_HASH SHA512=331bf7d7ee138e3059dcdff68de153f73ba9b30dd098a0f5913d1e51d7292b8ad6f0e8642cb125bb8a757e70660a20375e5e76b70ddc59e5cbaab25676cbf9b8
+  URL https://github.com/kcat/openal-soft/archive/1318bea2e0f0af9430335708e65ae2ff920d98c6.zip
+  URL_HASH SHA512=a561b962ecfc6135cb6f5e4d9ba7b9719b8e6dce85112ca0dd4fe3efd05d86308a4076e0cba9e628b1a4ee2f984efabe517c1aa1399809ca848bae90b449ba4f
   OVERRIDE_FIND_PACKAGE
 )
 thirdparty_module(Opus