diff options
| author | bunnei <bunneidev@gmail.com> | 2020-10-13 15:30:30 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-13 15:30:30 -0700 |
| commit | ca416a0fb87ced0e471729fe344b9f34a090e7b5 (patch) | |
| tree | d1a143eb839744bc1515700c861ec7e5d04d130e /src/audio_core/command_generator.cpp | |
| parent | c5b3c8d06bcfa343b2cecbfc60b3530b306ebe88 (diff) | |
| parent | 9f9b64d280d50b39c92e8e12c6f45ef78a72b4ea (diff) | |
Merge pull request #4787 from lioncash/conversion
audio_core/CMakeLists: Make warnings consistent with core
Diffstat (limited to 'src/audio_core/command_generator.cpp')
| -rw-r--r-- | src/audio_core/command_generator.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/audio_core/command_generator.cpp b/src/audio_core/command_generator.cpp index bba40d13d..fb8700ccf 100644 --- a/src/audio_core/command_generator.cpp +++ b/src/audio_core/command_generator.cpp @@ -793,7 +793,6 @@ s32 CommandGenerator::DecodeAdpcm(ServerVoiceInfo& voice_info, VoiceState& dsp_s // Decode entire frame if (remaining_samples >= static_cast<int>(SAMPLES_PER_FRAME)) { for (std::size_t i = 0; i < SAMPLES_PER_FRAME / 2; i++) { - // Sample 1 const s32 s0 = SIGNED_NIBBLES[buffer[buffer_offset] >> 4]; const s32 s1 = SIGNED_NIBBLES[buffer[buffer_offset++] & 0xf]; @@ -802,7 +801,7 @@ s32 CommandGenerator::DecodeAdpcm(ServerVoiceInfo& voice_info, VoiceState& dsp_s sample_buffer[cur_mix_offset++] = sample_1; sample_buffer[cur_mix_offset++] = sample_2; } - remaining_samples -= SAMPLES_PER_FRAME; + remaining_samples -= static_cast<int>(SAMPLES_PER_FRAME); position_in_frame += SAMPLES_PER_FRAME; continue; } |