summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/audio_core/audio_renderer.cpp12
-rw-r--r--src/audio_core/audio_renderer.h2
2 files changed, 7 insertions, 7 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 }
diff --git a/src/audio_core/audio_renderer.h b/src/audio_core/audio_renderer.h
index eba67f28e..6d069d693 100644
--- a/src/audio_core/audio_renderer.h
+++ b/src/audio_core/audio_renderer.h
@@ -204,7 +204,7 @@ private:
204 AudioRendererParameter worker_params; 204 AudioRendererParameter worker_params;
205 Kernel::SharedPtr<Kernel::Event> buffer_event; 205 Kernel::SharedPtr<Kernel::Event> buffer_event;
206 std::vector<VoiceState> voices; 206 std::vector<VoiceState> voices;
207 std::unique_ptr<AudioCore::AudioOut> audio_core; 207 std::unique_ptr<AudioCore::AudioOut> audio_out;
208 AudioCore::StreamPtr stream; 208 AudioCore::StreamPtr stream;
209}; 209};
210 210