summaryrefslogtreecommitdiff
path: root/src/audio_core/mix_context.cpp
diff options
context:
space:
mode:
authorGravatar Lioncash2020-10-15 14:49:45 -0400
committerGravatar Lioncash2020-10-17 19:50:39 -0400
commitbe1954e04cb5a0c3a526f78ed5490a5e65310280 (patch)
tree267db7ae4be88dbbc288fa605e35d4a2a13839f6 /src/audio_core/mix_context.cpp
parentMerge pull request #4787 from lioncash/conversion (diff)
downloadyuzu-be1954e04cb5a0c3a526f78ed5490a5e65310280.tar.gz
yuzu-be1954e04cb5a0c3a526f78ed5490a5e65310280.tar.xz
yuzu-be1954e04cb5a0c3a526f78ed5490a5e65310280.zip
core: Fix clang build
Recent changes to the build system that made more warnings be flagged as errors caused building via clang to break. Fixes #4795
Diffstat (limited to 'src/audio_core/mix_context.cpp')
-rw-r--r--src/audio_core/mix_context.cpp17
1 files changed, 9 insertions, 8 deletions
diff --git a/src/audio_core/mix_context.cpp b/src/audio_core/mix_context.cpp
index 4bca72eb0..c28bee453 100644
--- a/src/audio_core/mix_context.cpp
+++ b/src/audio_core/mix_context.cpp
@@ -62,7 +62,7 @@ void MixContext::UpdateDistancesFromFinalMix() {
62 distance_to_final_mix = AudioCommon::NO_FINAL_MIX; 62 distance_to_final_mix = AudioCommon::NO_FINAL_MIX;
63 break; 63 break;
64 } else { 64 } else {
65 const auto& dest_mix = GetInfo(mix_id); 65 const auto& dest_mix = GetInfo(static_cast<u32>(mix_id));
66 const auto dest_mix_distance = dest_mix.GetInParams().final_mix_distance; 66 const auto dest_mix_distance = dest_mix.GetInParams().final_mix_distance;
67 67
68 if (dest_mix_distance == AudioCommon::NO_FINAL_MIX) { 68 if (dest_mix_distance == AudioCommon::NO_FINAL_MIX) {
@@ -129,7 +129,7 @@ bool MixContext::TsortInfo(SplitterContext& splitter_context) {
129 std::size_t info_id{}; 129 std::size_t info_id{};
130 for (auto itr = sorted_list.rbegin(); itr != sorted_list.rend(); ++itr) { 130 for (auto itr = sorted_list.rbegin(); itr != sorted_list.rend(); ++itr) {
131 // Set our sorted info 131 // Set our sorted info
132 sorted_info[info_id++] = &GetInfo(*itr); 132 sorted_info[info_id++] = &GetInfo(static_cast<u32>(*itr));
133 } 133 }
134 134
135 // Calculate the mix buffer offset 135 // Calculate the mix buffer offset
@@ -218,7 +218,8 @@ bool ServerMixInfo::Update(EdgeMatrix& edge_matrix, const MixInfo::InParams& mix
218 for (std::size_t i = 0; i < effect_count; i++) { 218 for (std::size_t i = 0; i < effect_count; i++) {
219 auto* effect_info = effect_context.GetInfo(i); 219 auto* effect_info = effect_context.GetInfo(i);
220 if (effect_info->GetMixID() == in_params.mix_id) { 220 if (effect_info->GetMixID() == in_params.mix_id) {
221 effect_processing_order[effect_info->GetProcessingOrder()] = static_cast<s32>(i); 221 const auto processing_order = static_cast<u32>(effect_info->GetProcessingOrder());
222 effect_processing_order[processing_order] = static_cast<s32>(i);
222 } 223 }
223 } 224 }
224 225
@@ -265,7 +266,7 @@ bool ServerMixInfo::UpdateConnection(EdgeMatrix& edge_matrix, const MixInfo::InP
265 if (in_params.dest_mix_id == mix_in.dest_mix_id && 266 if (in_params.dest_mix_id == mix_in.dest_mix_id &&
266 in_params.splitter_id == mix_in.splitter_id && 267 in_params.splitter_id == mix_in.splitter_id &&
267 ((in_params.splitter_id == AudioCommon::NO_SPLITTER) || 268 ((in_params.splitter_id == AudioCommon::NO_SPLITTER) ||
268 !splitter_context.GetInfo(in_params.splitter_id).HasNewConnection())) { 269 !splitter_context.GetInfo(static_cast<u32>(in_params.splitter_id)).HasNewConnection())) {
269 return false; 270 return false;
270 } 271 }
271 // Remove current edges for mix id 272 // Remove current edges for mix id
@@ -275,11 +276,11 @@ bool ServerMixInfo::UpdateConnection(EdgeMatrix& edge_matrix, const MixInfo::InP
275 edge_matrix.Connect(in_params.mix_id, mix_in.dest_mix_id); 276 edge_matrix.Connect(in_params.mix_id, mix_in.dest_mix_id);
276 } else if (mix_in.splitter_id != AudioCommon::NO_SPLITTER) { 277 } else if (mix_in.splitter_id != AudioCommon::NO_SPLITTER) {
277 // Recurse our splitter linked and set our edges 278 // Recurse our splitter linked and set our edges
278 auto& splitter_info = splitter_context.GetInfo(mix_in.splitter_id); 279 auto& splitter_info = splitter_context.GetInfo(static_cast<u32>(mix_in.splitter_id));
279 const auto length = splitter_info.GetLength(); 280 const auto length = static_cast<size_t>(splitter_info.GetLength());
280 for (s32 i = 0; i < length; i++) { 281 for (size_t i = 0; i < length; i++) {
281 const auto* splitter_destination = 282 const auto* splitter_destination =
282 splitter_context.GetDestinationData(mix_in.splitter_id, i); 283 splitter_context.GetDestinationData(static_cast<u32>(mix_in.splitter_id), i);
283 if (splitter_destination == nullptr) { 284 if (splitter_destination == nullptr) {
284 continue; 285 continue;
285 } 286 }