diff --git a/spa/include/spa/control/control.h b/spa/include/spa/control/control.h index 1d955d3e5..1c1ec81fb 100644 --- a/spa/include/spa/control/control.h +++ b/spa/include/spa/control/control.h @@ -24,9 +24,12 @@ extern "C" { /** Different Control types */ enum spa_control_type { SPA_CONTROL_Invalid, - SPA_CONTROL_Properties, /**< data contains a SPA_TYPE_OBJECT_Props */ - SPA_CONTROL_Midi, /**< data contains a spa_pod_bytes with raw midi data */ - SPA_CONTROL_OSC, /**< data contains a spa_pod_bytes with an OSC packet */ + SPA_CONTROL_Properties, /**< SPA_TYPE_OBJECT_Props */ + SPA_CONTROL_Midi, /**< spa_pod_bytes with raw midi data (deprecated, use SPA_CONTROL_UMP) */ + SPA_CONTROL_OSC, /**< spa_pod_bytes with an OSC packet */ + SPA_CONTROL_UMP, /**< spa_pod_bytes with raw UMP (universal MIDI packet) + * data. The UMP 32 bit words are stored in native endian + * format. */ _SPA_CONTROL_LAST, /**< not part of ABI */ }; diff --git a/spa/include/spa/control/type-info.h b/spa/include/spa/control/type-info.h index 2ff3ce185..26f2f2cbd 100644 --- a/spa/include/spa/control/type-info.h +++ b/spa/include/spa/control/type-info.h @@ -27,6 +27,7 @@ static const struct spa_type_info spa_type_control[] = { { SPA_CONTROL_Properties, SPA_TYPE_Int, SPA_TYPE_INFO_CONTROL_BASE "Properties", NULL }, { SPA_CONTROL_Midi, SPA_TYPE_Int, SPA_TYPE_INFO_CONTROL_BASE "Midi", NULL }, { SPA_CONTROL_OSC, SPA_TYPE_Int, SPA_TYPE_INFO_CONTROL_BASE "OSC", NULL }, + { SPA_CONTROL_UMP, SPA_TYPE_Int, SPA_TYPE_INFO_CONTROL_BASE "UMP", NULL }, { 0, 0, NULL, NULL }, }; diff --git a/spa/include/spa/param/format.h b/spa/include/spa/param/format.h index 3f075fd36..eb3b851be 100644 --- a/spa/include/spa/param/format.h +++ b/spa/include/spa/param/format.h @@ -141,6 +141,8 @@ enum spa_format { SPA_FORMAT_START_Stream = 0x50000, /* Application Format keys */ SPA_FORMAT_START_Application = 0x60000, + SPA_FORMAT_CONTROL_types, /**< possible control types (flags choice Int, + * mask of enum spa_control_type) */ }; #define SPA_KEY_FORMAT_DSP "format.dsp" /**< a predefined DSP format,