summaryrefslogtreecommitdiff
path: root/src/audio_core/renderer
diff options
context:
space:
mode:
authorGravatar bunnei2022-09-15 13:50:13 -0700
committerGravatar GitHub2022-09-15 13:50:13 -0700
commite85bda5f31763359b69fbcad5c121995e1ad7074 (patch)
treecd9e85c7fabb334f2d19c20e3eb36c22e1883a21 /src/audio_core/renderer
parentMerge pull request #8902 from Morph1984/new_sd_icons (diff)
parentRemove pause callbacks from coretiming (diff)
downloadyuzu-e85bda5f31763359b69fbcad5c121995e1ad7074.tar.gz
yuzu-e85bda5f31763359b69fbcad5c121995e1ad7074.tar.xz
yuzu-e85bda5f31763359b69fbcad5c121995e1ad7074.zip
Merge pull request #8878 from Kelebek1/remove_pause
Remove pause callbacks from coretiming
Diffstat (limited to 'src/audio_core/renderer')
-rw-r--r--src/audio_core/renderer/system_manager.cpp11
-rw-r--r--src/audio_core/renderer/system_manager.h9
2 files changed, 1 insertions, 19 deletions
diff --git a/src/audio_core/renderer/system_manager.cpp b/src/audio_core/renderer/system_manager.cpp
index bc2dd9e6e..9c1331e19 100644
--- a/src/audio_core/renderer/system_manager.cpp
+++ b/src/audio_core/renderer/system_manager.cpp
@@ -22,9 +22,7 @@ SystemManager::SystemManager(Core::System& core_)
22 thread_event{Core::Timing::CreateEvent( 22 thread_event{Core::Timing::CreateEvent(
23 "AudioRendererSystemManager", [this](std::uintptr_t, s64 time, std::chrono::nanoseconds) { 23 "AudioRendererSystemManager", [this](std::uintptr_t, s64 time, std::chrono::nanoseconds) {
24 return ThreadFunc2(time); 24 return ThreadFunc2(time);
25 })} { 25 })} {}
26 core.CoreTiming().RegisterPauseCallback([this](bool paused) { PauseCallback(paused); });
27}
28 26
29SystemManager::~SystemManager() { 27SystemManager::~SystemManager() {
30 Stop(); 28 Stop();
@@ -125,11 +123,4 @@ std::optional<std::chrono::nanoseconds> SystemManager::ThreadFunc2(s64 time) {
125 return std::nullopt; 123 return std::nullopt;
126} 124}
127 125
128void SystemManager::PauseCallback(bool paused) {
129 if (paused && core.IsPoweredOn() && core.IsShuttingDown()) {
130 update.store(true);
131 update.notify_all();
132 }
133}
134
135} // namespace AudioCore::AudioRenderer 126} // namespace AudioCore::AudioRenderer
diff --git a/src/audio_core/renderer/system_manager.h b/src/audio_core/renderer/system_manager.h
index 1291e9e0e..81457a3a1 100644
--- a/src/audio_core/renderer/system_manager.h
+++ b/src/audio_core/renderer/system_manager.h
@@ -73,13 +73,6 @@ private:
73 */ 73 */
74 std::optional<std::chrono::nanoseconds> ThreadFunc2(s64 time); 74 std::optional<std::chrono::nanoseconds> ThreadFunc2(s64 time);
75 75
76 /**
77 * Callback from core timing when pausing, used to detect shutdowns and stop ThreadFunc.
78 *
79 * @param paused - Are we pausing or resuming?
80 */
81 void PauseCallback(bool paused);
82
83 enum class StreamState { 76 enum class StreamState {
84 Filling, 77 Filling,
85 Steady, 78 Steady,
@@ -106,8 +99,6 @@ private:
106 std::shared_ptr<Core::Timing::EventType> thread_event; 99 std::shared_ptr<Core::Timing::EventType> thread_event;
107 /// Atomic for main thread to wait on 100 /// Atomic for main thread to wait on
108 std::atomic<bool> update{}; 101 std::atomic<bool> update{};
109 /// Current state of the streams
110 StreamState state{StreamState::Filling};
111}; 102};
112 103
113} // namespace AudioCore::AudioRenderer 104} // namespace AudioCore::AudioRenderer