mirrors-yuzu-emu/yuzu-mainline
1
0
Fork 0
mirror of https://github.com/yuzu-emu/yuzu-mainline synced 2024-11-25 16:55:59 +00:00
Code Issues Projects Releases Packages Wiki Activity

audio: move IFinalOutputRecorderManager{,ForApplet}

Browse source
This commit is contained in:
Liam 2024-02-19 23:43:00 -05:00
parent a45b8bc9bc
commit 2e5a9cf119
6 changed files with 25 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/core/CMakeLists.txt
View file

@ -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

10
src/core/hle/service/audio/audio.cpp
View file

@ -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));

7
src/core/hle/service/audio/audrec_u.cpp → src/core/hle/service/audio/final_output_recorder_manager.cpp
View file

@ -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

6
src/core/hle/service/audio/audrec_a.h → src/core/hle/service/audio/final_output_recorder_manager.h
View file

@ -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

7
src/core/hle/service/audio/audrec_a.cpp → src/core/hle/service/audio/final_output_recorder_manager_for_applet.cpp
View file

@ -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

7
src/core/hle/service/audio/audrec_u.h → src/core/hle/service/audio/final_output_recorder_manager_for_applet.h
View file

@ -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