summaryrefslogtreecommitdiffstats
path: root/src/audio_core/voice_context.cpp
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2020-12-03 08:08:43 +0100
committerGitHub <noreply@github.com>2020-12-03 08:08:43 +0100
commit88089c87546b62536a27738f5ee03dff52fa76e9 (patch)
tree5221c80d0ac3e7bbdb0c342098378e6c84951658 /src/audio_core/voice_context.cpp
parentMerge pull request #5002 from ameerj/nvdec-frameskip (diff)
parentaudio_core: Make shadowing and unused parameters errors (diff)
downloadyuzu-88089c87546b62536a27738f5ee03dff52fa76e9.tar
yuzu-88089c87546b62536a27738f5ee03dff52fa76e9.tar.gz
yuzu-88089c87546b62536a27738f5ee03dff52fa76e9.tar.bz2
yuzu-88089c87546b62536a27738f5ee03dff52fa76e9.tar.lz
yuzu-88089c87546b62536a27738f5ee03dff52fa76e9.tar.xz
yuzu-88089c87546b62536a27738f5ee03dff52fa76e9.tar.zst
yuzu-88089c87546b62536a27738f5ee03dff52fa76e9.zip
Diffstat (limited to 'src/audio_core/voice_context.cpp')
-rw-r--r--src/audio_core/voice_context.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/audio_core/voice_context.cpp b/src/audio_core/voice_context.cpp
index c46ee55f1..867b8fc6b 100644
--- a/src/audio_core/voice_context.cpp
+++ b/src/audio_core/voice_context.cpp
@@ -8,7 +8,7 @@
namespace AudioCore {
-ServerVoiceChannelResource::ServerVoiceChannelResource(s32 id) : id(id) {}
+ServerVoiceChannelResource::ServerVoiceChannelResource(s32 id_) : id(id_) {}
ServerVoiceChannelResource::~ServerVoiceChannelResource() = default;
bool ServerVoiceChannelResource::InUse() const {
@@ -209,7 +209,8 @@ void ServerVoiceInfo::UpdateWaveBuffers(
void ServerVoiceInfo::UpdateWaveBuffer(ServerWaveBuffer& out_wavebuffer,
const WaveBuffer& in_wave_buffer, SampleFormat sample_format,
- bool is_buffer_valid, BehaviorInfo& behavior_info) {
+ bool is_buffer_valid,
+ [[maybe_unused]] BehaviorInfo& behavior_info) {
if (!is_buffer_valid && out_wavebuffer.sent_to_dsp) {
out_wavebuffer.buffer_address = 0;
out_wavebuffer.buffer_size = 0;
@@ -400,7 +401,7 @@ bool ServerVoiceInfo::HasValidWaveBuffer(const VoiceState* state) const {
return std::find(valid_wb.begin(), valid_wb.end(), true) != valid_wb.end();
}
-VoiceContext::VoiceContext(std::size_t voice_count) : voice_count(voice_count) {
+VoiceContext::VoiceContext(std::size_t voice_count_) : voice_count{voice_count_} {
for (std::size_t i = 0; i < voice_count; i++) {
voice_channel_resources.emplace_back(static_cast<s32>(i));
sorted_voice_info.push_back(&voice_info.emplace_back());