mirrors/alsa-lib
1
0
Fork 0
mirror of https://github.com/alsa-project/alsa-lib.git synced 2025-11-06 13:29:59 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

pcm_plugin: set the initial hw_ptr/appl_ptr from the child pcm

Browse source 
The direct plugins (dmix & etc.) sets own initial
hw_ptr and appl_ptr. Use this initial settings
to export correct values in snd_pcm_status().

Signed-off-by: Jaroslav Kysela <perex@perex.cz>
This commit is contained in:
Jaroslav Kysela 2021-01-18 21:09:43 +01:00
parent 93752fb4de
commit 644514e85d
1 changed files with 18 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

34
src/pcm/pcm_plugin.c
View file

@ -146,6 +146,22 @@ static int snd_pcm_plugin_delay(snd_pcm_t *pcm, snd_pcm_sframes_t *delayp)
return 0; return 0;
} }
static int snd_pcm_plugin_call_init_cb(snd_pcm_t *pcm, snd_pcm_plugin_t *plugin)
{
snd_pcm_t *slave = plugin->gen.slave;
int err;
assert(pcm->boundary == slave->boundary);
*pcm->hw.ptr = *slave->hw.ptr;
*pcm->appl.ptr = *slave->appl.ptr;
if (plugin->init) {
err = plugin->init(pcm);
if (err < 0)
return err;
}
return 0;
}
static int snd_pcm_plugin_prepare(snd_pcm_t *pcm) static int snd_pcm_plugin_prepare(snd_pcm_t *pcm)
{ {
snd_pcm_plugin_t *plugin = pcm->private_data; snd_pcm_plugin_t *plugin = pcm->private_data;
@ -153,14 +169,7 @@ static int snd_pcm_plugin_prepare(snd_pcm_t *pcm)
err = snd_pcm_prepare(plugin->gen.slave); err = snd_pcm_prepare(plugin->gen.slave);
if (err < 0) if (err < 0)
return err; return err;
*pcm->hw.ptr = 0; return snd_pcm_plugin_call_init_cb(pcm, plugin);
*pcm->appl.ptr = 0;
if (plugin->init) {
err = plugin->init(pcm);
if (err < 0)
return err;
}
return 0;
} }
static int snd_pcm_plugin_reset(snd_pcm_t *pcm) static int snd_pcm_plugin_reset(snd_pcm_t *pcm)
@ -170,14 +179,7 @@ static int snd_pcm_plugin_reset(snd_pcm_t *pcm)
err = snd_pcm_reset(plugin->gen.slave); err = snd_pcm_reset(plugin->gen.slave);
if (err < 0) if (err < 0)
return err; return err;
*pcm->hw.ptr = 0; return snd_pcm_plugin_call_init_cb(pcm, plugin);
*pcm->appl.ptr = 0;
if (plugin->init) {
err = plugin->init(pcm);
if (err < 0)
return err;
}
return 0;
} }
static snd_pcm_sframes_t snd_pcm_plugin_rewindable(snd_pcm_t *pcm) static snd_pcm_sframes_t snd_pcm_plugin_rewindable(snd_pcm_t *pcm)