aboutsummaryrefslogtreecommitdiff
path: root/audio/sdlaudio.c
diff options
context:
space:
mode:
authorKővágó, Zoltán <dirty.ice.hu@gmail.com>2019-08-19 01:06:54 +0200
committerGerd Hoffmann <kraxel@redhat.com>2019-08-21 09:13:37 +0200
commit589359150365616de479866f8bc594c876480bd8 (patch)
tree3b0413edced2698cd97e18b6cc106df811c0cc2c /audio/sdlaudio.c
parent8692bf7d978aee2329d9449e31043451a8fdb357 (diff)
audio: remove audio_MIN, audio_MAX
There's already a MIN and MAX macro in include/qemu/osdep.h, use them instead. Signed-off-by: Kővágó, Zoltán <DirtY.iCE.hu@gmail.com> Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com> Message-id: 303222477df6f7373217e0df768635fab5855745.1566168923.git.DirtY.iCE.hu@gmail.com Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Diffstat (limited to 'audio/sdlaudio.c')
-rw-r--r--audio/sdlaudio.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/audio/sdlaudio.c b/audio/sdlaudio.c
index e7179ff1d4..42f7614124 100644
--- a/audio/sdlaudio.c
+++ b/audio/sdlaudio.c
@@ -193,10 +193,10 @@ static void sdl_callback (void *opaque, Uint8 *buf, int len)
/* dolog ("in callback samples=%d live=%d\n", samples, sdl->live); */
- to_mix = audio_MIN(samples, sdl->live);
+ to_mix = MIN(samples, sdl->live);
decr = to_mix;
while (to_mix) {
- int chunk = audio_MIN(to_mix, hw->samples - hw->rpos);
+ int chunk = MIN(to_mix, hw->samples - hw->rpos);
struct st_sample *src = hw->mix_buf + hw->rpos;
/* dolog ("in callback to_mix %d, chunk %d\n", to_mix, chunk); */
@@ -236,7 +236,7 @@ static int sdl_run_out (HWVoiceOut *hw, int live)
sdl->live);
}
- decr = audio_MIN (sdl->decr, live);
+ decr = MIN (sdl->decr, live);
sdl->decr -= decr;
sdl->live = live;