Update of /cvsroot/alsa/alsa-lib/src/pcm
In directory sc8-pr-cvs1:/tmp/cvs-serv15227/pcm
Modified Files:
pcm_file.c pcm_hooks.c pcm_meter.c pcm_multi.c pcm_plugin.c
pcm_share.c
Log Message:
Use internal snd_pcm_forward() version...
Index: pcm_file.c
===================================================================
RCS file: /cvsroot/alsa/alsa-lib/src/pcm/pcm_file.c,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- pcm_file.c 22 Feb 2003 17:19:05 -0000 1.58
+++ pcm_file.c 7 Mar 2003 18:46:25 -0000 1.59
@@ -253,7 +253,7 @@
n = snd_pcm_frames_to_bytes(pcm, frames);
if (file->wbuf_used_bytes + n > file->wbuf_size_bytes)
frames = snd_pcm_bytes_to_frames(pcm, file->wbuf_size_bytes -
file->wbuf_used_bytes);
- err = snd_pcm_forward(file->slave, frames);
+ err = INTERNAL(snd_pcm_forward)(file->slave, frames);
if (err > 0) {
snd_pcm_uframes_t n = snd_pcm_frames_to_bytes(pcm, err);
file->wbuf_used_bytes += n;
Index: pcm_hooks.c
===================================================================
RCS file: /cvsroot/alsa/alsa-lib/src/pcm/pcm_hooks.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- pcm_hooks.c 22 Feb 2003 17:19:05 -0000 1.28
+++ pcm_hooks.c 7 Mar 2003 18:46:26 -0000 1.29
@@ -173,7 +173,7 @@
static snd_pcm_sframes_t snd_pcm_hooks_forward(snd_pcm_t *pcm, snd_pcm_uframes_t
frames)
{
snd_pcm_hooks_t *h = pcm->private_data;
- return snd_pcm_forward(h->slave, frames);
+ return INTERNAL(snd_pcm_forward)(h->slave, frames);
}
static int snd_pcm_hooks_resume(snd_pcm_t *pcm)
Index: pcm_meter.c
===================================================================
RCS file: /cvsroot/alsa/alsa-lib/src/pcm/pcm_meter.c,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- pcm_meter.c 22 Feb 2003 17:19:06 -0000 1.41
+++ pcm_meter.c 7 Mar 2003 18:46:26 -0000 1.42
@@ -399,7 +399,7 @@
static snd_pcm_sframes_t snd_pcm_meter_forward(snd_pcm_t *pcm, snd_pcm_uframes_t
frames)
{
snd_pcm_meter_t *meter = pcm->private_data;
- snd_pcm_sframes_t err = snd_pcm_forward(meter->slave, frames);
+ snd_pcm_sframes_t err = INTERNAL(snd_pcm_forward)(meter->slave, frames);
if (err > 0 && pcm->stream == SND_PCM_STREAM_PLAYBACK)
meter->rptr = *pcm->appl.ptr;
return err;
Index: pcm_multi.c
===================================================================
RCS file: /cvsroot/alsa/alsa-lib/src/pcm/pcm_multi.c,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- pcm_multi.c 22 Feb 2003 17:19:13 -0000 1.82
+++ pcm_multi.c 7 Mar 2003 18:46:27 -0000 1.83
@@ -505,7 +505,7 @@
snd_pcm_uframes_t f = pos[i] - frames;
snd_pcm_sframes_t result;
if (f > 0) {
- result = snd_pcm_forward(slave_i, f);
+ result = INTERNAL(snd_pcm_forward)(slave_i, f);
if (result < 0)
return result;
if ((snd_pcm_uframes_t)result != f)
@@ -523,7 +523,7 @@
memset(pos, 0, sizeof(pos));
for (i = 0; i < multi->slaves_count; ++i) {
snd_pcm_t *slave_i = multi->slaves[i].pcm;
- snd_pcm_sframes_t f = snd_pcm_forward(slave_i, frames);
+ snd_pcm_sframes_t f = INTERNAL(snd_pcm_forward)(slave_i, frames);
if (f < 0)
return f;
pos[i] = f;
Index: pcm_plugin.c
===================================================================
RCS file: /cvsroot/alsa/alsa-lib/src/pcm/pcm_plugin.c,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- pcm_plugin.c 22 Feb 2003 17:53:03 -0000 1.88
+++ pcm_plugin.c 7 Mar 2003 18:46:31 -0000 1.89
@@ -324,7 +324,7 @@
else
sframes = frames;
snd_atomic_write_begin(&plugin->watom);
- sframes = snd_pcm_forward(plugin->slave, (snd_pcm_uframes_t) sframes);
+ sframes = INTERNAL(snd_pcm_forward)(plugin->slave, (snd_pcm_uframes_t)
sframes);
if ((snd_pcm_sframes_t) sframes < 0) {
snd_atomic_write_end(&plugin->watom);
return sframes;
Index: pcm_share.c
===================================================================
RCS file: /cvsroot/alsa/alsa-lib/src/pcm/pcm_share.c,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- pcm_share.c 28 Feb 2003 17:23:35 -0000 1.73
+++ pcm_share.c 7 Mar 2003 18:46:33 -0000 1.74
@@ -1049,7 +1049,7 @@
if ((snd_pcm_uframes_t)n > frames)
frames = n;
if (share->state == SND_PCM_STATE_RUNNING && frames > 0) {
- snd_pcm_sframes_t ret = snd_pcm_forward(slave->pcm, frames);
+ snd_pcm_sframes_t ret = INTERNAL(snd_pcm_forward)(slave->pcm, frames);
if (ret < 0)
return ret;
frames = ret;
-------------------------------------------------------
This SF.net email is sponsored by: Etnus, makers of TotalView, The debugger
for complex code. Debugging C/C++ programs can leave you feeling lost and
disoriented. TotalView can help you find your way. Available on major UNIX
and Linux platforms. Try it free. www.etnus.com
_______________________________________________
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
