aboutsummaryrefslogtreecommitdiff
path: root/NorthstarDedicatedTest/audio.h
diff options
context:
space:
mode:
authorBobTheBob <32057864+BobTheBob9@users.noreply.github.com>2022-04-09 01:13:31 +0100
committerGitHub <noreply@github.com>2022-04-09 01:13:31 +0100
commit1de9ea495fbe0a73db670ee73c23fad844364b8b (patch)
tree69b86581862ec22d58c1bc4d1e557fa85515f579 /NorthstarDedicatedTest/audio.h
parentbc3e633718dc4d8b3528ae62b1e67702f1a42b9c (diff)
downloadNorthstarLauncher-1de9ea495fbe0a73db670ee73c23fad844364b8b.tar.gz
NorthstarLauncher-1de9ea495fbe0a73db670ee73c23fad844364b8b.zip
add audio changes (#133)
* add audio changes * use shared_mutex instead of atomic_int for waiting on audio loads
Diffstat (limited to 'NorthstarDedicatedTest/audio.h')
-rw-r--r--NorthstarDedicatedTest/audio.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/NorthstarDedicatedTest/audio.h b/NorthstarDedicatedTest/audio.h
index 3220d804..6ed3ce57 100644
--- a/NorthstarDedicatedTest/audio.h
+++ b/NorthstarDedicatedTest/audio.h
@@ -3,6 +3,7 @@
#include <vector>
#include <filesystem>
#include <regex>
+#include <shared_mutex>
namespace fs = std::filesystem;
@@ -39,6 +40,7 @@ class CustomAudioManager
bool TryLoadAudioOverride(const fs::path&);
void ClearAudioOverrides();
+ std::shared_mutex m_loadingMutex;
std::unordered_map<std::string, std::shared_ptr<EventOverrideData>> m_loadedAudioOverrides = {};
std::unordered_map<std::string, std::shared_ptr<EventOverrideData>> m_loadedAudioOverridesRegex = {};
};