diff options
author | bunnei <bunneidev@gmail.com> | 2020-11-25 19:50:52 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-11-25 19:50:52 +0100 |
commit | b7f1095980d614842f6264667d9ddd38186d57ff (patch) | |
tree | 980eba01298d420dad312534e93f8fbd82e3ba76 /src/audio_core/audio_renderer.h | |
parent | Merge pull request #4978 from bunnei/shutdown-crash (diff) | |
parent | Addressed changes (diff) | |
download | yuzu-b7f1095980d614842f6264667d9ddd38186d57ff.tar yuzu-b7f1095980d614842f6264667d9ddd38186d57ff.tar.gz yuzu-b7f1095980d614842f6264667d9ddd38186d57ff.tar.bz2 yuzu-b7f1095980d614842f6264667d9ddd38186d57ff.tar.lz yuzu-b7f1095980d614842f6264667d9ddd38186d57ff.tar.xz yuzu-b7f1095980d614842f6264667d9ddd38186d57ff.tar.zst yuzu-b7f1095980d614842f6264667d9ddd38186d57ff.zip |
Diffstat (limited to 'src/audio_core/audio_renderer.h')
-rw-r--r-- | src/audio_core/audio_renderer.h | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/src/audio_core/audio_renderer.h b/src/audio_core/audio_renderer.h index 2fd93e058..a85219045 100644 --- a/src/audio_core/audio_renderer.h +++ b/src/audio_core/audio_renderer.h @@ -36,16 +36,10 @@ class Memory; } namespace AudioCore { -using DSPStateHolder = std::array<VoiceState*, 6>; +using DSPStateHolder = std::array<VoiceState*, AudioCommon::MAX_CHANNEL_COUNT>; class AudioOut; -struct RendererInfo { - u64_le elasped_frame_count{}; - INSERT_PADDING_WORDS(2); -}; -static_assert(sizeof(RendererInfo) == 0x10, "RendererInfo is an invalid size"); - class AudioRenderer { public: AudioRenderer(Core::Timing::CoreTiming& core_timing, Core::Memory::Memory& memory_, @@ -53,14 +47,14 @@ public: std::shared_ptr<Kernel::WritableEvent> buffer_event, std::size_t instance_number); ~AudioRenderer(); - ResultCode UpdateAudioRenderer(const std::vector<u8>& input_params, - std::vector<u8>& output_params); + [[nodiscard]] ResultCode UpdateAudioRenderer(const std::vector<u8>& input_params, + std::vector<u8>& output_params); void QueueMixedBuffer(Buffer::Tag tag); void ReleaseAndQueueBuffers(); - u32 GetSampleRate() const; - u32 GetSampleCount() const; - u32 GetMixBufferCount() const; - Stream::State GetStreamState() const; + [[nodiscard]] u32 GetSampleRate() const; + [[nodiscard]] u32 GetSampleCount() const; + [[nodiscard]] u32 GetMixBufferCount() const; + [[nodiscard]] Stream::State GetStreamState() const; private: BehaviorInfo behavior_info{}; |