diff options
| author | LC <mathew1800@gmail.com> | 2021-01-15 16:19:46 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-15 16:19:46 -0500 |
| commit | 8be9e5b48b5d8ef1c52fab16668dd479ac799f00 (patch) | |
| tree | d38b189961f155c6568344ceb631aa82f35c923d /src/audio_core | |
| parent | f728a504aa3aaea48ca86860ad04a975a355a4f5 (diff) | |
| parent | 3ff978aa4f6b9d46179e41c36825eb06e7f8d60c (diff) | |
Merge pull request #5358 from ReinUsesLisp/rename-insert-padding
common/common_funcs: Rename INSERT_UNION_PADDING_{BYTES,WORDS} to _NOINIT
Diffstat (limited to 'src/audio_core')
| -rw-r--r-- | src/audio_core/sink_context.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/audio_core/sink_context.h b/src/audio_core/sink_context.h index 05541becb..66ee4e8a0 100644 --- a/src/audio_core/sink_context.h +++ b/src/audio_core/sink_context.h @@ -40,17 +40,17 @@ public: SinkSampleFormat sample_format; std::array<u8, AudioCommon::MAX_CHANNEL_COUNT> input; bool in_use; - INSERT_UNION_PADDING_BYTES(5); + INSERT_PADDING_BYTES_NOINIT(5); }; static_assert(sizeof(CircularBufferIn) == 0x28, "SinkInfo::CircularBufferIn is in invalid size"); struct DeviceIn { std::array<u8, 255> device_name; - INSERT_UNION_PADDING_BYTES(1); + INSERT_PADDING_BYTES_NOINIT(1); s32_le input_count; std::array<u8, AudioCommon::MAX_CHANNEL_COUNT> input; - INSERT_UNION_PADDING_BYTES(1); + INSERT_PADDING_BYTES_NOINIT(1); bool down_matrix_enabled; DownmixCoefficients down_matrix_coef; }; |