From 0f7a488d6142410abec7b18f5ca72f3beb599632 Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Sat, 30 May 2020 09:08:41 +0200 Subject: [PATCH] param: add available to Profile params --- spa/include/spa/param/param.h | 16 +++++++++------- spa/include/spa/param/type-info.h | 23 ++++++++++++----------- 2 files changed, 21 insertions(+), 18 deletions(-) diff --git a/spa/include/spa/param/param.h b/spa/include/spa/param/param.h index 8dcea2d33..d07546599 100644 --- a/spa/include/spa/param/param.h +++ b/spa/include/spa/param/param.h @@ -91,6 +91,12 @@ enum spa_param_io { SPA_PARAM_IO_size, /**< size of the io area (Int) */ }; +enum spa_param_availability { + SPA_PARAM_AVAILABILITY_unknown, /**< unknown availability */ + SPA_PARAM_AVAILABILITY_no, /**< not available */ + SPA_PARAM_AVAILABILITY_yes, /**< available */ +}; + /** properties for SPA_TYPE_OBJECT_ParamProfile */ enum spa_param_profile { SPA_PARAM_PROFILE_START, @@ -98,6 +104,8 @@ enum spa_param_profile { SPA_PARAM_PROFILE_name, /**< profile name (String) */ SPA_PARAM_PROFILE_description, /**< profile description (String) */ SPA_PARAM_PROFILE_priority, /**< profile priority (Int) */ + SPA_PARAM_PROFILE_available, /**< availability of the profile + * (Id enum spa_param_availability) */ }; enum spa_param_port_config_mode { @@ -119,12 +127,6 @@ enum spa_param_port_config { SPA_PARAM_PORT_CONFIG_format, /**< (Object) format filter */ }; -enum spa_param_route_availability { - SPA_PARAM_ROUTE_AVAILABILITY_unknown, /**< unknown if route is available */ - SPA_PARAM_ROUTE_AVAILABILITY_no, /**< route is not available */ - SPA_PARAM_ROUTE_AVAILABILITY_yes, /**< route is available */ -}; - /** properties for SPA_TYPE_OBJECT_ParamRoute */ enum spa_param_route { SPA_PARAM_ROUTE_START, @@ -133,7 +135,7 @@ enum spa_param_route { SPA_PARAM_ROUTE_description, /**< description of the destination (String) */ SPA_PARAM_ROUTE_priority, /**< priority of the destination (Int) */ SPA_PARAM_ROUTE_available, /**< availability of the destination - * (Id enum spa_param_route_availability) */ + * (Id enum spa_param_availability) */ }; diff --git a/spa/include/spa/param/type-info.h b/spa/include/spa/param/type-info.h index 8767bfec7..304283db6 100644 --- a/spa/include/spa/param/type-info.h +++ b/spa/include/spa/param/type-info.h @@ -268,6 +268,16 @@ static const struct spa_type_info spa_type_param_buffers[] = { { 0, 0, NULL, NULL }, }; +#define SPA_TYPE_INFO_ParamAvailability SPA_TYPE_INFO_ENUM_BASE "ParamAvailability" +#define SPA_TYPE_INFO_PARAM_AVAILABILITY_BASE SPA_TYPE_INFO_ParamAvailability ":" + +static const struct spa_type_info spa_type_param_availability[] = { + { SPA_PARAM_AVAILABILITY_unknown, SPA_TYPE_Int, SPA_TYPE_INFO_PARAM_AVAILABILITY_BASE "unknown", NULL }, + { SPA_PARAM_AVAILABILITY_no, SPA_TYPE_Int, SPA_TYPE_INFO_PARAM_AVAILABILITY_BASE "no", NULL }, + { SPA_PARAM_AVAILABILITY_yes, SPA_TYPE_Int, SPA_TYPE_INFO_PARAM_AVAILABILITY_BASE "yes", NULL }, + { 0, 0, NULL, NULL }, +}; + #define SPA_TYPE_INFO_PARAM_Profile SPA_TYPE_INFO_PARAM_BASE "Profile" #define SPA_TYPE_INFO_PARAM_PROFILE_BASE SPA_TYPE_INFO_PARAM_Profile ":" @@ -277,6 +287,7 @@ static const struct spa_type_info spa_type_param_profile[] = { { SPA_PARAM_PROFILE_name, SPA_TYPE_String, SPA_TYPE_INFO_PARAM_PROFILE_BASE "name", NULL }, { SPA_PARAM_PROFILE_description, SPA_TYPE_String, SPA_TYPE_INFO_PARAM_PROFILE_BASE "description", NULL }, { SPA_PARAM_PROFILE_priority, SPA_TYPE_Int, SPA_TYPE_INFO_PARAM_PROFILE_BASE "priority", NULL }, + { SPA_PARAM_PROFILE_available, SPA_TYPE_Id, SPA_TYPE_INFO_PARAM_PROFILE_BASE "available", spa_type_param_availability, }, { 0, 0, NULL, NULL }, }; @@ -304,16 +315,6 @@ static const struct spa_type_info spa_type_param_port_config[] = { { 0, 0, NULL, NULL }, }; -#define SPA_TYPE_INFO_ParamRouteAvailability SPA_TYPE_INFO_ENUM_BASE "ParamRouteAvailability" -#define SPA_TYPE_INFO_PARAM_ROUTE_AVAILABILITY_BASE SPA_TYPE_INFO_ParamRouteAvailability ":" - -static const struct spa_type_info spa_type_param_route_availability[] = { - { SPA_PARAM_ROUTE_AVAILABILITY_unknown, SPA_TYPE_Int, SPA_TYPE_INFO_PARAM_ROUTE_AVAILABILITY_BASE "unknown", NULL }, - { SPA_PARAM_ROUTE_AVAILABILITY_no, SPA_TYPE_Int, SPA_TYPE_INFO_PARAM_ROUTE_AVAILABILITY_BASE "no", NULL }, - { SPA_PARAM_ROUTE_AVAILABILITY_yes, SPA_TYPE_Int, SPA_TYPE_INFO_PARAM_ROUTE_AVAILABILITY_BASE "yes", NULL }, - { 0, 0, NULL, NULL }, -}; - #define SPA_TYPE_INFO_PARAM_Route SPA_TYPE_INFO_PARAM_BASE "Route" #define SPA_TYPE_INFO_PARAM_ROUTE_BASE SPA_TYPE_INFO_PARAM_Route ":" @@ -324,7 +325,7 @@ static const struct spa_type_info spa_type_param_route[] = { { SPA_PARAM_ROUTE_name, SPA_TYPE_String, SPA_TYPE_INFO_PARAM_ROUTE_BASE "name", NULL, }, { SPA_PARAM_ROUTE_description, SPA_TYPE_String, SPA_TYPE_INFO_PARAM_ROUTE_BASE "description", NULL, }, { SPA_PARAM_ROUTE_priority, SPA_TYPE_Int, SPA_TYPE_INFO_PARAM_ROUTE_BASE "priority", NULL, }, - { SPA_PARAM_ROUTE_available, SPA_TYPE_Id, SPA_TYPE_INFO_PARAM_ROUTE_BASE "available", spa_type_param_route_availability, }, + { SPA_PARAM_ROUTE_available, SPA_TYPE_Id, SPA_TYPE_INFO_PARAM_ROUTE_BASE "available", spa_type_param_availability, }, { 0, 0, NULL, NULL }, };