mirror of
https://github.com/alsa-project/alsa-lib.git
synced 2025-11-09 13:30:03 -05:00
Fedora 4 patch - gcc4 fixes
This commit is contained in:
parent
f2099d5770
commit
412fb54e0d
7 changed files with 13 additions and 13 deletions
|
|
@ -75,9 +75,9 @@ static void mix_areas1(unsigned int size,
|
|||
} while (IS_CONCURRENT && *sum != old_sample);
|
||||
if (!--size)
|
||||
return;
|
||||
src += src_step;
|
||||
dst += dst_step;
|
||||
sum += sum_step;
|
||||
src = (signed short *) ((char *)src + src_step);
|
||||
dst = (signed short *) ((char *)dst + dst_step);
|
||||
sum = (signed int *) ((char *)sum + sum_step);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -109,9 +109,9 @@ static void mix_areas2(unsigned int size,
|
|||
} while (IS_CONCURRENT && *sum != old_sample);
|
||||
if (!--size)
|
||||
return;
|
||||
src += src_step;
|
||||
dst += dst_step;
|
||||
sum += sum_step;
|
||||
src = (signed int *) ((char *)src + src_step);
|
||||
dst = (signed int *) ((char *)dst + dst_step);
|
||||
sum = (signed int *) ((char *)sum + sum_step);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -316,7 +316,7 @@ static snd_pcm_sframes_t snd_pcm_plugin_read_areas(snd_pcm_t *pcm,
|
|||
snd_pcm_mmap_begin(slave, &slave_areas, &slave_offset, &slave_frames);
|
||||
if (slave_frames == 0)
|
||||
break;
|
||||
frames = plugin->read(pcm, areas, offset, frames,
|
||||
frames = (plugin->read)(pcm, areas, offset, frames,
|
||||
slave_areas, slave_offset, &slave_frames);
|
||||
if (CHECK_SANITY(slave_frames > snd_pcm_mmap_capture_avail(slave))) {
|
||||
SNDMSG("read overflow %ld > %ld", slave_frames,
|
||||
|
|
@ -488,7 +488,7 @@ snd_pcm_sframes_t snd_pcm_plugin_avail_update(snd_pcm_t *pcm)
|
|||
return xfer > 0 ? (snd_pcm_sframes_t)xfer : err;
|
||||
if (frames > cont)
|
||||
frames = cont;
|
||||
frames = plugin->read(pcm, areas, hw_offset, frames,
|
||||
frames = (plugin->read)(pcm, areas, hw_offset, frames,
|
||||
slave_areas, slave_offset, &slave_frames);
|
||||
snd_atomic_write_begin(&plugin->watom);
|
||||
snd_pcm_mmap_hw_forward(pcm, frames);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue