diff options
| author |  liamwhite | 2022-12-03 12:09:21 -0500 |
|---|---|---|
| committer |  GitHub | 2022-12-03 12:09:21 -0500 |
| commit | 22aff09b33941cdf907e474cb86117fef838abba (patch) | |
| tree | 73a747be44fd2ba994c3d40c8f6ea18633c0f880 /src/audio_core/sink | |
| parent | Merge pull request #9353 from vonchenplus/draw_indexed (diff) | |
| parent | general: fix compile for Apple Clang (diff) | |
| download | yuzu-22aff09b33941cdf907e474cb86117fef838abba.tar.gz yuzu-22aff09b33941cdf907e474cb86117fef838abba.tar.xz yuzu-22aff09b33941cdf907e474cb86117fef838abba.zip | |
Merge pull request #9289 from liamwhite/fruit-company
general: fix compile for Apple Clang
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 67e194e3c..06c2a876e 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 | |||
| 170 | 170 | ||
| 171 | // Get the minimum frames available between the currently playing buffer, and the | 171 | // Get the minimum frames available between the currently playing buffer, and the |
| 172 | // amount we have left to fill | 172 | // amount we have left to fill |
| 173 | size_t frames_available{std::min(playing_buffer.frames - playing_buffer.frames_played, | 173 | size_t frames_available{std::min<u64>(playing_buffer.frames - playing_buffer.frames_played, |
| 174 | num_frames - frames_written)}; | 174 | num_frames - frames_written)}; |
| 175 | 175 | ||
| 176 | samples_buffer.Push(&input_buffer[frames_written * frame_size], | 176 | samples_buffer.Push(&input_buffer[frames_written * frame_size], |
| 177 | frames_available * frame_size); | 177 | frames_available * frame_size); |
| @@ -241,8 +241,8 @@ void SinkStream::ProcessAudioOutAndRender(std::span<s16> output_buffer, std::siz | |||
| 241 | 241 | ||
| 242 | // Get the minimum frames available between the currently playing buffer, and the | 242 | // Get the minimum frames available between the currently playing buffer, and the |
| 243 | // amount we have left to fill | 243 | // amount we have left to fill |
| 244 | size_t frames_available{std::min(playing_buffer.frames - playing_buffer.frames_played, | 244 | size_t frames_available{std::min<u64>(playing_buffer.frames - playing_buffer.frames_played, |
| 245 | num_frames - frames_written)}; | 245 | num_frames - frames_written)}; |
| 246 | 246 | ||
| 247 | samples_buffer.Pop(&output_buffer[frames_written * frame_size], | 247 | samples_buffer.Pop(&output_buffer[frames_written * frame_size], |
| 248 | frames_available * frame_size); | 248 | frames_available * frame_size); |