summaryrefslogtreecommitdiff
path: root/src/audio_core/device
diff options
context:
space:
mode:
authorGravatar liamwhite2023-03-27 12:16:40 -0400
committerGravatar GitHub2023-03-27 12:16:40 -0400
commit0661f5ccd1704935dc9c49521a79cc26832db3b0 (patch)
treee0923dd40e8dd0f6ec92a2de7722f911bd26c514 /src/audio_core/device
parentMerge pull request #9995 from german77/plain (diff)
parentmemory: rename global memory references to application memory (diff)
downloadyuzu-0661f5ccd1704935dc9c49521a79cc26832db3b0.tar.gz
yuzu-0661f5ccd1704935dc9c49521a79cc26832db3b0.tar.xz
yuzu-0661f5ccd1704935dc9c49521a79cc26832db3b0.zip
Merge pull request #9984 from liamwhite/global-memory
memory: rename global memory references to application memory
Diffstat (limited to 'src/audio_core/device')
-rw-r--r--src/audio_core/device/device_session.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/audio_core/device/device_session.cpp b/src/audio_core/device/device_session.cpp
index 5a327a606..043ce8875 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