summaryrefslogtreecommitdiff
path: root/src/audio_core
diff options
context:
space:
mode:
Diffstat (limited to 'src/audio_core')
-rw-r--r--src/audio_core/device/device_session.cpp4
-rw-r--r--src/audio_core/renderer/adsp/adsp.cpp2
-rw-r--r--src/audio_core/renderer/adsp/command_list_processor.cpp2
-rw-r--r--src/audio_core/renderer/system.cpp3
4 files changed, 5 insertions, 6 deletions
diff --git a/src/audio_core/device/device_session.cpp b/src/audio_core/device/device_session.cpp
index ad0f40e28..b5c0ef0e6 100644
--- a/src/audio_core/device/device_session.cpp
+++ b/src/audio_core/device/device_session.cpp
@@ -93,7 +93,7 @@ void DeviceSession::AppendBuffers(std::span<const AudioBuffer> buffers) const {
93 stream->AppendBuffer(new_buffer, samples); 93 stream->AppendBuffer(new_buffer, samples);
94 } else { 94 } else {
95 std::vector<s16> samples(buffer.size / sizeof(s16)); 95 std::vector<s16> samples(buffer.size / sizeof(s16));
96 system.Memory().ReadBlockUnsafe(buffer.samples, samples.data(), buffer.size); 96 system.ApplicationMemory().ReadBlockUnsafe(buffer.samples, samples.data(), buffer.size);
97 stream->AppendBuffer(new_buffer, samples); 97 stream->AppendBuffer(new_buffer, samples);
98 } 98 }
99 } 99 }
@@ -102,7 +102,7 @@ void DeviceSession::AppendBuffers(std::span<const AudioBuffer> buffers) const {
102void DeviceSession::ReleaseBuffer(const AudioBuffer& buffer) const { 102void DeviceSession::ReleaseBuffer(const AudioBuffer& buffer) const {
103 if (type == Sink::StreamType::In) { 103 if (type == Sink::StreamType::In) {
104 auto samples{stream->ReleaseBuffer(buffer.size / sizeof(s16))}; 104 auto samples{stream->ReleaseBuffer(buffer.size / sizeof(s16))};
105 system.Memory().WriteBlockUnsafe(buffer.samples, samples.data(), buffer.size); 105 system.ApplicationMemory().WriteBlockUnsafe(buffer.samples, samples.data(), buffer.size);
106 } 106 }
107} 107}
108 108
diff --git a/src/audio_core/renderer/adsp/adsp.cpp b/src/audio_core/renderer/adsp/adsp.cpp
index a28395663..74772fc50 100644
--- a/src/audio_core/renderer/adsp/adsp.cpp
+++ b/src/audio_core/renderer/adsp/adsp.cpp
@@ -13,7 +13,7 @@
13namespace AudioCore::AudioRenderer::ADSP { 13namespace AudioCore::AudioRenderer::ADSP {
14 14
15ADSP::ADSP(Core::System& system_, Sink::Sink& sink_) 15ADSP::ADSP(Core::System& system_, Sink::Sink& sink_)
16 : system{system_}, memory{system.Memory()}, sink{sink_} {} 16 : system{system_}, memory{system.ApplicationMemory()}, sink{sink_} {}
17 17
18ADSP::~ADSP() { 18ADSP::~ADSP() {
19 ClearCommandBuffers(); 19 ClearCommandBuffers();
diff --git a/src/audio_core/renderer/adsp/command_list_processor.cpp b/src/audio_core/renderer/adsp/command_list_processor.cpp
index e3bf2d7ec..7a300d216 100644
--- a/src/audio_core/renderer/adsp/command_list_processor.cpp
+++ b/src/audio_core/renderer/adsp/command_list_processor.cpp
@@ -17,7 +17,7 @@ namespace AudioCore::AudioRenderer::ADSP {
17void CommandListProcessor::Initialize(Core::System& system_, CpuAddr buffer, u64 size, 17void CommandListProcessor::Initialize(Core::System& system_, CpuAddr buffer, u64 size,
18 Sink::SinkStream* stream_) { 18 Sink::SinkStream* stream_) {
19 system = &system_; 19 system = &system_;
20 memory = &system->Memory(); 20 memory = &system->ApplicationMemory();
21 stream = stream_; 21 stream = stream_;
22 header = reinterpret_cast<CommandListHeader*>(buffer); 22 header = reinterpret_cast<CommandListHeader*>(buffer);
23 commands = reinterpret_cast<u8*>(buffer + sizeof(CommandListHeader)); 23 commands = reinterpret_cast<u8*>(buffer + sizeof(CommandListHeader));
diff --git a/src/audio_core/renderer/system.cpp b/src/audio_core/renderer/system.cpp
index 28f063641..ad869facb 100644
--- a/src/audio_core/renderer/system.cpp
+++ b/src/audio_core/renderer/system.cpp
@@ -127,8 +127,7 @@ Result System::Initialize(const AudioRendererParameterInternal& params,
127 render_device = params.rendering_device; 127 render_device = params.rendering_device;
128 execution_mode = params.execution_mode; 128 execution_mode = params.execution_mode;
129 129
130 core.Memory().ZeroBlock(*core.ApplicationProcess(), transfer_memory->GetSourceAddress(), 130 core.ApplicationMemory().ZeroBlock(transfer_memory->GetSourceAddress(), transfer_memory_size);
131 transfer_memory_size);
132 131
133 // Note: We're not actually using the transfer memory because it's a pain to code for. 132 // Note: We're not actually using the transfer memory because it's a pain to code for.
134 // Allocate the memory normally instead and hope the game doesn't try to read anything back 133 // Allocate the memory normally instead and hope the game doesn't try to read anything back