mirror of
https://github.com/alsa-project/alsa-lib.git
synced 2025-10-29 05:40:25 -04:00
fixed compile warning (conversion between signed and unsigned).
This commit is contained in:
parent
2c1041f4f1
commit
12e89c5307
2 changed files with 14 additions and 14 deletions
|
|
@ -119,12 +119,12 @@ static snd_pcm_sframes_t snd_pcm_mmap_write_areas(snd_pcm_t *pcm,
|
|||
frames, pcm->format);
|
||||
result = snd_pcm_mmap_commit(pcm, pcm_offset, frames);
|
||||
if (result < 0)
|
||||
return xfer > 0 ? xfer : result;
|
||||
return xfer > 0 ? (snd_pcm_sframes_t)xfer : result;
|
||||
offset += result;
|
||||
xfer += result;
|
||||
size -= result;
|
||||
}
|
||||
return xfer;
|
||||
return (snd_pcm_sframes_t)xfer;
|
||||
}
|
||||
|
||||
static snd_pcm_sframes_t snd_pcm_mmap_read_areas(snd_pcm_t *pcm,
|
||||
|
|
@ -148,12 +148,12 @@ static snd_pcm_sframes_t snd_pcm_mmap_read_areas(snd_pcm_t *pcm,
|
|||
frames, pcm->format);
|
||||
result = snd_pcm_mmap_commit(pcm, pcm_offset, frames);
|
||||
if (result < 0)
|
||||
return xfer > 0 ? xfer : result;
|
||||
return xfer > 0 ? (snd_pcm_sframes_t)xfer : result;
|
||||
offset += result;
|
||||
xfer += result;
|
||||
size -= result;
|
||||
}
|
||||
return xfer;
|
||||
return (snd_pcm_sframes_t)xfer;
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -338,17 +338,17 @@ static snd_pcm_sframes_t snd_pcm_plugin_write_areas(snd_pcm_t *pcm,
|
|||
snd_pcm_sframes_t res;
|
||||
res = plugin->undo_write(pcm, slave_areas, slave_offset + result, slave_frames, slave_frames - result);
|
||||
if (res < 0)
|
||||
return xfer > 0 ? xfer : res;
|
||||
return xfer > 0 ? (snd_pcm_sframes_t)xfer : res;
|
||||
frames -= res;
|
||||
}
|
||||
snd_atomic_write_end(&plugin->watom);
|
||||
if (result <= 0)
|
||||
return xfer > 0 ? xfer : result;
|
||||
return xfer > 0 ? (snd_pcm_sframes_t)xfer : result;
|
||||
offset += frames;
|
||||
xfer += frames;
|
||||
size -= frames;
|
||||
}
|
||||
return xfer;
|
||||
return (snd_pcm_sframes_t)xfer;
|
||||
}
|
||||
|
||||
static snd_pcm_sframes_t snd_pcm_plugin_read_areas(snd_pcm_t *pcm,
|
||||
|
|
@ -381,17 +381,17 @@ static snd_pcm_sframes_t snd_pcm_plugin_read_areas(snd_pcm_t *pcm,
|
|||
|
||||
res = plugin->undo_read(slave, areas, offset, frames, slave_frames - result);
|
||||
if (res < 0)
|
||||
return xfer > 0 ? xfer : res;
|
||||
return xfer > 0 ? (snd_pcm_sframes_t)xfer : res;
|
||||
frames -= res;
|
||||
}
|
||||
snd_atomic_write_end(&plugin->watom);
|
||||
if (result <= 0)
|
||||
return xfer > 0 ? xfer : result;
|
||||
return xfer > 0 ? (snd_pcm_sframes_t)xfer : result;
|
||||
offset += frames;
|
||||
xfer += frames;
|
||||
size -= frames;
|
||||
}
|
||||
return xfer;
|
||||
return (snd_pcm_sframes_t)xfer;
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -532,7 +532,7 @@ snd_pcm_sframes_t snd_pcm_plugin_avail_update(snd_pcm_t *pcm)
|
|||
|
||||
err = snd_pcm_mmap_begin(slave, &slave_areas, &slave_offset, &slave_frames);
|
||||
if (err < 0)
|
||||
return xfer > 0 ? xfer : err;
|
||||
return xfer > 0 ? (snd_pcm_sframes_t)xfer : err;
|
||||
if (frames > cont)
|
||||
frames = cont;
|
||||
frames = plugin->read(pcm, areas, hw_offset, frames,
|
||||
|
|
@ -546,11 +546,11 @@ snd_pcm_sframes_t snd_pcm_plugin_avail_update(snd_pcm_t *pcm)
|
|||
|
||||
res = plugin->undo_read(slave, areas, hw_offset, frames, slave_frames - result);
|
||||
if (res < 0)
|
||||
return xfer > 0 ? xfer : res;
|
||||
return xfer > 0 ? (snd_pcm_sframes_t)xfer : res;
|
||||
frames -= res;
|
||||
}
|
||||
if (result <= 0)
|
||||
return xfer > 0 ? xfer : result;
|
||||
return xfer > 0 ? (snd_pcm_sframes_t)xfer : result;
|
||||
if (frames == cont)
|
||||
hw_offset = 0;
|
||||
else
|
||||
|
|
@ -559,7 +559,7 @@ snd_pcm_sframes_t snd_pcm_plugin_avail_update(snd_pcm_t *pcm)
|
|||
slave_size -= slave_frames;
|
||||
xfer += frames;
|
||||
}
|
||||
return xfer;
|
||||
return (snd_pcm_sframes_t)xfer;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue