From 76716b52481e4061939cc08bf6da5446b7c20507 Mon Sep 17 00:00:00 2001 From: Zephyron Date: Sun, 9 Feb 2025 11:39:16 +1000 Subject: [PATCH] service/audio: Clean up audio controller implementation - Remove Unknown5000 function and related debug commands - Fix incorrect service name in log message --- src/core/hle/service/audio/audio_controller.cpp | 15 +-------------- src/core/hle/service/audio/audio_controller.h | 1 - 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/src/core/hle/service/audio/audio_controller.cpp b/src/core/hle/service/audio/audio_controller.cpp index f2ebeaf68..300764ad6 100644 --- a/src/core/hle/service/audio/audio_controller.cpp +++ b/src/core/hle/service/audio/audio_controller.cpp @@ -57,7 +57,6 @@ IAudioController::IAudioController(Core::System& system_) {40, nullptr, "GetSystemInformationForDebug"}, {41, nullptr, "SetVolumeButtonLongPressTime"}, {42, nullptr, "SetNativeVolumeForDebug"}, - {5000, D<&IAudioController::Unknown5000>, "Unknown5000"}, {10000, nullptr, "NotifyAudioOutputTargetForPlayReport"}, {10001, nullptr, "NotifyAudioOutputChannelCountForPlayReport"}, {10002, nullptr, "NotifyUnsupportedUsbOutputDeviceAttachedForPlayReport"}, @@ -69,9 +68,6 @@ IAudioController::IAudioController(Core::System& system_) {10105, nullptr, "BindAudioOutputChannelCountUpdateEventForPlayReport"}, {10106, nullptr, "GetDefaultAudioOutputTargetForPlayReport"}, {50000, nullptr, "SetAnalogInputBoostGainForPrototyping"}, - {50001, nullptr, "OverrideDefaultTargetForDebug"}, - {50003, nullptr, "SetForceOverrideExternalDeviceNameForDebug"}, - {50004, nullptr, "ClearForceOverrideExternalDeviceNameForDebug"} }; // clang-format on @@ -174,19 +170,10 @@ Result IAudioController::IsSpeakerAutoMuteEnabled(Out out_is_speaker_auto_ Result IAudioController::AcquireTargetNotification( OutCopyHandle out_notification_event) { - LOG_WARNING(Service_AM, "(STUBBED) called"); + LOG_WARNING(Service_Audio, "(STUBBED) called"); *out_notification_event = ¬ification_event->GetReadableEvent(); R_SUCCEED(); } -Result IAudioController::Unknown5000(Out> out_audio_controller) { - LOG_DEBUG(Audio, "Creating duplicate audio controller interface"); - - // Return a new reference to this controller instance - *out_audio_controller = SharedFrom(this); - - R_SUCCEED(); -} - } // namespace Service::Audio diff --git a/src/core/hle/service/audio/audio_controller.h b/src/core/hle/service/audio/audio_controller.h index b7645332e..d37c4843e 100644 --- a/src/core/hle/service/audio/audio_controller.h +++ b/src/core/hle/service/audio/audio_controller.h @@ -49,7 +49,6 @@ private: Result SetSpeakerAutoMuteEnabled(bool is_speaker_auto_mute_enabled); Result IsSpeakerAutoMuteEnabled(Out out_is_speaker_auto_mute_enabled); Result AcquireTargetNotification(OutCopyHandle out_notification_event); - Result Unknown5000(Out> out_audio_controller); KernelHelpers::ServiceContext service_context;