diff options
| author | Liam <byteslice@airmail.cc> | 2022-11-21 17:31:18 +0100 |
|---|---|---|
| committer | Liam <byteslice@airmail.cc> | 2022-11-23 04:22:28 +0100 |
| commit | 9737615948d431cf56826f3c109bbc0fef7b4d10 (patch) | |
| tree | 9d4742bf8f2b64b9a5b30ae33b105a5e9344ab3b /src/audio_core/sink | |
| parent | Merge pull request #9279 from liamwhite/this-would-have-never-happened-in-rust (diff) | |
| download | yuzu-9737615948d431cf56826f3c109bbc0fef7b4d10.tar yuzu-9737615948d431cf56826f3c109bbc0fef7b4d10.tar.gz yuzu-9737615948d431cf56826f3c109bbc0fef7b4d10.tar.bz2 yuzu-9737615948d431cf56826f3c109bbc0fef7b4d10.tar.lz yuzu-9737615948d431cf56826f3c109bbc0fef7b4d10.tar.xz yuzu-9737615948d431cf56826f3c109bbc0fef7b4d10.tar.zst yuzu-9737615948d431cf56826f3c109bbc0fef7b4d10.zip | |
Diffstat (limited to 'src/audio_core/sink')
| -rw-r--r-- | src/audio_core/sink/sink_stream.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/audio_core/sink/sink_stream.cpp b/src/audio_core/sink/sink_stream.cpp index 849f862b0..e3d060f11 100644 --- a/src/audio_core/sink/sink_stream.cpp +++ b/src/audio_core/sink/sink_stream.cpp @@ -170,8 +170,8 @@ void SinkStream::ProcessAudioIn(std::span<const s16> input_buffer, std::size_t n // Get the minimum frames available between the currently playing buffer, and the // amount we have left to fill - size_t frames_available{std::min(playing_buffer.frames - playing_buffer.frames_played, - num_frames - frames_written)}; + size_t frames_available{std::min<u64>(playing_buffer.frames - playing_buffer.frames_played, + num_frames - frames_written)}; samples_buffer.Push(&input_buffer[frames_written * frame_size], frames_available * frame_size); @@ -241,8 +241,8 @@ void SinkStream::ProcessAudioOutAndRender(std::span<s16> output_buffer, std::siz // Get the minimum frames available between the currently playing buffer, and the // amount we have left to fill - size_t frames_available{std::min(playing_buffer.frames - playing_buffer.frames_played, - num_frames - frames_written)}; + size_t frames_available{std::min<u64>(playing_buffer.frames - playing_buffer.frames_played, + num_frames - frames_written)}; samples_buffer.Pop(&output_buffer[frames_written * frame_size], frames_available * frame_size); |