Cool_Tools/yuzu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #8938 from lioncash/manager

Browse Source 
audio_manager: Minor cleanup related changes
This commit is contained in:
Morph 2022-09-23 09:07:38 -04:00 committed by GitHub
commit 3b77dec188
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/audio_core/audio_core.cpp
View File

@ -8,7 +8,7 @@
namespace AudioCore { namespace AudioCore {
AudioCore::AudioCore(Core::System& system) : audio_manager{std::make_unique<AudioManager>(system)} { AudioCore::AudioCore(Core::System& system) : audio_manager{std::make_unique<AudioManager>()} {
CreateSinks(); CreateSinks();
// Must be created after the sinks // Must be created after the sinks
adsp = std::make_unique<AudioRenderer::ADSP::ADSP>(system, *output_sink); adsp = std::make_unique<AudioRenderer::ADSP::ADSP>(system, *output_sink);

17
src/audio_core/audio_manager.cpp
View File

@ -1,14 +1,13 @@
// SPDX-FileCopyrightText: Copyright 2022 yuzu Emulator Project // SPDX-FileCopyrightText: Copyright 2022 yuzu Emulator Project
// SPDX-License-Identifier: GPL-2.0-or-later // SPDX-License-Identifier: GPL-2.0-or-later
#include "audio_core/audio_in_manager.h"
#include "audio_core/audio_manager.h" #include "audio_core/audio_manager.h"
#include "audio_core/audio_out_manager.h"
#include "core/core.h" #include "core/core.h"
#include "core/hle/service/audio/errors.h"
namespace AudioCore { namespace AudioCore {
AudioManager::AudioManager(Core::System& system_) : system{system_} { AudioManager::AudioManager() {
thread = std::jthread([this]() { ThreadFunc(); }); thread = std::jthread([this]() { ThreadFunc(); });
} }
@ -27,7 +26,7 @@ Result AudioManager::SetOutManager(BufferEventFunc buffer_func) {
const auto index{events.GetManagerIndex(Event::Type::AudioOutManager)}; const auto index{events.GetManagerIndex(Event::Type::AudioOutManager)};
if (buffer_events[index] == nullptr) { if (buffer_events[index] == nullptr) {
buffer_events[index] = buffer_func; buffer_events[index] = std::move(buffer_func);
needs_update = true; needs_update = true;
events.SetAudioEvent(Event::Type::AudioOutManager, true); events.SetAudioEvent(Event::Type::AudioOutManager, true);
} }
@ -43,7 +42,7 @@ Result AudioManager::SetInManager(BufferEventFunc buffer_func) {
const auto index{events.GetManagerIndex(Event::Type::AudioInManager)}; const auto index{events.GetManagerIndex(Event::Type::AudioInManager)};
if (buffer_events[index] == nullptr) { if (buffer_events[index] == nullptr) {
buffer_events[index] = buffer_func; buffer_events[index] = std::move(buffer_func);
needs_update = true; needs_update = true;
events.SetAudioEvent(Event::Type::AudioInManager, true); events.SetAudioEvent(Event::Type::AudioInManager, true);
} }
@ -60,19 +59,21 @@ void AudioManager::ThreadFunc() {
running = true; running = true;
while (running) { while (running) {
auto timed_out{events.Wait(l, std::chrono::seconds(2))}; const auto timed_out{events.Wait(l, std::chrono::seconds(2))};
if (events.CheckAudioEventSet(Event::Type::Max)) { if (events.CheckAudioEventSet(Event::Type::Max)) {
break; break;
} }
for (size_t i = 0; i < buffer_events.size(); i++) { for (size_t i = 0; i < buffer_events.size(); i++) {
if (events.CheckAudioEventSet(Event::Type(i)) || timed_out) { const auto event_type = static_cast<Event::Type>(i);
if (events.CheckAudioEventSet(event_type) || timed_out) {
if (buffer_events[i]) { if (buffer_events[i]) {
buffer_events[i](); buffer_events[i]();
} }
} }
events.SetAudioEvent(Event::Type(i), false); events.SetAudioEvent(event_type, false);
} }
} }
} }

19
src/audio_core/audio_manager.h
View File

@ -10,22 +10,11 @@
#include <thread> #include <thread>
#include "audio_core/audio_event.h" #include "audio_core/audio_event.h"
#include "core/hle/service/audio/errors.h"
namespace Core { union Result;
class System;
}
namespace AudioCore { namespace AudioCore {
namespace AudioOut {
class Manager;
}
namespace AudioIn {
class Manager;
}
/** /**
* The AudioManager's main purpose is to wait for buffer events for the audio in and out managers, * The AudioManager's main purpose is to wait for buffer events for the audio in and out managers,
* and call an associated callback to release buffers. * and call an associated callback to release buffers.
@ -43,7 +32,7 @@ class AudioManager {
using BufferEventFunc = std::function<void()>; using BufferEventFunc = std::function<void()>;
public: public:
explicit AudioManager(Core::System& system); explicit AudioManager();
/** /**
* Shutdown the audio manager. * Shutdown the audio manager.
@ -80,10 +69,6 @@ private:
*/ */
void ThreadFunc(); void ThreadFunc();
/// Core system
Core::System& system;
/// Have sessions started palying?
bool sessions_started{};
/// Is the main thread running? /// Is the main thread running?
std::atomic<bool> running{}; std::atomic<bool> running{};
/// Unused /// Unused