diff options
| author | 2018-10-07 14:25:39 +1100 | |
|---|---|---|
| committer | 2018-10-07 14:25:39 +1100 | |
| commit | ceef334c1cc2c55def468a1f83474ba8d4a3884d (patch) | |
| tree | d95bb7d56011e567d423a9ab14c1011091379744 /src/audio_core/audio_renderer.cpp | |
| parent | Fixed missing return (diff) | |
| download | yuzu-ceef334c1cc2c55def468a1f83474ba8d4a3884d.tar.gz yuzu-ceef334c1cc2c55def468a1f83474ba8d4a3884d.tar.xz yuzu-ceef334c1cc2c55def468a1f83474ba8d4a3884d.zip | |
Fixups for softlock
Diffstat (limited to 'src/audio_core/audio_renderer.cpp')
| -rw-r--r-- | src/audio_core/audio_renderer.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/audio_core/audio_renderer.cpp b/src/audio_core/audio_renderer.cpp index 5d2feb1b9..23e5d3f10 100644 --- a/src/audio_core/audio_renderer.cpp +++ b/src/audio_core/audio_renderer.cpp | |||
| @@ -30,7 +30,7 @@ public: | |||
| 30 | return info; | 30 | return info; |
| 31 | } | 31 | } |
| 32 | 32 | ||
| 33 | VoiceInfo& Info() { | 33 | VoiceInfo& GetInfo() { |
| 34 | return info; | 34 | return info; |
| 35 | } | 35 | } |
| 36 | 36 | ||
| @@ -61,7 +61,7 @@ public: | |||
| 61 | return info; | 61 | return info; |
| 62 | } | 62 | } |
| 63 | 63 | ||
| 64 | EffectInStatus& Info() { | 64 | EffectInStatus& GetInfo() { |
| 65 | return info; | 65 | return info; |
| 66 | } | 66 | } |
| 67 | 67 | ||
| @@ -120,7 +120,7 @@ std::vector<u8> AudioRenderer::UpdateAudioRenderer(const std::vector<u8>& input_ | |||
| 120 | std::size_t voice_offset{sizeof(UpdateDataHeader) + config.behavior_size + | 120 | std::size_t voice_offset{sizeof(UpdateDataHeader) + config.behavior_size + |
| 121 | config.memory_pools_size + config.voice_resource_size}; | 121 | config.memory_pools_size + config.voice_resource_size}; |
| 122 | for (auto& voice : voices) { | 122 | for (auto& voice : voices) { |
| 123 | std::memcpy(&voice.Info(), input_params.data() + voice_offset, sizeof(VoiceInfo)); | 123 | std::memcpy(&voice.GetInfo(), input_params.data() + voice_offset, sizeof(VoiceInfo)); |
| 124 | voice_offset += sizeof(VoiceInfo); | 124 | voice_offset += sizeof(VoiceInfo); |
| 125 | } | 125 | } |
| 126 | 126 | ||
| @@ -128,7 +128,7 @@ std::vector<u8> AudioRenderer::UpdateAudioRenderer(const std::vector<u8>& input_ | |||
| 128 | config.memory_pools_size + config.voice_resource_size + | 128 | config.memory_pools_size + config.voice_resource_size + |
| 129 | config.voices_size}; | 129 | config.voices_size}; |
| 130 | for (auto& effect : effects) { | 130 | for (auto& effect : effects) { |
| 131 | std::memcpy(&effect.Info(), input_params.data() + effect_offset, sizeof(EffectInStatus)); | 131 | std::memcpy(&effect.GetInfo(), input_params.data() + effect_offset, sizeof(EffectInStatus)); |
| 132 | effect_offset += sizeof(EffectInStatus); | 132 | effect_offset += sizeof(EffectInStatus); |
| 133 | } | 133 | } |
| 134 | 134 | ||
| @@ -285,7 +285,8 @@ void AudioRenderer::VoiceState::RefreshBuffer() { | |||
| 285 | break; | 285 | break; |
| 286 | } | 286 | } |
| 287 | 287 | ||
| 288 | samples = Interpolate(interp_state, std::move(samples), Info().sample_rate, STREAM_SAMPLE_RATE); | 288 | samples = |
| 289 | Interpolate(interp_state, std::move(samples), GetInfo().sample_rate, STREAM_SAMPLE_RATE); | ||
| 289 | 290 | ||
| 290 | is_refresh_pending = false; | 291 | is_refresh_pending = false; |
| 291 | } | 292 | } |