From 7ecb33839841f6882cf769d7f179076e11f76324 Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Fri, 7 Mar 2003 18:46:25 +0000 Subject: [PATCH] Use internal snd_pcm_forward() version... --- src/pcm/pcm_file.c | 2 +- src/pcm/pcm_hooks.c | 2 +- src/pcm/pcm_meter.c | 2 +- src/pcm/pcm_multi.c | 4 ++-- src/pcm/pcm_plugin.c | 2 +- src/pcm/pcm_share.c | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/pcm/pcm_file.c b/src/pcm/pcm_file.c index bcedc0e2..68dd6969 100644 --- a/src/pcm/pcm_file.c +++ b/src/pcm/pcm_file.c @@ -253,7 +253,7 @@ static snd_pcm_sframes_t snd_pcm_file_forward(snd_pcm_t *pcm, snd_pcm_uframes_t 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; diff --git a/src/pcm/pcm_hooks.c b/src/pcm/pcm_hooks.c index dd88a564..160f6106 100644 --- a/src/pcm/pcm_hooks.c +++ b/src/pcm/pcm_hooks.c @@ -173,7 +173,7 @@ static snd_pcm_sframes_t snd_pcm_hooks_rewind(snd_pcm_t *pcm, snd_pcm_uframes_t 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) diff --git a/src/pcm/pcm_meter.c b/src/pcm/pcm_meter.c index 0858382c..001530b7 100644 --- a/src/pcm/pcm_meter.c +++ b/src/pcm/pcm_meter.c @@ -399,7 +399,7 @@ static snd_pcm_sframes_t snd_pcm_meter_rewind(snd_pcm_t *pcm, snd_pcm_uframes_t 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; diff --git a/src/pcm/pcm_multi.c b/src/pcm/pcm_multi.c index 84163313..c41d60c9 100644 --- a/src/pcm/pcm_multi.c +++ b/src/pcm/pcm_multi.c @@ -505,7 +505,7 @@ static snd_pcm_sframes_t snd_pcm_multi_rewind(snd_pcm_t *pcm, snd_pcm_uframes_t 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 @@ static snd_pcm_sframes_t snd_pcm_multi_forward(snd_pcm_t *pcm, snd_pcm_uframes_t 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; diff --git a/src/pcm/pcm_plugin.c b/src/pcm/pcm_plugin.c index ce713055..37c1fea6 100644 --- a/src/pcm/pcm_plugin.c +++ b/src/pcm/pcm_plugin.c @@ -324,7 +324,7 @@ snd_pcm_sframes_t snd_pcm_plugin_forward(snd_pcm_t *pcm, snd_pcm_uframes_t frame 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; diff --git a/src/pcm/pcm_share.c b/src/pcm/pcm_share.c index 58f438eb..3d2efb8b 100644 --- a/src/pcm/pcm_share.c +++ b/src/pcm/pcm_share.c @@ -1049,7 +1049,7 @@ static snd_pcm_sframes_t _snd_pcm_share_forward(snd_pcm_t *pcm, snd_pcm_uframes_ 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; -- 2.47.1