From 3d4dfefaecd247fb1969d5e403ac8c97e490d7d9 Mon Sep 17 00:00:00 2001 From: bunnei Date: Mon, 2 Apr 2018 23:31:29 -0400 Subject: audout_u: Implement GetAudioOutState. --- src/core/hle/service/audio/audout_u.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'src/core/hle/service/audio') diff --git a/src/core/hle/service/audio/audout_u.cpp b/src/core/hle/service/audio/audout_u.cpp index e873d768f..8e935cb7f 100644 --- a/src/core/hle/service/audio/audout_u.cpp +++ b/src/core/hle/service/audio/audout_u.cpp @@ -25,7 +25,7 @@ class IAudioOut final : public ServiceFramework { public: IAudioOut() : ServiceFramework("IAudioOut"), audio_out_state(AudioState::Stopped) { static const FunctionInfo functions[] = { - {0x0, nullptr, "GetAudioOutState"}, + {0x0, &IAudioOut::GetAudioOutState, "GetAudioOutState"}, {0x1, &IAudioOut::StartAudioOut, "StartAudioOut"}, {0x2, &IAudioOut::StopAudioOut, "StopAudioOut"}, {0x3, &IAudioOut::AppendAudioOutBuffer_1, "AppendAudioOutBuffer_1"}, @@ -57,6 +57,13 @@ public: } private: + void GetAudioOutState(Kernel::HLERequestContext& ctx) { + LOG_DEBUG(Service_Audio, "called"); + IPC::ResponseBuilder rb{ctx, 3}; + rb.Push(RESULT_SUCCESS); + rb.Push(static_cast(audio_out_state)); + } + void StartAudioOut(Kernel::HLERequestContext& ctx) { LOG_WARNING(Service_Audio, "(STUBBED) called"); -- cgit v1.2.3 From 4c0cf3d5ff8295e1f77b8bca2e5399805d1beead Mon Sep 17 00:00:00 2001 From: bunnei Date: Mon, 2 Apr 2018 23:34:52 -0400 Subject: audren_u: Stub out GetActiveAudioDeviceName. --- src/core/hle/service/audio/audren_u.cpp | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) (limited to 'src/core/hle/service/audio') diff --git a/src/core/hle/service/audio/audren_u.cpp b/src/core/hle/service/audio/audren_u.cpp index 6d0461bbc..7990595aa 100644 --- a/src/core/hle/service/audio/audren_u.cpp +++ b/src/core/hle/service/audio/audren_u.cpp @@ -158,7 +158,7 @@ public: {0x0, &IAudioDevice::ListAudioDeviceName, "ListAudioDeviceName"}, {0x1, &IAudioDevice::SetAudioDeviceOutputVolume, "SetAudioDeviceOutputVolume"}, {0x2, nullptr, "GetAudioDeviceOutputVolume"}, - {0x3, nullptr, "GetActiveAudioDeviceName"}, + {0x3, &IAudioDevice::GetActiveAudioDeviceName, "GetActiveAudioDeviceName"}, {0x4, &IAudioDevice::QueryAudioDeviceSystemEvent, "QueryAudioDeviceSystemEvent"}, {0x5, &IAudioDevice::GetActiveChannelCount, "GetActiveChannelCount"}, {0x6, nullptr, "ListAudioDeviceNameAuto"}, @@ -199,6 +199,18 @@ private: rb.Push(RESULT_SUCCESS); } + void GetActiveAudioDeviceName(Kernel::HLERequestContext& ctx) { + LOG_WARNING(Service_Audio, "(STUBBED) called"); + IPC::RequestParser rp{ctx}; + + const std::string audio_interface = "AudioDevice"; + ctx.WriteBuffer(audio_interface.c_str(), audio_interface.size()); + + IPC::ResponseBuilder rb = rp.MakeBuilder(3, 0, 0); + rb.Push(RESULT_SUCCESS); + rb.Push(1); + } + void QueryAudioDeviceSystemEvent(Kernel::HLERequestContext& ctx) { LOG_WARNING(Service_Audio, "(STUBBED) called"); -- cgit v1.2.3