Move audio fade helpers to audio action

WarmUpTill · Dec 27, 2023 · ebc16d8 · ebc16d8
1 parent 2986022
commit ebc16d8
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 19 deletions.
diff --git a/src/macro-core/macro-action-audio.cpp b/src/macro-core/macro-action-audio.cpp
@@ -1,5 +1,5 @@
 #include "macro-action-audio.hpp"
-#include "switcher-data.hpp"
+#include "macro.hpp"
 #include "utility.hpp"
 
 namespace advss {
@@ -36,6 +36,16 @@ const static std::map<MacroActionAudio::FadeType, std::string> fadeTypes = {
 	 "AdvSceneSwitcher.action.audio.fade.type.rate"},
 };
 
+namespace {
+struct FadeInfo {
+	std::atomic_bool active = {false};
+	std::atomic_int id = {0};
+};
+}
+
+static FadeInfo masterAudioFade;
+static std::unordered_map<std::string, FadeInfo> audioFades;
+
 constexpr auto fadeInterval = std::chrono::milliseconds(100);
 constexpr float minFade = 0.000001f;
 
@@ -58,25 +68,23 @@ auto set_master_volume = obs_set_master_volume;
 void MacroActionAudio::SetFadeActive(bool value)
 {
 	if (_action == Action::SOURCE_VOLUME) {
-		switcher->activeAudioFades[_audioSource.ToString()].active =
-			value;
+		audioFades[_audioSource.ToString()].active = value;
 	} else {
-		switcher->masterAudioFade.active = value;
+		masterAudioFade.active = value;
 	}
 }
 
 bool MacroActionAudio::FadeActive()
 {
 	bool active = true;
 	if (_action == Action::SOURCE_VOLUME) {
-		auto it = switcher->activeAudioFades.find(
-			_audioSource.ToString());
-		if (it == switcher->activeAudioFades.end()) {
+		auto it = audioFades.find(_audioSource.ToString());
+		if (it == audioFades.end()) {
 			return false;
 		}
 		active = it->second.active;
 	} else {
-		active = switcher->masterAudioFade.active;
+		active = masterAudioFade.active;
 	}
 
 	return active;
@@ -86,14 +94,13 @@ std::atomic_int *MacroActionAudio::GetFadeIdPtr()
 {
 
 	if (_action == Action::SOURCE_VOLUME) {
-		auto it = switcher->activeAudioFades.find(
-			_audioSource.ToString());
-		if (it == switcher->activeAudioFades.end()) {
+		auto it = audioFades.find(_audioSource.ToString());
+		if (it == audioFades.end()) {
 			return nullptr;
 		}
 		return &it->second.id;
 	}
-	return &switcher->masterAudioFade.id;
+	return &masterAudioFade.id;
 }
 
 void MacroActionAudio::SetVolume(float vol)

diff --git a/src/switcher-data.hpp b/src/switcher-data.hpp
@@ -143,13 +143,6 @@ class SwitcherData {
 
 	/* --- End of General tab section --- */
 
-	struct AudioFadeInfo {
-		std::atomic_bool active = {false};
-		std::atomic_int id = {0};
-	};
-	AudioFadeInfo masterAudioFade;
-	std::unordered_map<std::string, AudioFadeInfo> activeAudioFades;
-
 	std::string lastTitle;
 	std::string currentTitle;
 	std::string currentForegroundProcess;