aboutsummaryrefslogtreecommitdiffstats
path: root/src/output
diff options
context:
space:
mode:
authorEmanuele Giaquinta <e.giaquinta@glauco.it>2008-12-17 15:48:12 +0100
committerMax Kellermann <max@duempel.org>2008-12-17 15:56:43 +0100
commita4f0c7b457a5806568097f88730433dc7bc19f00 (patch)
tree3a3c6b948eb1068ce1126977ea09e0ff2170ee03 /src/output
parentdf80ae86ee0336c50f576ee7b9f1c58aaa70ff97 (diff)
downloadmpd-a4f0c7b457a5806568097f88730433dc7bc19f00.tar.gz
mpd-a4f0c7b457a5806568097f88730433dc7bc19f00.tar.xz
mpd-a4f0c7b457a5806568097f88730433dc7bc19f00.zip
Use MIN.
Diffstat (limited to 'src/output')
-rw-r--r--src/output/osx_plugin.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/output/osx_plugin.c b/src/output/osx_plugin.c
index 1087ddb2d..d1d65ae00 100644
--- a/src/output/osx_plugin.c
+++ b/src/output/osx_plugin.c
@@ -181,7 +181,7 @@ osx_render(void *vdata,
}
*/
- bytesToCopy = od->len < bufferSize ? od->len : bufferSize;
+ bytesToCopy = MIN(od->len, bufferSize);
bufferSize = bytesToCopy;
od->len -= bytesToCopy;
@@ -321,7 +321,7 @@ osx_play(void *data, const char *playChunk, size_t size)
if (curpos >= od->bufferSize)
curpos -= od->bufferSize;
- bytesToCopy = od->bufferSize < size ? od->bufferSize : size;
+ bytesToCopy = MIN(od->bufferSize, size);
while (od->len > od->bufferSize - bytesToCopy) {
/* DEBUG("osx_play: wait\n"); */