From c453442f872fd1118f2a55dea9274b9eb81fe6db Mon Sep 17 00:00:00 2001
From: Liam <byteslice@airmail.cc>
Date: Mon, 19 Feb 2024 23:43:00 -0500
Subject: [PATCH] audio: move IFinalOutputRecorderManager{,ForApplet}
---
src/core/CMakeLists.txt | 8 ++++----
src/core/hle/service/audio/audio.cpp | 10 ++++++----
...{audrec_u.cpp => final_output_recorder_manager.cpp} | 7 ++++---
.../{audrec_a.h => final_output_recorder_manager.h} | 6 +++---
...pp => final_output_recorder_manager_for_applet.cpp} | 7 ++++---
..._u.h => final_output_recorder_manager_for_applet.h} | 7 ++++---
6 files changed, 25 insertions(+), 20 deletions(-)
rename src/core/hle/service/audio/{audrec_u.cpp => final_output_recorder_manager.cpp} (83%)
rename src/core/hle/service/audio/{audrec_a.h => final_output_recorder_manager.h} (56%)
rename src/core/hle/service/audio/{audrec_a.cpp => final_output_recorder_manager_for_applet.cpp} (55%)
rename src/core/hle/service/audio/{audrec_u.h => final_output_recorder_manager_for_applet.h} (51%)
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
index c0f828bcee..68b940af36 100644
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@@ -501,13 +501,13 @@ add_library(core STATIC
hle/service/audio/audio.h
hle/service/audio/audio_controller.cpp
hle/service/audio/audio_controller.h
- hle/service/audio/audrec_a.cpp
- hle/service/audio/audrec_a.h
- hle/service/audio/audrec_u.cpp
- hle/service/audio/audrec_u.h
hle/service/audio/audren_u.cpp
hle/service/audio/audren_u.h
hle/service/audio/errors.h
+ hle/service/audio/final_output_recorder_manager_for_applet.cpp
+ hle/service/audio/final_output_recorder_manager_for_applet.h
+ hle/service/audio/final_output_recorder_manager.cpp
+ hle/service/audio/final_output_recorder_manager.h
hle/service/audio/hwopus.cpp
hle/service/audio/hwopus.h
hle/service/bcat/backend/backend.cpp
diff --git a/src/core/hle/service/audio/audio.cpp b/src/core/hle/service/audio/audio.cpp
index aa5b9dbfe9..02773aee5e 100644
--- a/src/core/hle/service/audio/audio.cpp
+++ b/src/core/hle/service/audio/audio.cpp
@@ -6,9 +6,9 @@
#include "core/hle/service/audio/audio_controller.h"
#include "core/hle/service/audio/audio_in_manager.h"
#include "core/hle/service/audio/audio_out_manager.h"
-#include "core/hle/service/audio/audrec_a.h"
-#include "core/hle/service/audio/audrec_u.h"
#include "core/hle/service/audio/audren_u.h"
+#include "core/hle/service/audio/final_output_recorder_manager.h"
+#include "core/hle/service/audio/final_output_recorder_manager_for_applet.h"
#include "core/hle/service/audio/hwopus.h"
#include "core/hle/service/server_manager.h"
#include "core/hle/service/service.h"
@@ -21,8 +21,10 @@ void LoopProcess(Core::System& system) {
server_manager->RegisterNamedService("audctl", std::make_shared<IAudioController>(system));
server_manager->RegisterNamedService("audin:u", std::make_shared<IAudioInManager>(system));
server_manager->RegisterNamedService("audout:u", std::make_shared<IAudioOutManager>(system));
- server_manager->RegisterNamedService("audrec:a", std::make_shared<AudRecA>(system));
- server_manager->RegisterNamedService("audrec:u", std::make_shared<AudRecU>(system));
+ server_manager->RegisterNamedService(
+ "audrec:a", std::make_shared<IFinalOutputRecorderManagerForApplet>(system));
+ server_manager->RegisterNamedService("audrec:u",
+ std::make_shared<IFinalOutputRecorderManager>(system));
server_manager->RegisterNamedService("audren:u", std::make_shared<AudRenU>(system));
server_manager->RegisterNamedService("hwopus", std::make_shared<HwOpus>(system));
ServerManager::RunServer(std::move(server_manager));
diff --git a/src/core/hle/service/audio/audrec_u.cpp b/src/core/hle/service/audio/final_output_recorder_manager.cpp
similarity index 83%
rename from src/core/hle/service/audio/audrec_u.cpp
rename to src/core/hle/service/audio/final_output_recorder_manager.cpp
index bc55cec171..f70a0e62d7 100644
--- a/src/core/hle/service/audio/audrec_u.cpp
+++ b/src/core/hle/service/audio/final_output_recorder_manager.cpp
@@ -1,7 +1,7 @@
// SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project
// SPDX-License-Identifier: GPL-2.0-or-later
-#include "core/hle/service/audio/audrec_u.h"
+#include "core/hle/service/audio/final_output_recorder_manager.h"
namespace Service::Audio {
@@ -30,13 +30,14 @@ public:
}
};
-AudRecU::AudRecU(Core::System& system_) : ServiceFramework{system_, "audrec:u"} {
+IFinalOutputRecorderManager::IFinalOutputRecorderManager(Core::System& system_)
+ : ServiceFramework{system_, "audrec:u"} {
static const FunctionInfo functions[] = {
{0, nullptr, "OpenFinalOutputRecorder"},
};
RegisterHandlers(functions);
}
-AudRecU::~AudRecU() = default;
+IFinalOutputRecorderManager::~IFinalOutputRecorderManager() = default;
} // namespace Service::Audio
diff --git a/src/core/hle/service/audio/audrec_a.h b/src/core/hle/service/audio/final_output_recorder_manager.h
similarity index 56%
rename from src/core/hle/service/audio/audrec_a.h
rename to src/core/hle/service/audio/final_output_recorder_manager.h
index 9edf89f6c9..0663b894e7 100644
--- a/src/core/hle/service/audio/audrec_a.h
+++ b/src/core/hle/service/audio/final_output_recorder_manager.h
@@ -11,10 +11,10 @@ class System;
namespace Service::Audio {
-class AudRecA final : public ServiceFramework<AudRecA> {
+class IFinalOutputRecorderManager final : public ServiceFramework<IFinalOutputRecorderManager> {
public:
- explicit AudRecA(Core::System& system_);
- ~AudRecA() override;
+ explicit IFinalOutputRecorderManager(Core::System& system_);
+ ~IFinalOutputRecorderManager() override;
};
} // namespace Service::Audio
diff --git a/src/core/hle/service/audio/audrec_a.cpp b/src/core/hle/service/audio/final_output_recorder_manager_for_applet.cpp
similarity index 55%
rename from src/core/hle/service/audio/audrec_a.cpp
rename to src/core/hle/service/audio/final_output_recorder_manager_for_applet.cpp
index fa82e9ac73..7e2e42bbe7 100644
--- a/src/core/hle/service/audio/audrec_a.cpp
+++ b/src/core/hle/service/audio/final_output_recorder_manager_for_applet.cpp
@@ -1,11 +1,12 @@
// SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project
// SPDX-License-Identifier: GPL-2.0-or-later
-#include "core/hle/service/audio/audrec_a.h"
+#include "core/hle/service/audio/final_output_recorder_manager_for_applet.h"
namespace Service::Audio {
-AudRecA::AudRecA(Core::System& system_) : ServiceFramework{system_, "audrec:a"} {
+IFinalOutputRecorderManagerForApplet::IFinalOutputRecorderManagerForApplet(Core::System& system_)
+ : ServiceFramework{system_, "audrec:a"} {
// clang-format off
static const FunctionInfo functions[] = {
{0, nullptr, "RequestSuspend"},
@@ -16,6 +17,6 @@ AudRecA::AudRecA(Core::System& system_) : ServiceFramework{system_, "audrec:a"}
RegisterHandlers(functions);
}
-AudRecA::~AudRecA() = default;
+IFinalOutputRecorderManagerForApplet::~IFinalOutputRecorderManagerForApplet() = default;
} // namespace Service::Audio
diff --git a/src/core/hle/service/audio/audrec_u.h b/src/core/hle/service/audio/final_output_recorder_manager_for_applet.h
similarity index 51%
rename from src/core/hle/service/audio/audrec_u.h
rename to src/core/hle/service/audio/final_output_recorder_manager_for_applet.h
index 8b48178847..27940f7e0d 100644
--- a/src/core/hle/service/audio/audrec_u.h
+++ b/src/core/hle/service/audio/final_output_recorder_manager_for_applet.h
@@ -11,10 +11,11 @@ class System;
namespace Service::Audio {
-class AudRecU final : public ServiceFramework<AudRecU> {
+class IFinalOutputRecorderManagerForApplet final
+ : public ServiceFramework<IFinalOutputRecorderManagerForApplet> {
public:
- explicit AudRecU(Core::System& system_);
- ~AudRecU() override;
+ explicit IFinalOutputRecorderManagerForApplet(Core::System& system_);
+ ~IFinalOutputRecorderManagerForApplet() override;
};
} // namespace Service::Audio