diff --git a/spa/include/spa/buffer/meta-types.h b/spa/include/spa/buffer/meta-types.h deleted file mode 100644 index f2fa3b2ee..000000000 --- a/spa/include/spa/buffer/meta-types.h +++ /dev/null @@ -1,50 +0,0 @@ -/* Simple Plugin API - * Copyright (C) 2017 Wim Taymans - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, - * Boston, MA 02110-1301, USA. - */ - -#ifndef __SPA_META_H__ -#define __SPA_META_H__ - -#ifdef __cplusplus -extern "C" { -#endif - -#include -#include - -#define SPA_TYPE__Meta SPA_TYPE_POINTER_BASE "Meta" -#define SPA_TYPE_META_BASE SPA_TYPE__Meta ":" - -#define SPA_TYPE_META__Region SPA_TYPE_META_BASE "Region" -#define SPA_TYPE_META_REGION_BASE SPA_TYPE_META__Region ":" - -#define SPA_TYPE_META__RegionArray SPA_TYPE_META_BASE "RegionArray" -#define SPA_TYPE_META_REGION_ARRAY_BASE SPA_TYPE_META__RegionArray ":" - -static const struct spa_type_info spa_type_meta_type[] = { - { SPA_META_Header, SPA_TYPE_META_BASE "Header", SPA_ID_POINTER }, - { SPA_META_VideoCrop, SPA_TYPE_META_REGION_BASE "VideoCrop", SPA_ID_POINTER }, - { SPA_META_VideoDamage, SPA_TYPE_META_REGION_ARRAY_BASE "VideoDamage", SPA_ID_POINTER }, - { 0, NULL, }, -}; - -#ifdef __cplusplus -} /* extern "C" */ -#endif - -#endif /* __SPA_META_H__ */ diff --git a/spa/include/spa/buffer/buffer-types.h b/spa/include/spa/buffer/type-info.h similarity index 71% rename from spa/include/spa/buffer/buffer-types.h rename to spa/include/spa/buffer/type-info.h index 984444790..ed1153a8c 100644 --- a/spa/include/spa/buffer/buffer-types.h +++ b/spa/include/spa/buffer/type-info.h @@ -25,6 +25,7 @@ extern "C" { #endif #include +#include #include #define SPA_TYPE__Buffer SPA_TYPE_POINTER_BASE "Buffer" @@ -45,6 +46,22 @@ static const struct spa_type_info spa_type_data_type[] = { { 0, NULL, }, }; +#define SPA_TYPE__Meta SPA_TYPE_POINTER_BASE "Meta" +#define SPA_TYPE_META_BASE SPA_TYPE__Meta ":" + +#define SPA_TYPE_META__Region SPA_TYPE_META_BASE "Region" +#define SPA_TYPE_META_REGION_BASE SPA_TYPE_META__Region ":" + +#define SPA_TYPE_META__RegionArray SPA_TYPE_META_BASE "RegionArray" +#define SPA_TYPE_META_REGION_ARRAY_BASE SPA_TYPE_META__RegionArray ":" + +static const struct spa_type_info spa_type_meta_type[] = { + { SPA_META_Header, SPA_TYPE_META_BASE "Header", SPA_ID_POINTER }, + { SPA_META_VideoCrop, SPA_TYPE_META_REGION_BASE "VideoCrop", SPA_ID_POINTER }, + { SPA_META_VideoDamage, SPA_TYPE_META_REGION_ARRAY_BASE "VideoDamage", SPA_ID_POINTER }, + { 0, NULL, }, +}; + #ifdef __cplusplus } /* extern "C" */ #endif diff --git a/spa/include/spa/debug/buffer.h b/spa/include/spa/debug/buffer.h index 6277218a7..55d1514af 100644 --- a/spa/include/spa/debug/buffer.h +++ b/spa/include/spa/debug/buffer.h @@ -25,7 +25,7 @@ extern "C" { #endif #include -#include +#include #ifndef spa_debug #define spa_debug(...) ({ fprintf(stderr, __VA_ARGS__);fputc('\n', stderr); }) diff --git a/spa/include/spa/param/format-types.h b/spa/include/spa/param/format-types.h index eaf20ca9c..99340e7b5 100644 --- a/spa/include/spa/param/format-types.h +++ b/spa/include/spa/param/format-types.h @@ -25,7 +25,6 @@ extern "C" { #endif #include -#include #define SPA_TYPE__Format SPA_TYPE_PARAM_BASE "Format" #define SPA_TYPE_FORMAT_BASE SPA_TYPE__Format ":" diff --git a/spa/include/spa/param/param-types.h b/spa/include/spa/param/param-types.h deleted file mode 100644 index 1c296792a..000000000 --- a/spa/include/spa/param/param-types.h +++ /dev/null @@ -1,94 +0,0 @@ -/* Simple Plugin API - * Copyright (C) 2017 Wim Taymans - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, - * Boston, MA 02110-1301, USA. - */ - -#ifndef __SPA_PARAM_TYPES_H__ -#define __SPA_PARAM_TYPES_H__ - -#ifdef __cplusplus -extern "C" { -#endif - -#include -#include - -/* base for parameter objects */ -#define SPA_TYPE__Param SPA_TYPE_OBJECT_BASE "Param" -#define SPA_TYPE_PARAM_BASE SPA_TYPE__Param ":" - -/* base for parameter object enumerations */ -#define SPA_TYPE__ParamId SPA_TYPE_ENUM_BASE "ParamId" -#define SPA_TYPE_PARAM_ID_BASE SPA_TYPE__ParamId ":" - -/** List of supported parameters */ -#define SPA_TYPE_PARAM_ID__List SPA_TYPE_PARAM_ID_BASE "List" - -/* object with supported parameter id */ -#define SPA_TYPE_PARAM__List SPA_TYPE_PARAM_BASE "List" -#define SPA_TYPE_PARAM_LIST_BASE SPA_TYPE_PARAM__List ":" - - -#define SPA_TYPE_PARAM_LIST__id SPA_TYPE_PARAM_LIST_BASE "id" - -/** Enum Property info */ -#define SPA_TYPE_PARAM_ID__PropInfo SPA_TYPE_PARAM_ID_BASE "PropInfo" - -#define SPA_TYPE_PARAM__PropInfo SPA_TYPE_PARAM_BASE "PropInfo" -#define SPA_TYPE_PARAM_PROP_INFO_BASE SPA_TYPE_PARAM__PropInfo ":" - -/** associated id of the property */ -#define SPA_TYPE_PARAM_PROP_INFO__id SPA_TYPE_PARAM_PROP_INFO_BASE "id" -/** name of property */ -#define SPA_TYPE_PARAM_PROP_INFO__name SPA_TYPE_PARAM_PROP_INFO_BASE "name" -/** associated type and range/enums of property */ -#define SPA_TYPE_PARAM_PROP_INFO__type SPA_TYPE_PARAM_PROP_INFO_BASE "type" -/** associated labels of property if any, this is a struct with pairs of values, - * the first one is of the type of the property, the second one is a string with - * a user readable label for the value. */ -#define SPA_TYPE_PARAM_PROP_INFO__labels SPA_TYPE_PARAM_PROP_INFO_BASE "labels" - -/** Property parameter id, deals with SPA_TYPE__Props */ -#define SPA_TYPE_PARAM_ID__Props SPA_TYPE_PARAM_ID_BASE "Props" - -/** The available formats */ -#define SPA_TYPE_PARAM_ID__EnumFormat SPA_TYPE_PARAM_ID_BASE "EnumFormat" - -/** The current format */ -#define SPA_TYPE_PARAM_ID__Format SPA_TYPE_PARAM_ID_BASE "Format" - -/** The supported buffer sizes */ -#define SPA_TYPE_PARAM_ID__Buffers SPA_TYPE_PARAM_ID_BASE "Buffers" - -/** The supported metadata */ -#define SPA_TYPE_PARAM_ID__Meta SPA_TYPE_PARAM_ID_BASE "Meta" - -/** The supported io areas */ -#define SPA_TYPE_PARAM_ID__IO SPA_TYPE_PARAM_ID_BASE "IO" -#define SPA_TYPE_PARAM_ID_IO_BASE SPA_TYPE_PARAM_ID__IO ":" - -/** Base for parameters that describe IO areas to exchange data, - * control and properties with a node. - */ -#define SPA_TYPE_PARAM__IO SPA_TYPE_PARAM_BASE "IO" -#define SPA_TYPE_PARAM_IO_BASE SPA_TYPE_PARAM__IO ":" - -#ifdef __cplusplus -} /* extern "C" */ -#endif - -#endif /* __SPA_PARAM_TYPES_H__ */ diff --git a/spa/include/spa/pod/command-types.h b/spa/include/spa/pod/command-types.h deleted file mode 100644 index b38470128..000000000 --- a/spa/include/spa/pod/command-types.h +++ /dev/null @@ -1,36 +0,0 @@ -/* Simple Plugin API - * Copyright (C) 2016 Wim Taymans - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, - * Boston, MA 02110-1301, USA. - */ - -#ifndef __SPA_COMMAND_TYPES_H__ -#define __SPA_COMMAND_TYPES_H__ - -#ifdef __cplusplus -extern "C" { -#endif - -#include - -#define SPA_TYPE__Command SPA_TYPE_POD_OBJECT_BASE "Command" -#define SPA_TYPE_COMMAND_BASE SPA_TYPE__Command ":" - -#ifdef __cplusplus -} /* extern "C" */ -#endif - -#endif /* __SPA_COMMAND_TYPES_H__ */