Merge branch 'master' into 'fix_san_build'

# Conflicts:
#   src/modules/module-rtp/apple-midi.h
This commit is contained in:
Wim Taymans 2023-03-10 10:10:25 +00:00
commit 2429674970
7 changed files with 124 additions and 8 deletions

View file

@ -32,11 +32,18 @@ struct rtp_apple_midi_ck {
uint32_t ts3_l;
} __attribute__ ((packed));
struct rtp_apple_midi_rs {
uint32_t cmd;
uint32_t ssrc;
uint32_t seqnum;
} __attribute__ ((packed));
#define APPLE_MIDI_CMD_IN (0xffff0000 | 'I'<<8 | 'N')
#define APPLE_MIDI_CMD_NO (0xffff0000 | 'N'<<8 | 'O')
#define APPLE_MIDI_CMD_OK (0xffff0000 | 'O'<<8 | 'K')
#define APPLE_MIDI_CMD_CK (0xffff0000 | 'C'<<8 | 'K')
#define APPLE_MIDI_CMD_BY (0xffff0000 | 'B'<<8 | 'Y')
#define APPLE_MIDI_CMD_RS (0xffff0000 | 'R'<<8 | 'S')
#ifdef __cplusplus
}