From afec66f598d2327946b869a1b744e4b4cbc1066c Mon Sep 17 00:00:00 2001 From: lizzie Date: Sat, 7 Mar 2026 23:44:58 +0100 Subject: [PATCH] core/hle/services/audio] Fix audioctl being started before audout/audin (which are required for ctor) (#3695) `audctl` depends on `audout`, simply start `audout` and `audin` before! Signed-off-by: lizzie Reviewed-on: https://git.eden-emu.dev/eden-emu/eden/pulls/3695 Reviewed-by: MaranBr Reviewed-by: DraVee Co-authored-by: lizzie Co-committed-by: lizzie --- src/core/hle/service/audio/audio.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/core/hle/service/audio/audio.cpp b/src/core/hle/service/audio/audio.cpp index 331176bf7f..7637ed5bf5 100644 --- a/src/core/hle/service/audio/audio.cpp +++ b/src/core/hle/service/audio/audio.cpp @@ -1,3 +1,6 @@ +// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project +// SPDX-License-Identifier: GPL-3.0-or-later + // SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later @@ -18,17 +21,14 @@ namespace Service::Audio { void LoopProcess(Core::System& system) { auto server_manager = std::make_unique(system); - server_manager->RegisterNamedService("audctl", std::make_shared(system)); server_manager->RegisterNamedService("audin:u", std::make_shared(system)); server_manager->RegisterNamedService("audout:u", std::make_shared(system)); - server_manager->RegisterNamedService( - "audrec:a", std::make_shared(system)); - server_manager->RegisterNamedService("audrec:u", - std::make_shared(system)); - server_manager->RegisterNamedService("audren:u", - std::make_shared(system)); - server_manager->RegisterNamedService("hwopus", - std::make_shared(system)); + // Depends on audout:u and audin:u on ctor! + server_manager->RegisterNamedService("audctl", std::make_shared(system)); + server_manager->RegisterNamedService("audrec:a", std::make_shared(system)); + server_manager->RegisterNamedService("audrec:u", std::make_shared(system)); + server_manager->RegisterNamedService("audren:u", std::make_shared(system)); + server_manager->RegisterNamedService("hwopus", std::make_shared(system)); ServerManager::RunServer(std::move(server_manager)); }