summaryrefslogtreecommitdiffstats
path: root/src/audio_core/audio_renderer.h
diff options
context:
space:
mode:
authorChloe Marcec <dmarcecguzman@gmail.com>2020-11-17 04:14:29 +0100
committerChloe Marcec <dmarcecguzman@gmail.com>2020-11-17 04:14:29 +0100
commit9a4beac95a0f88ec312a28d06da8270aa58736e3 (patch)
treef3cbfbea9881288a32c52181ad16201f2958946a /src/audio_core/audio_renderer.h
parentMerge pull request #4895 from Morph1984/cave-story-plus-applet-fix (diff)
downloadyuzu-9a4beac95a0f88ec312a28d06da8270aa58736e3.tar
yuzu-9a4beac95a0f88ec312a28d06da8270aa58736e3.tar.gz
yuzu-9a4beac95a0f88ec312a28d06da8270aa58736e3.tar.bz2
yuzu-9a4beac95a0f88ec312a28d06da8270aa58736e3.tar.lz
yuzu-9a4beac95a0f88ec312a28d06da8270aa58736e3.tar.xz
yuzu-9a4beac95a0f88ec312a28d06da8270aa58736e3.tar.zst
yuzu-9a4beac95a0f88ec312a28d06da8270aa58736e3.zip
Diffstat (limited to 'src/audio_core/audio_renderer.h')
-rw-r--r--src/audio_core/audio_renderer.h20
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{};