summaryrefslogtreecommitdiff
path: root/src/audio_core/audio_renderer.cpp
diff options
context:
space:
mode:
authorGravatar MerryMage2018-09-08 16:48:41 +0100
committerGravatar MerryMage2018-09-08 16:50:12 +0100
commita76f0d5d064fbdbcd709f60efcfbb7027927b393 (patch)
treeebc5d8aed46027f96dc5ea2ecd1381171f0c964c /src/audio_core/audio_renderer.cpp
parentMerge pull request #1246 from degasus/instanced_rendering (diff)
downloadyuzu-a76f0d5d064fbdbcd709f60efcfbb7027927b393.tar.gz
yuzu-a76f0d5d064fbdbcd709f60efcfbb7027927b393.tar.xz
yuzu-a76f0d5d064fbdbcd709f60efcfbb7027927b393.zip
audio_renderer: Rename AudioOut instance to audio_out
Diffstat (limited to 'src/audio_core/audio_renderer.cpp')
-rw-r--r--src/audio_core/audio_renderer.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/audio_core/audio_renderer.cpp b/src/audio_core/audio_renderer.cpp
index 397b107f5..a75cd3be5 100644
--- a/src/audio_core/audio_renderer.cpp
+++ b/src/audio_core/audio_renderer.cpp
@@ -17,10 +17,10 @@ AudioRenderer::AudioRenderer(AudioRendererParameter params,
17 Kernel::SharedPtr<Kernel::Event> buffer_event) 17 Kernel::SharedPtr<Kernel::Event> buffer_event)
18 : worker_params{params}, buffer_event{buffer_event}, voices(params.voice_count) { 18 : worker_params{params}, buffer_event{buffer_event}, voices(params.voice_count) {
19 19
20 audio_core = std::make_unique<AudioCore::AudioOut>(); 20 audio_out = std::make_unique<AudioCore::AudioOut>();
21 stream = audio_core->OpenStream(STREAM_SAMPLE_RATE, STREAM_NUM_CHANNELS, "AudioRenderer", 21 stream = audio_out->OpenStream(STREAM_SAMPLE_RATE, STREAM_NUM_CHANNELS, "AudioRenderer",
22 [=]() { buffer_event->Signal(); }); 22 [=]() { buffer_event->Signal(); });
23 audio_core->StartStream(stream); 23 audio_out->StartStream(stream);
24 24
25 QueueMixedBuffer(0); 25 QueueMixedBuffer(0);
26 QueueMixedBuffer(1); 26 QueueMixedBuffer(1);
@@ -236,11 +236,11 @@ void AudioRenderer::QueueMixedBuffer(Buffer::Tag tag) {
236 } 236 }
237 } 237 }
238 } 238 }
239 audio_core->QueueBuffer(stream, tag, std::move(buffer)); 239 audio_out->QueueBuffer(stream, tag, std::move(buffer));
240} 240}
241 241
242void AudioRenderer::ReleaseAndQueueBuffers() { 242void AudioRenderer::ReleaseAndQueueBuffers() {
243 const auto released_buffers{audio_core->GetTagsAndReleaseBuffers(stream, 2)}; 243 const auto released_buffers{audio_out->GetTagsAndReleaseBuffers(stream, 2)};
244 for (const auto& tag : released_buffers) { 244 for (const auto& tag : released_buffers) {
245 QueueMixedBuffer(tag); 245 QueueMixedBuffer(tag);
246 } 246 }