From: Takashi Iwai <tiwai@suse.de>
Date: Wed, 9 Mar 2005 12:00:37 +0000 (+0000)
Subject: Small code clean up
X-Git-Tag: v1.0.9rc1~3
X-Git-Url: https://git.alsa-project.org/?a=commitdiff_plain;h=8003e03b5044e8080403dae5e42bd0a64ff77235;p=alsa-lib.git

Small code clean up

Small code clean up for readability.
---

diff --git a/src/pcm/pcm_dmix.c b/src/pcm/pcm_dmix.c
index 97348342..978368c5 100644
--- a/src/pcm/pcm_dmix.c
+++ b/src/pcm/pcm_dmix.c
@@ -222,8 +222,10 @@ static void snd_pcm_dmix_sync_area(snd_pcm_t *pcm, snd_pcm_uframes_t size)
 	dmix->slave_appl_ptr %= dmix->shmptr->s.boundary;
 	while (size > 0) {
 		transfer = appl_ptr + size > pcm->buffer_size ? pcm->buffer_size - appl_ptr : size;
-		if ((transfer = slave_appl_ptr + transfer > dmix->shmptr->s.buffer_size ? dmix->shmptr->s.buffer_size - slave_appl_ptr : transfer))
-		mix_areas(dmix, src_areas, dst_areas, appl_ptr, slave_appl_ptr, transfer);
+		if (slave_appl_ptr + transfer > dmix->shmptr->s.buffer_size)
+			transfer = dmix->shmptr->s.buffer_size - slave_appl_ptr;
+		if (transfer)
+			mix_areas(dmix, src_areas, dst_areas, appl_ptr, slave_appl_ptr, transfer);
 		if (transfer >= size)
 			return;
 		size -= transfer;