summaryrefslogtreecommitdiff
path: root/src/audio_core/info_updater.cpp
diff options
context:
space:
mode:
authorGravatar LC2020-10-20 22:08:53 -0400
committerGravatar GitHub2020-10-20 22:08:53 -0400
commit2e74b79e89fe1e6a21fe0d8650844e563b3c32f5 (patch)
tree0dbc65ac86e609ae22087c7be9d4759ac6b73004 /src/audio_core/info_updater.cpp
parentkernel: Fix build with recent compiler flag changes (diff)
parentRevert "core: Fix clang build" (diff)
downloadyuzu-2e74b79e89fe1e6a21fe0d8650844e563b3c32f5.tar.gz
yuzu-2e74b79e89fe1e6a21fe0d8650844e563b3c32f5.tar.xz
yuzu-2e74b79e89fe1e6a21fe0d8650844e563b3c32f5.zip
Merge pull request #4814 from yuzu-emu/revert-4796-clang
Revert "core: Fix clang build"
Diffstat (limited to 'src/audio_core/info_updater.cpp')
-rw-r--r--src/audio_core/info_updater.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/audio_core/info_updater.cpp b/src/audio_core/info_updater.cpp
index f999a8b17..2940e53a9 100644
--- a/src/audio_core/info_updater.cpp
+++ b/src/audio_core/info_updater.cpp
@@ -350,7 +350,7 @@ ResultCode InfoUpdater::UpdateMixes(MixContext& mix_context, std::size_t mix_buf
350 std::size_t total_buffer_count{}; 350 std::size_t total_buffer_count{};
351 for (std::size_t i = 0; i < mix_count; i++) { 351 for (std::size_t i = 0; i < mix_count; i++) {
352 const auto& in = mix_in_params[i]; 352 const auto& in = mix_in_params[i];
353 total_buffer_count += static_cast<size_t>(in.buffer_count); 353 total_buffer_count += in.buffer_count;
354 if (static_cast<std::size_t>(in.dest_mix_id) > mix_count && 354 if (static_cast<std::size_t>(in.dest_mix_id) > mix_count &&
355 in.dest_mix_id != AudioCommon::NO_MIX && in.mix_id != AudioCommon::FINAL_MIX) { 355 in.dest_mix_id != AudioCommon::NO_MIX && in.mix_id != AudioCommon::FINAL_MIX) {
356 LOG_ERROR( 356 LOG_ERROR(
@@ -379,7 +379,7 @@ ResultCode InfoUpdater::UpdateMixes(MixContext& mix_context, std::size_t mix_buf
379 const auto& mix_in = mix_in_params[i]; 379 const auto& mix_in = mix_in_params[i];
380 std::size_t target_mix{}; 380 std::size_t target_mix{};
381 if (behavior_info.IsMixInParameterDirtyOnlyUpdateSupported()) { 381 if (behavior_info.IsMixInParameterDirtyOnlyUpdateSupported()) {
382 target_mix = static_cast<size_t>(mix_in.mix_id); 382 target_mix = mix_in.mix_id;
383 } else { 383 } else {
384 // Non dirty supported games just use i instead of the actual mix_id 384 // Non dirty supported games just use i instead of the actual mix_id
385 target_mix = i; 385 target_mix = i;