diff options
| author | Takashi Iwai <tiwai@suse.de> | 2024-07-15 08:17:55 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2024-07-15 08:17:55 +0200 |
| commit | 5fa87a081b2d633b944d5a93f5767623ef2a961d (patch) | |
| tree | a9ca2777b82e1b3b0ed4efa20457a9a007075e14 /include/uapi/sound/asequencer.h | |
| parent | 8fc1e8b230771442133d5cf5fa4313277aa2bb8b (diff) | |
| parent | d2eb433c8546363134cabca7a85c73086700aeec (diff) | |
Merge branch 'for-next' into for-linus
Pull 6.11 devel branch
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'include/uapi/sound/asequencer.h')
| -rw-r--r-- | include/uapi/sound/asequencer.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/include/uapi/sound/asequencer.h b/include/uapi/sound/asequencer.h index c85fdd8895d8..39b37edcf813 100644 --- a/include/uapi/sound/asequencer.h +++ b/include/uapi/sound/asequencer.h @@ -10,7 +10,7 @@ #include <sound/asound.h> /** version of the sequencer */ -#define SNDRV_SEQ_VERSION SNDRV_PROTOCOL_VERSION(1, 0, 3) +#define SNDRV_SEQ_VERSION SNDRV_PROTOCOL_VERSION(1, 0, 4) /** * definition of sequencer event types @@ -523,11 +523,12 @@ struct snd_seq_queue_status { /* queue tempo */ struct snd_seq_queue_tempo { int queue; /* sequencer queue */ - unsigned int tempo; /* current tempo, us/tick */ + unsigned int tempo; /* current tempo, us/tick (or different time-base below) */ int ppq; /* time resolution, ticks/quarter */ unsigned int skew_value; /* queue skew */ unsigned int skew_base; /* queue skew base */ - char reserved[24]; /* for the future */ + unsigned short tempo_base; /* tempo base in nsec unit; either 10 or 1000 */ + char reserved[22]; /* for the future */ }; |