diff options
| author | 2021-01-15 16:19:46 -0500 | |
|---|---|---|
| committer | 2021-01-15 16:19:46 -0500 | |
| commit | 8be9e5b48b5d8ef1c52fab16668dd479ac799f00 (patch) | |
| tree | d38b189961f155c6568344ceb631aa82f35c923d /src/audio_core | |
| parent | Merge pull request #5355 from lioncash/timer (diff) | |
| parent | common/common_funcs: Rename INSERT_UNION_PADDING_{BYTES,WORDS} to _NOINIT (diff) | |
| download | yuzu-8be9e5b48b5d8ef1c52fab16668dd479ac799f00.tar.gz yuzu-8be9e5b48b5d8ef1c52fab16668dd479ac799f00.tar.xz yuzu-8be9e5b48b5d8ef1c52fab16668dd479ac799f00.zip | |
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: | |||
| 40 | SinkSampleFormat sample_format; | 40 | SinkSampleFormat sample_format; |
| 41 | std::array<u8, AudioCommon::MAX_CHANNEL_COUNT> input; | 41 | std::array<u8, AudioCommon::MAX_CHANNEL_COUNT> input; |
| 42 | bool in_use; | 42 | bool in_use; |
| 43 | INSERT_UNION_PADDING_BYTES(5); | 43 | INSERT_PADDING_BYTES_NOINIT(5); |
| 44 | }; | 44 | }; |
| 45 | static_assert(sizeof(CircularBufferIn) == 0x28, | 45 | static_assert(sizeof(CircularBufferIn) == 0x28, |
| 46 | "SinkInfo::CircularBufferIn is in invalid size"); | 46 | "SinkInfo::CircularBufferIn is in invalid size"); |
| 47 | 47 | ||
| 48 | struct DeviceIn { | 48 | struct DeviceIn { |
| 49 | std::array<u8, 255> device_name; | 49 | std::array<u8, 255> device_name; |
| 50 | INSERT_UNION_PADDING_BYTES(1); | 50 | INSERT_PADDING_BYTES_NOINIT(1); |
| 51 | s32_le input_count; | 51 | s32_le input_count; |
| 52 | std::array<u8, AudioCommon::MAX_CHANNEL_COUNT> input; | 52 | std::array<u8, AudioCommon::MAX_CHANNEL_COUNT> input; |
| 53 | INSERT_UNION_PADDING_BYTES(1); | 53 | INSERT_PADDING_BYTES_NOINIT(1); |
| 54 | bool down_matrix_enabled; | 54 | bool down_matrix_enabled; |
| 55 | DownmixCoefficients down_matrix_coef; | 55 | DownmixCoefficients down_matrix_coef; |
| 56 | }; | 56 | }; |