diff options
| author | 2024-02-23 11:34:21 -0500 | |
|---|---|---|
| committer | 2024-02-23 11:34:21 -0500 | |
| commit | 215e887be088ed572da999e9ec7fd8559198524b (patch) | |
| tree | 793415b72d36bb07d0174dfcf731f81235008936 /src/audio_core/renderer/system.cpp | |
| parent | Merge pull request #13073 from FearlessTobi/fsp-srv-ipc (diff) | |
| parent | oboe_sink: handle temporary stream creation failure (diff) | |
| download | yuzu-215e887be088ed572da999e9ec7fd8559198524b.tar.gz yuzu-215e887be088ed572da999e9ec7fd8559198524b.tar.xz yuzu-215e887be088ed572da999e9ec7fd8559198524b.zip | |
Merge pull request #13100 from liamwhite/audio-ipc
audio: move to new ipc
Diffstat (limited to 'src/audio_core/renderer/system.cpp')
| -rw-r--r-- | src/audio_core/renderer/system.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/audio_core/renderer/system.cpp b/src/audio_core/renderer/system.cpp index ca656edae..c30d68426 100644 --- a/src/audio_core/renderer/system.cpp +++ b/src/audio_core/renderer/system.cpp | |||
| @@ -102,8 +102,8 @@ System::System(Core::System& core_, Kernel::KEvent* adsp_rendered_event_) | |||
| 102 | 102 | ||
| 103 | Result System::Initialize(const AudioRendererParameterInternal& params, | 103 | Result System::Initialize(const AudioRendererParameterInternal& params, |
| 104 | Kernel::KTransferMemory* transfer_memory, u64 transfer_memory_size, | 104 | Kernel::KTransferMemory* transfer_memory, u64 transfer_memory_size, |
| 105 | u32 process_handle_, Kernel::KProcess& process_, | 105 | Kernel::KProcess* process_handle_, u64 applet_resource_user_id_, |
| 106 | u64 applet_resource_user_id_, s32 session_id_) { | 106 | s32 session_id_) { |
| 107 | if (!CheckValidRevision(params.revision)) { | 107 | if (!CheckValidRevision(params.revision)) { |
| 108 | return Service::Audio::ResultInvalidRevision; | 108 | return Service::Audio::ResultInvalidRevision; |
| 109 | } | 109 | } |
| @@ -119,7 +119,6 @@ Result System::Initialize(const AudioRendererParameterInternal& params, | |||
| 119 | behavior.SetUserLibRevision(params.revision); | 119 | behavior.SetUserLibRevision(params.revision); |
| 120 | 120 | ||
| 121 | process_handle = process_handle_; | 121 | process_handle = process_handle_; |
| 122 | process = &process_; | ||
| 123 | applet_resource_user_id = applet_resource_user_id_; | 122 | applet_resource_user_id = applet_resource_user_id_; |
| 124 | session_id = session_id_; | 123 | session_id = session_id_; |
| 125 | 124 | ||
| @@ -132,7 +131,8 @@ Result System::Initialize(const AudioRendererParameterInternal& params, | |||
| 132 | render_device = params.rendering_device; | 131 | render_device = params.rendering_device; |
| 133 | execution_mode = params.execution_mode; | 132 | execution_mode = params.execution_mode; |
| 134 | 133 | ||
| 135 | process->GetMemory().ZeroBlock(transfer_memory->GetSourceAddress(), transfer_memory_size); | 134 | process_handle->GetMemory().ZeroBlock(transfer_memory->GetSourceAddress(), |
| 135 | transfer_memory_size); | ||
| 136 | 136 | ||
| 137 | // Note: We're not actually using the transfer memory because it's a pain to code for. | 137 | // Note: We're not actually using the transfer memory because it's a pain to code for. |
| 138 | // Allocate the memory normally instead and hope the game doesn't try to read anything back | 138 | // Allocate the memory normally instead and hope the game doesn't try to read anything back |
| @@ -616,7 +616,7 @@ void System::SendCommandToDsp() { | |||
| 616 | static_cast<u64>((time_limit_percent / 100) * 2'880'000.0 * | 616 | static_cast<u64>((time_limit_percent / 100) * 2'880'000.0 * |
| 617 | (static_cast<f32>(render_time_limit_percent) / 100.0f))}; | 617 | (static_cast<f32>(render_time_limit_percent) / 100.0f))}; |
| 618 | audio_renderer.SetCommandBuffer(session_id, translated_addr, command_size, time_limit, | 618 | audio_renderer.SetCommandBuffer(session_id, translated_addr, command_size, time_limit, |
| 619 | applet_resource_user_id, process, | 619 | applet_resource_user_id, process_handle, |
| 620 | reset_command_buffers); | 620 | reset_command_buffers); |
| 621 | reset_command_buffers = false; | 621 | reset_command_buffers = false; |
| 622 | command_buffer_size = command_size; | 622 | command_buffer_size = command_size; |