Skip to content

M
mpd
Commit a4f0c7b4 authored by Emanuele Giaquinta's avatar Emanuele Giaquinta Committed by Max Kellermann
Browse files
Options

Use MIN.

parent df80ae86
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
src/output/osx_plugin.c
View file @ a4f0c7b4
...@@ -181,7 +181,7 @@ osx_render(void *vdata, ...@@ -181,7 +181,7 @@ osx_render(void *vdata,
} }
*/ */
bytesToCopy = od->len < bufferSize ? od->len : bufferSize; bytesToCopy = MIN(od->len, bufferSize);
bufferSize = bytesToCopy; bufferSize = bytesToCopy;
od->len -= bytesToCopy; od->len -= bytesToCopy;
...@@ -321,7 +321,7 @@ osx_play(void *data, const char *playChunk, size_t size) ...@@ -321,7 +321,7 @@ osx_play(void *data, const char *playChunk, size_t size)
if (curpos >= od->bufferSize) if (curpos >= od->bufferSize)
curpos -= od->bufferSize; curpos -= od->bufferSize;
bytesToCopy = od->bufferSize < size ? od->bufferSize : size; bytesToCopy = MIN(od->bufferSize, size);
while (od->len > od->bufferSize - bytesToCopy) { while (od->len > od->bufferSize - bytesToCopy) {
/* DEBUG("osx_play: wait\n"); */ /* DEBUG("osx_play: wait\n"); */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment