summaryrefslogtreecommitdiffstats
path: root/src/core
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2021-05-08 12:07:10 +0200
committerbunnei <bunneidev@gmail.com>2021-05-11 19:24:53 +0200
commitb9f543b29f2d2fbb44dbf5d821cc6b5fd10af118 (patch)
treebadebcb7ca2ebf3d0a77a0c01a7b1ea0609812e2 /src/core
parentcore: hle: ipc_helpers: Fix cast on raw_data_size calculation. (diff)
downloadyuzu-b9f543b29f2d2fbb44dbf5d821cc6b5fd10af118.tar
yuzu-b9f543b29f2d2fbb44dbf5d821cc6b5fd10af118.tar.gz
yuzu-b9f543b29f2d2fbb44dbf5d821cc6b5fd10af118.tar.bz2
yuzu-b9f543b29f2d2fbb44dbf5d821cc6b5fd10af118.tar.lz
yuzu-b9f543b29f2d2fbb44dbf5d821cc6b5fd10af118.tar.xz
yuzu-b9f543b29f2d2fbb44dbf5d821cc6b5fd10af118.tar.zst
yuzu-b9f543b29f2d2fbb44dbf5d821cc6b5fd10af118.zip
Diffstat (limited to 'src/core')
-rw-r--r--src/core/hle/service/audio/audren_u.cpp39
-rw-r--r--src/core/hle/service/audio/audren_u.h2
2 files changed, 16 insertions, 25 deletions
diff --git a/src/core/hle/service/audio/audren_u.cpp b/src/core/hle/service/audio/audren_u.cpp
index 513bd3730..65887011f 100644
--- a/src/core/hle/service/audio/audren_u.cpp
+++ b/src/core/hle/service/audio/audren_u.cpp
@@ -169,10 +169,9 @@ private:
class IAudioDevice final : public ServiceFramework<IAudioDevice> {
public:
- explicit IAudioDevice(Core::System& system_, u32_le revision_num)
- : ServiceFramework{system_, "IAudioDevice"}, revision{revision_num},
- buffer_event{system.Kernel()}, audio_input_device_switch_event{system.Kernel()},
- audio_output_device_switch_event{system.Kernel()} {
+ explicit IAudioDevice(Core::System& system_, Kernel::KEvent& buffer_event_, u32_le revision_)
+ : ServiceFramework{system_, "IAudioDevice"}, buffer_event{buffer_event_}, revision{
+ revision_} {
static const FunctionInfo functions[] = {
{0, &IAudioDevice::ListAudioDeviceName, "ListAudioDeviceName"},
{1, &IAudioDevice::SetAudioDeviceOutputVolume, "SetAudioDeviceOutputVolume"},
@@ -189,18 +188,6 @@ public:
{13, nullptr, "GetAudioSystemMasterVolumeSetting"},
};
RegisterHandlers(functions);
-
- Kernel::KAutoObject::Create(std::addressof(buffer_event));
- buffer_event.Initialize("IAudioOutBufferReleasedEvent");
-
- // Should be similar to audio_output_device_switch_event
- Kernel::KAutoObject::Create(std::addressof(audio_input_device_switch_event));
- audio_input_device_switch_event.Initialize("IAudioDevice:AudioInputDeviceSwitchedEvent");
-
- // Should only be signalled when an audio output device has been changed, example: speaker
- // to headset
- Kernel::KAutoObject::Create(std::addressof(audio_output_device_switch_event));
- audio_output_device_switch_event.Initialize("IAudioDevice:AudioOutputDeviceSwitchedEvent");
}
private:
@@ -310,7 +297,7 @@ private:
IPC::ResponseBuilder rb{ctx, 2, 1};
rb.Push(RESULT_SUCCESS);
- rb.PushCopyObjects(audio_input_device_switch_event.GetReadableEvent());
+ rb.PushCopyObjects(buffer_event.GetReadableEvent());
}
void QueryAudioDeviceOutputEvent(Kernel::HLERequestContext& ctx) {
@@ -318,17 +305,16 @@ private:
IPC::ResponseBuilder rb{ctx, 2, 1};
rb.Push(RESULT_SUCCESS);
- rb.PushCopyObjects(audio_output_device_switch_event.GetReadableEvent());
+ rb.PushCopyObjects(buffer_event.GetReadableEvent());
}
+ Kernel::KEvent& buffer_event;
u32_le revision = 0;
- Kernel::KEvent buffer_event;
- Kernel::KEvent audio_input_device_switch_event;
- Kernel::KEvent audio_output_device_switch_event;
+};
-}; // namespace Audio
+AudRenU::AudRenU(Core::System& system_)
+ : ServiceFramework{system_, "audren:u"}, buffer_event{system.Kernel()} {
-AudRenU::AudRenU(Core::System& system_) : ServiceFramework{system_, "audren:u"} {
// clang-format off
static const FunctionInfo functions[] = {
{0, &AudRenU::OpenAudioRenderer, "OpenAudioRenderer"},
@@ -340,6 +326,9 @@ AudRenU::AudRenU(Core::System& system_) : ServiceFramework{system_, "audren:u"}
// clang-format on
RegisterHandlers(functions);
+
+ Kernel::KAutoObject::Create(std::addressof(buffer_event));
+ buffer_event.Initialize("IAudioOutBufferReleasedEvent");
}
AudRenU::~AudRenU() = default;
@@ -662,7 +651,7 @@ void AudRenU::GetAudioDeviceService(Kernel::HLERequestContext& ctx) {
// always assumes the initial release revision (REV1).
IPC::ResponseBuilder rb{ctx, 2, 0, 1};
rb.Push(RESULT_SUCCESS);
- rb.PushIpcInterface<IAudioDevice>(system, Common::MakeMagic('R', 'E', 'V', '1'));
+ rb.PushIpcInterface<IAudioDevice>(system, buffer_event, Common::MakeMagic('R', 'E', 'V', '1'));
}
void AudRenU::OpenAudioRendererForManualExecution(Kernel::HLERequestContext& ctx) {
@@ -684,7 +673,7 @@ void AudRenU::GetAudioDeviceServiceWithRevisionInfo(Kernel::HLERequestContext& c
IPC::ResponseBuilder rb{ctx, 2, 0, 1};
rb.Push(RESULT_SUCCESS);
- rb.PushIpcInterface<IAudioDevice>(system, revision);
+ rb.PushIpcInterface<IAudioDevice>(system, buffer_event, revision);
}
void AudRenU::OpenAudioRendererImpl(Kernel::HLERequestContext& ctx) {
diff --git a/src/core/hle/service/audio/audren_u.h b/src/core/hle/service/audio/audren_u.h
index 37e8b4716..0ee6f9542 100644
--- a/src/core/hle/service/audio/audren_u.h
+++ b/src/core/hle/service/audio/audren_u.h
@@ -4,6 +4,7 @@
#pragma once
+#include "core/hle/kernel/k_event.h"
#include "core/hle/service/service.h"
namespace Core {
@@ -31,6 +32,7 @@ private:
void OpenAudioRendererImpl(Kernel::HLERequestContext& ctx);
std::size_t audren_instance_count = 0;
+ Kernel::KEvent buffer_event;
};
// Describes a particular audio feature that may be supported in a particular revision.