diff options
| author | 2020-09-27 01:52:59 -0700 | |
|---|---|---|
| committer | 2020-09-27 01:52:59 -0700 | |
| commit | a8be822e8eb5cda83b09bcf6c1478b8bef2f2caf (patch) | |
| tree | 2ffdcbce07231caba437d6ac1cbfe23f3a02f16e /src/audio_core/mix_context.cpp | |
| parent | Merge pull request #4724 from lat9nq/fix-vulkan-nvidia-allocate-2 (diff) | |
| parent | audio_core: Resolve sign conversion warnings (diff) | |
| download | yuzu-a8be822e8eb5cda83b09bcf6c1478b8bef2f2caf.tar.gz yuzu-a8be822e8eb5cda83b09bcf6c1478b8bef2f2caf.tar.xz yuzu-a8be822e8eb5cda83b09bcf6c1478b8bef2f2caf.zip | |
Merge pull request #4719 from lioncash/audio-warn
audio_core: Resolve sign conversion warnings
Diffstat (limited to 'src/audio_core/mix_context.cpp')
| -rw-r--r-- | src/audio_core/mix_context.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/audio_core/mix_context.cpp b/src/audio_core/mix_context.cpp index 042891490..4bca72eb0 100644 --- a/src/audio_core/mix_context.cpp +++ b/src/audio_core/mix_context.cpp | |||
| @@ -53,7 +53,7 @@ void MixContext::UpdateDistancesFromFinalMix() { | |||
| 53 | auto mix_id = in_params.mix_id; | 53 | auto mix_id = in_params.mix_id; |
| 54 | // Needs to be referenced out of scope | 54 | // Needs to be referenced out of scope |
| 55 | s32 distance_to_final_mix{AudioCommon::FINAL_MIX}; | 55 | s32 distance_to_final_mix{AudioCommon::FINAL_MIX}; |
| 56 | for (; distance_to_final_mix < info_count; distance_to_final_mix++) { | 56 | for (; distance_to_final_mix < static_cast<s32>(info_count); distance_to_final_mix++) { |
| 57 | if (mix_id == AudioCommon::FINAL_MIX) { | 57 | if (mix_id == AudioCommon::FINAL_MIX) { |
| 58 | // If we're at the final mix, we're done | 58 | // If we're at the final mix, we're done |
| 59 | break; | 59 | break; |
| @@ -77,7 +77,7 @@ void MixContext::UpdateDistancesFromFinalMix() { | |||
| 77 | } | 77 | } |
| 78 | 78 | ||
| 79 | // If we're out of range for our distance, mark it as no final mix | 79 | // If we're out of range for our distance, mark it as no final mix |
| 80 | if (distance_to_final_mix >= info_count) { | 80 | if (distance_to_final_mix >= static_cast<s32>(info_count)) { |
| 81 | distance_to_final_mix = AudioCommon::NO_FINAL_MIX; | 81 | distance_to_final_mix = AudioCommon::NO_FINAL_MIX; |
| 82 | } | 82 | } |
| 83 | 83 | ||