diff options
author | MerryMage <MerryMage@users.noreply.github.com> | 2018-09-08 17:48:41 +0200 |
---|---|---|
committer | MerryMage <MerryMage@users.noreply.github.com> | 2018-09-08 17:50:12 +0200 |
commit | a76f0d5d064fbdbcd709f60efcfbb7027927b393 (patch) | |
tree | ebc5d8aed46027f96dc5ea2ecd1381171f0c964c /src | |
parent | Merge pull request #1246 from degasus/instanced_rendering (diff) | |
download | yuzu-a76f0d5d064fbdbcd709f60efcfbb7027927b393.tar yuzu-a76f0d5d064fbdbcd709f60efcfbb7027927b393.tar.gz yuzu-a76f0d5d064fbdbcd709f60efcfbb7027927b393.tar.bz2 yuzu-a76f0d5d064fbdbcd709f60efcfbb7027927b393.tar.lz yuzu-a76f0d5d064fbdbcd709f60efcfbb7027927b393.tar.xz yuzu-a76f0d5d064fbdbcd709f60efcfbb7027927b393.tar.zst yuzu-a76f0d5d064fbdbcd709f60efcfbb7027927b393.zip |
Diffstat (limited to '')
-rw-r--r-- | src/audio_core/audio_renderer.cpp | 12 | ||||
-rw-r--r-- | src/audio_core/audio_renderer.h | 2 |
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, Kernel::SharedPtr<Kernel::Event> buffer_event) : worker_params{params}, buffer_event{buffer_event}, voices(params.voice_count) { - audio_core = std::make_unique<AudioCore::AudioOut>(); - stream = audio_core->OpenStream(STREAM_SAMPLE_RATE, STREAM_NUM_CHANNELS, "AudioRenderer", - [=]() { buffer_event->Signal(); }); - audio_core->StartStream(stream); + audio_out = std::make_unique<AudioCore::AudioOut>(); + stream = audio_out->OpenStream(STREAM_SAMPLE_RATE, STREAM_NUM_CHANNELS, "AudioRenderer", + [=]() { buffer_event->Signal(); }); + audio_out->StartStream(stream); QueueMixedBuffer(0); QueueMixedBuffer(1); @@ -236,11 +236,11 @@ void AudioRenderer::QueueMixedBuffer(Buffer::Tag tag) { } } } - audio_core->QueueBuffer(stream, tag, std::move(buffer)); + audio_out->QueueBuffer(stream, tag, std::move(buffer)); } void AudioRenderer::ReleaseAndQueueBuffers() { - const auto released_buffers{audio_core->GetTagsAndReleaseBuffers(stream, 2)}; + const auto released_buffers{audio_out->GetTagsAndReleaseBuffers(stream, 2)}; for (const auto& tag : released_buffers) { QueueMixedBuffer(tag); } 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: AudioRendererParameter worker_params; Kernel::SharedPtr<Kernel::Event> buffer_event; std::vector<VoiceState> voices; - std::unique_ptr<AudioCore::AudioOut> audio_core; + std::unique_ptr<AudioCore::AudioOut> audio_out; AudioCore::StreamPtr stream; }; |