diff options
| author | Mark Brown <broonie@kernel.org> | 2020-03-11 21:45:26 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2020-03-11 21:45:26 +0300 |
| commit | 4d90a4e677c5c45c787a774c84442e75c7ddd5be (patch) | |
| tree | 50312d13362dd49615148661ae7e6d91ac349719 /sound/core/seq/seq_timer.h | |
| parent | 9032cdd96a2d4b0ef2f43499328f8a68050be2ec (diff) | |
| parent | 2c523b344dfa65a3738e7039832044aa133c75fb (diff) | |
| download | linux-4d90a4e677c5c45c787a774c84442e75c7ddd5be.tar.xz | |
Merge tag 'v5.6-rc5' into asoc-5.7
Linux 5.6-rc5
Diffstat (limited to 'sound/core/seq/seq_timer.h')
| -rw-r--r-- | sound/core/seq/seq_timer.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/core/seq/seq_timer.h b/sound/core/seq/seq_timer.h index 66c3e344eae3..4bec57df8158 100644 --- a/sound/core/seq/seq_timer.h +++ b/sound/core/seq/seq_timer.h @@ -120,7 +120,8 @@ int snd_seq_timer_set_tempo_ppq(struct snd_seq_timer *tmr, int tempo, int ppq); int snd_seq_timer_set_position_tick(struct snd_seq_timer *tmr, snd_seq_tick_time_t position); int snd_seq_timer_set_position_time(struct snd_seq_timer *tmr, snd_seq_real_time_t position); int snd_seq_timer_set_skew(struct snd_seq_timer *tmr, unsigned int skew, unsigned int base); -snd_seq_real_time_t snd_seq_timer_get_cur_time(struct snd_seq_timer *tmr); +snd_seq_real_time_t snd_seq_timer_get_cur_time(struct snd_seq_timer *tmr, + bool adjust_ktime); snd_seq_tick_time_t snd_seq_timer_get_cur_tick(struct snd_seq_timer *tmr); extern int seq_default_timer_class; |