summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Cussins <timcussins@eml.cc>2014-11-25 14:44:54 +0000
committerTakashi Iwai <tiwai@suse.de>2014-11-25 16:34:22 +0100
commita649c4b1a0c728d5d27c8530ed729a41834d24d2 (patch)
treec53249740188d8027c041fa706b3d96b90415cb2
parent72c8b07b2a514261c2cb28558307b5fcb017b05e (diff)
downloadalsa-lib-a649c4b1a0c728d5d27c8530ed729a41834d24d2.tar.gz
pcm: Fix assorted tstamp_type bugs/omissions.
Just a couple of quick fixes related to tstamp_type. - snd_pcm_sw_params(): copy tstamp_type field - snd_pcm_tstamp_type_name(): fix argument type - snd_pcm_dump_sw_setup(): fix dumping of tstamp_type field Signed-off-by: Takashi Iwai <tiwai@suse.de>
-rw-r--r--src/pcm/pcm.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/pcm/pcm.c b/src/pcm/pcm.c
index 39042566..baa47c73 100644
--- a/src/pcm/pcm.c
+++ b/src/pcm/pcm.c
@@ -897,6 +897,7 @@ int snd_pcm_sw_params(snd_pcm_t *pcm, snd_pcm_sw_params_t *params)
if (err < 0)
return err;
pcm->tstamp_mode = params->tstamp_mode;
+ pcm->tstamp_type = params->tstamp_type;
pcm->period_step = params->period_step;
pcm->avail_min = params->avail_min;
pcm->period_event = sw_get_period_event(params);
@@ -1843,7 +1844,7 @@ const char *snd_pcm_tstamp_mode_name(snd_pcm_tstamp_t mode)
* \param mode PCM tstamp type
* \return ascii name of PCM tstamp type setting
*/
-const char *snd_pcm_tstamp_type_name(snd_pcm_tstamp_t type)
+const char *snd_pcm_tstamp_type_name(snd_pcm_tstamp_type_t type)
{
if (type > SND_PCM_TSTAMP_TYPE_LAST)
return NULL;
@@ -1924,7 +1925,7 @@ int snd_pcm_dump_sw_setup(snd_pcm_t *pcm, snd_output_t *out)
return -EIO;
}
snd_output_printf(out, " tstamp_mode : %s\n", snd_pcm_tstamp_mode_name(pcm->tstamp_mode));
- snd_output_printf(out, " tstamp_type : %s\n", snd_pcm_tstamp_type_name(pcm->tstamp_mode));
+ snd_output_printf(out, " tstamp_type : %s\n", snd_pcm_tstamp_type_name(pcm->tstamp_type));
snd_output_printf(out, " period_step : %d\n", pcm->period_step);
snd_output_printf(out, " avail_min : %ld\n", pcm->avail_min);
snd_output_printf(out, " period_event : %i\n", pcm->period_event);