diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/audio_core/audio_renderer.cpp | 3 | ||||
| -rw-r--r-- | src/audio_core/audio_renderer.h | 3 | ||||
| -rw-r--r-- | src/core/hle/service/audio/audren_u.cpp | 6 |
3 files changed, 8 insertions, 4 deletions
diff --git a/src/audio_core/audio_renderer.cpp b/src/audio_core/audio_renderer.cpp index 415b06171..da50a0bbc 100644 --- a/src/audio_core/audio_renderer.cpp +++ b/src/audio_core/audio_renderer.cpp | |||
| @@ -80,7 +80,8 @@ AudioRenderer::AudioRenderer(Core::Timing::CoreTiming& core_timing, AudioRendere | |||
| 80 | 80 | ||
| 81 | audio_out = std::make_unique<AudioCore::AudioOut>(); | 81 | audio_out = std::make_unique<AudioCore::AudioOut>(); |
| 82 | stream = audio_out->OpenStream(core_timing, STREAM_SAMPLE_RATE, STREAM_NUM_CHANNELS, | 82 | stream = audio_out->OpenStream(core_timing, STREAM_SAMPLE_RATE, STREAM_NUM_CHANNELS, |
| 83 | fmt::format("AudioRenderer-Instance{}", instance_number), [=]() { buffer_event->Signal(); }); | 83 | fmt::format("AudioRenderer-Instance{}", instance_number), |
| 84 | [=]() { buffer_event->Signal(); }); | ||
| 84 | audio_out->StartStream(stream); | 85 | audio_out->StartStream(stream); |
| 85 | 86 | ||
| 86 | QueueMixedBuffer(0); | 87 | QueueMixedBuffer(0); |
diff --git a/src/audio_core/audio_renderer.h b/src/audio_core/audio_renderer.h index 4ef1875ff..45afbe759 100644 --- a/src/audio_core/audio_renderer.h +++ b/src/audio_core/audio_renderer.h | |||
| @@ -215,7 +215,8 @@ static_assert(sizeof(UpdateDataHeader) == 0x40, "UpdateDataHeader has wrong size | |||
| 215 | class AudioRenderer { | 215 | class AudioRenderer { |
| 216 | public: | 216 | public: |
| 217 | AudioRenderer(Core::Timing::CoreTiming& core_timing, AudioRendererParameter params, | 217 | AudioRenderer(Core::Timing::CoreTiming& core_timing, AudioRendererParameter params, |
| 218 | Kernel::SharedPtr<Kernel::WritableEvent> buffer_event, std::size_t instance_number); | 218 | Kernel::SharedPtr<Kernel::WritableEvent> buffer_event, |
| 219 | std::size_t instance_number); | ||
| 219 | ~AudioRenderer(); | 220 | ~AudioRenderer(); |
| 220 | 221 | ||
| 221 | std::vector<u8> UpdateAudioRenderer(const std::vector<u8>& input_params); | 222 | std::vector<u8> UpdateAudioRenderer(const std::vector<u8>& input_params); |
diff --git a/src/core/hle/service/audio/audren_u.cpp b/src/core/hle/service/audio/audren_u.cpp index b6158d16e..679299f68 100644 --- a/src/core/hle/service/audio/audren_u.cpp +++ b/src/core/hle/service/audio/audren_u.cpp | |||
| @@ -25,7 +25,8 @@ namespace Service::Audio { | |||
| 25 | 25 | ||
| 26 | class IAudioRenderer final : public ServiceFramework<IAudioRenderer> { | 26 | class IAudioRenderer final : public ServiceFramework<IAudioRenderer> { |
| 27 | public: | 27 | public: |
| 28 | explicit IAudioRenderer(AudioCore::AudioRendererParameter audren_params, const std::size_t instance_number) | 28 | explicit IAudioRenderer(AudioCore::AudioRendererParameter audren_params, |
| 29 | const std::size_t instance_number) | ||
| 29 | : ServiceFramework("IAudioRenderer") { | 30 | : ServiceFramework("IAudioRenderer") { |
| 30 | // clang-format off | 31 | // clang-format off |
| 31 | static const FunctionInfo functions[] = { | 32 | static const FunctionInfo functions[] = { |
| @@ -48,7 +49,8 @@ public: | |||
| 48 | auto& system = Core::System::GetInstance(); | 49 | auto& system = Core::System::GetInstance(); |
| 49 | system_event = Kernel::WritableEvent::CreateEventPair( | 50 | system_event = Kernel::WritableEvent::CreateEventPair( |
| 50 | system.Kernel(), Kernel::ResetType::Manual, "IAudioRenderer:SystemEvent"); | 51 | system.Kernel(), Kernel::ResetType::Manual, "IAudioRenderer:SystemEvent"); |
| 51 | renderer = std::make_unique<AudioCore::AudioRenderer>(system.CoreTiming(), audren_params, system_event.writable, instance_number); | 52 | renderer = std::make_unique<AudioCore::AudioRenderer>( |
| 53 | system.CoreTiming(), audren_params, system_event.writable, instance_number); | ||
| 52 | } | 54 | } |
| 53 | 55 | ||
| 54 | private: | 56 | private: |