From c41e29b8d153a733d0528e82388aec48a78b9765 Mon Sep 17 00:00:00 2001 From: David Marcec Date: Sat, 23 Jun 2018 14:11:07 +1000 Subject: [PATCH] AudioRendererParameters should be AudioRendererParameter according to SMO --- src/core/hle/service/audio/audren_u.cpp | 10 +++++----- src/core/hle/service/audio/audren_u.h | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/core/hle/service/audio/audren_u.cpp b/src/core/hle/service/audio/audren_u.cpp index 021fbfb761..2188b56259 100644 --- a/src/core/hle/service/audio/audren_u.cpp +++ b/src/core/hle/service/audio/audren_u.cpp @@ -17,7 +17,7 @@ constexpr u64 audio_ticks{static_cast(CoreTiming::BASE_CLOCK_RATE / 200)}; class IAudioRenderer final : public ServiceFramework { public: - IAudioRenderer(AudioRendererParameters audren_params) + IAudioRenderer(AudioRendererParameter audren_params) : ServiceFramework("IAudioRenderer"), worker_params(audren_params) { static const FunctionInfo functions[] = { {0, nullptr, "GetAudioRendererSampleRate"}, @@ -149,7 +149,7 @@ private: struct UpdateDataHeader { UpdateDataHeader() {} - UpdateDataHeader(const AudioRendererParameters& config) { + UpdateDataHeader(const AudioRendererParameter& config) { revision = config.revision; behavior_size = 0xb0; memory_pools_size = (config.effect_count + (config.voice_count * 4)) * 0x10; @@ -179,7 +179,7 @@ private: CoreTiming::EventType* audio_event; Kernel::SharedPtr system_event; - AudioRendererParameters worker_params; + AudioRendererParameter worker_params; }; class IAudioDevice final : public ServiceFramework { @@ -278,7 +278,7 @@ AudRenU::AudRenU() : ServiceFramework("audren:u") { void AudRenU::OpenAudioRenderer(Kernel::HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; - auto params = rp.PopRaw(); + auto params = rp.PopRaw(); IPC::ResponseBuilder rb{ctx, 2, 0, 1}; rb.Push(RESULT_SUCCESS); @@ -289,7 +289,7 @@ void AudRenU::OpenAudioRenderer(Kernel::HLERequestContext& ctx) { void AudRenU::GetAudioRendererWorkBufferSize(Kernel::HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; - auto params = rp.PopRaw(); + auto params = rp.PopRaw(); u64 buffer_sz = Common::AlignUp(4 * params.unknown_8, 0x40); buffer_sz += params.unknown_c * 1024; diff --git a/src/core/hle/service/audio/audren_u.h b/src/core/hle/service/audio/audren_u.h index e8baf99eea..b9b81db4f8 100644 --- a/src/core/hle/service/audio/audren_u.h +++ b/src/core/hle/service/audio/audren_u.h @@ -12,7 +12,7 @@ class HLERequestContext; namespace Service::Audio { -struct AudioRendererParameters { +struct AudioRendererParameter { u32_le sample_rate; u32_le sample_count; u32_le unknown_8; @@ -28,7 +28,7 @@ struct AudioRendererParameters { INSERT_PADDING_WORDS(1); u32_le revision; }; -static_assert(sizeof(AudioRendererParameters) == 52, "AudioRendererParameters is an invalid size"); +static_assert(sizeof(AudioRendererParameter) == 52, "AudioRendererParameter is an invalid size"); class AudRenU final : public ServiceFramework { public: