mirrors/alsa-lib
1
0
Fork 0
mirror of https://github.com/alsa-project/alsa-lib.git synced 2025-10-31 22:25:35 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

pcm: Fill sw_params proto field

Browse source 
Fill the new proto field introduced to sw_params with the current PCM
protocol version.  This makes tstamp_type evaluated properly in the
kernel.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Takashi Iwai 2014-07-16 17:48:34 +02:00
parent de63b942ac
commit 55c5362521
3 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
include/sound/asound.h
View file

@ -386,8 +386,8 @@ struct snd_pcm_sw_params {
snd_pcm_uframes_t silence_threshold; /* min distance from noise for silence filling */ snd_pcm_uframes_t silence_threshold; /* min distance from noise for silence filling */
snd_pcm_uframes_t silence_size; /* silence block size */ snd_pcm_uframes_t silence_size; /* silence block size */
snd_pcm_uframes_t boundary; /* pointers wrap point */ snd_pcm_uframes_t boundary; /* pointers wrap point */
unsigned int tstamp_type; /* timestamp type */ unsigned int proto; /* protocol version */
int pads; /* alignment, reserved */ unsigned int tstamp_type; /* timestamp type (req. proto >= 2.0.12) */
unsigned char reserved[56]; /* reserved for future */ unsigned char reserved[56]; /* reserved for future */
}; };

1
src/pcm/pcm.c
View file

@ -5610,6 +5610,7 @@ int snd_pcm_sw_params_current(snd_pcm_t *pcm, snd_pcm_sw_params_t *params)
SNDMSG("PCM not set up"); SNDMSG("PCM not set up");
return -EIO; return -EIO;
} }
params->proto = SNDRV_PCM_VERSION;
params->tstamp_mode = pcm->tstamp_mode; params->tstamp_mode = pcm->tstamp_mode;
params->tstamp_type = pcm->tstamp_type; params->tstamp_type = pcm->tstamp_type;
params->period_step = pcm->period_step; params->period_step = pcm->period_step;

1
src/pcm/pcm_params.c
View file

@ -2257,6 +2257,7 @@ static int snd_pcm_sw_params_default(snd_pcm_t *pcm, snd_pcm_sw_params_t *params
{ {
assert(pcm && params); assert(pcm && params);
assert(pcm->setup); assert(pcm->setup);
params->proto = SNDRV_PCM_VERSION;
params->tstamp_mode = SND_PCM_TSTAMP_NONE; params->tstamp_mode = SND_PCM_TSTAMP_NONE;
params->tstamp_type = pcm->tstamp_type; params->tstamp_type = pcm->tstamp_type;
params->period_step = 1; params->period_step = 1;