mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-02 09:01:50 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

spa: fix includes

Browse source
This commit is contained in:
Wim Taymans 2023-01-13 11:41:38 +01:00
parent 00ae289a14
commit 9a580362a7
15 changed files with 83 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

3
spa/include/spa/buffer/meta.h
View file

@ -177,7 +177,8 @@ enum spa_meta_videotransform_value {
/** a transformation of the buffer */
struct spa_meta_videotransform {
uint32_t transform; /**< orientation transformation that was applied to the buffer */
uint32_t transform; /**< orientation transformation that was applied to the buffer,
* one of enum spa_meta_videotransform_value */
};
/**

1
spa/include/spa/buffer/type-info.h
View file

@ -79,6 +79,7 @@ static const struct spa_type_info spa_type_meta_type[] = {
{ SPA_META_Cursor, SPA_TYPE_Pointer, SPA_TYPE_INFO_META_BASE "Cursor", NULL },
{ SPA_META_Control, SPA_TYPE_Pointer, SPA_TYPE_INFO_META_BASE "Control", NULL },
{ SPA_META_Busy, SPA_TYPE_Pointer, SPA_TYPE_INFO_META_BASE "Busy", NULL },
{ SPA_META_VideoTransform, SPA_TYPE_Pointer, SPA_TYPE_INFO_META_BASE "VideoTransform", NULL },
{ 0, 0, NULL, NULL },
};

2
spa/include/spa/node/type-info.h
View file

@ -34,7 +34,7 @@ extern "C" {
* \{
*/
#include <spa/utils/type-info.h>
#include <spa/utils/type.h>
#include <spa/node/command.h>
#include <spa/node/event.h>

1
spa/include/spa/param/audio/iec958-types.h
View file

@ -29,6 +29,7 @@
extern "C" {
#endif
#include <spa/utils/type.h>
#include <spa/param/audio/iec958.h>
#define SPA_TYPE_INFO_AudioIEC958Codec SPA_TYPE_INFO_ENUM_BASE "AudioIEC958Codec"

1
spa/include/spa/param/audio/raw-types.h
View file

@ -34,6 +34,7 @@ extern "C" {
* \{
*/
#include <spa/utils/type.h>
#include <spa/param/audio/raw.h>
#define SPA_TYPE_INFO_AudioFormat SPA_TYPE_INFO_ENUM_BASE "AudioFormat"

1
spa/include/spa/param/buffers-types.h
View file

@ -35,6 +35,7 @@ extern "C" {
*/
#include <spa/param/param-types.h>
#include <spa/node/type-info.h>
#include <spa/param/buffers.h>

2
spa/include/spa/param/latency-types.h
View file

@ -34,6 +34,8 @@ extern "C" {
* \{
*/
#include <spa/utils/enum-types.h>
#include <spa/param/param-types.h>
#include <spa/param/latency.h>
#define SPA_TYPE_INFO_PARAM_Latency SPA_TYPE_INFO_PARAM_BASE "Latency"

1
spa/include/spa/param/param-types.h
View file

@ -34,7 +34,6 @@ extern "C" {
* \{
*/
#include <spa/utils/defs.h>
#include <spa/param/props.h>
#include <spa/param/format.h>
#include <spa/buffer/type-info.h>

1
spa/include/spa/param/port-config-types.h
View file

@ -34,6 +34,7 @@ extern "C" {
* \{
*/
#include <spa/utils/enum-types.h>
#include <spa/param/param-types.h>
#include <spa/param/port-config.h>

1
spa/include/spa/param/profiler-types.h
View file

@ -34,6 +34,7 @@ extern "C" {
* \{
*/
#include <spa/param/param-types.h>
#include <spa/param/profiler.h>
#define SPA_TYPE_INFO_Profiler SPA_TYPE_INFO_OBJECT_BASE "Profiler"

2
spa/include/spa/param/route-types.h
View file

@ -34,7 +34,9 @@ extern "C" {
* \{
*/
#include <spa/utils/enum-types.h>
#include <spa/param/param-types.h>
#include <spa/param/route.h>
#define SPA_TYPE_INFO_PARAM_Route SPA_TYPE_INFO_PARAM_BASE "Route"

5
spa/include/spa/param/video/dsp-utils.h
View file

@ -34,7 +34,8 @@ extern "C" {
* \{
*/
#include <spa/param/video/format-utils.h>
#include <spa/pod/parser.h>
#include <spa/pod/builder.h>
#include <spa/param/video/dsp.h>
static inline int
@ -79,4 +80,4 @@ spa_format_video_dsp_build(struct spa_pod_builder *builder, uint32_t id,
} /* extern "C" */
#endif
#endif /* SPA_VIDEO_DSP_H */
#endif /* SPA_VIDEO_DSP_UTILS_H */

1
spa/include/spa/param/video/raw-types.h
View file

@ -33,6 +33,7 @@ extern "C" {
* \addtogroup spa_param
* \{
*/
#include <spa/utils/type.h>
#include <spa/param/video/raw.h>
#define SPA_TYPE_INFO_VideoFormat SPA_TYPE_INFO_ENUM_BASE "VideoFormat"

65
spa/include/spa/utils/enum-types.h Normal file
View file

@ -0,0 +1,65 @@
/* Simple Plugin API
*
* Copyright © 2018 Wim Taymans
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
* to deal in the Software without restriction, including without limitation
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
* and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice (including the next
* paragraph) shall be included in all copies or substantial portions of the
* Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
* DEALINGS IN THE SOFTWARE.
*/
#ifndef SPA_ENUM_TYPES_H
#define SPA_ENUM_TYPES_H
#ifdef __cplusplus
extern "C" {
#endif
#include <spa/utils/type.h>
#define SPA_TYPE_INFO_Direction SPA_TYPE_INFO_ENUM_BASE "Direction"
#define SPA_TYPE_INFO_DIRECTION_BASE SPA_TYPE_INFO_Direction ":"
static const struct spa_type_info spa_type_direction[] = {
{ SPA_DIRECTION_INPUT, SPA_TYPE_Int, SPA_TYPE_INFO_DIRECTION_BASE "Input", NULL },
{ SPA_DIRECTION_OUTPUT, SPA_TYPE_Int, SPA_TYPE_INFO_DIRECTION_BASE "Output", NULL },
{ 0, 0, NULL, NULL }
};
#include <spa/pod/pod.h>
#define SPA_TYPE_INFO_Choice SPA_TYPE_INFO_ENUM_BASE "Choice"
#define SPA_TYPE_INFO_CHOICE_BASE SPA_TYPE_INFO_Choice ":"
static const struct spa_type_info spa_type_choice[] = {
{ SPA_CHOICE_None, SPA_TYPE_Int, SPA_TYPE_INFO_CHOICE_BASE "None", NULL },
{ SPA_CHOICE_Range, SPA_TYPE_Int, SPA_TYPE_INFO_CHOICE_BASE "Range", NULL },
{ SPA_CHOICE_Step, SPA_TYPE_Int, SPA_TYPE_INFO_CHOICE_BASE "Step", NULL },
{ SPA_CHOICE_Enum, SPA_TYPE_Int, SPA_TYPE_INFO_CHOICE_BASE "Enum", NULL },
{ SPA_CHOICE_Flags, SPA_TYPE_Int, SPA_TYPE_INFO_CHOICE_BASE "Flags", NULL },
{ 0, 0, NULL, NULL }
};
/**
* \}
*/
#ifdef __cplusplus
} /* extern "C" */
#endif
#endif /* SPA_TYPE_INFO_H */

24
spa/include/spa/utils/type-info.h
View file

@ -46,35 +46,13 @@ static inline bool spa_type_is_a(const char *type, const char *parent)
}
#include <spa/utils/type.h>
/* base for parameter object enumerations */
#define SPA_TYPE_INFO_Direction SPA_TYPE_INFO_ENUM_BASE "Direction"
#define SPA_TYPE_INFO_DIRECTION_BASE SPA_TYPE_INFO_Direction ":"
static const struct spa_type_info spa_type_direction[] = {
{ SPA_DIRECTION_INPUT, SPA_TYPE_Int, SPA_TYPE_INFO_DIRECTION_BASE "Input", NULL },
{ SPA_DIRECTION_OUTPUT, SPA_TYPE_Int, SPA_TYPE_INFO_DIRECTION_BASE "Output", NULL },
{ 0, 0, NULL, NULL }
};
#include <spa/utils/enum-types.h>
#include <spa/monitor/type-info.h>
#include <spa/node/type-info.h>
#include <spa/param/type-info.h>
#include <spa/control/type-info.h>
/* base for parameter object enumerations */
#define SPA_TYPE_INFO_Choice SPA_TYPE_INFO_ENUM_BASE "Choice"
#define SPA_TYPE_INFO_CHOICE_BASE SPA_TYPE_INFO_Choice ":"
static const struct spa_type_info spa_type_choice[] = {
{ SPA_CHOICE_None, SPA_TYPE_Int, SPA_TYPE_INFO_CHOICE_BASE "None", NULL },
{ SPA_CHOICE_Range, SPA_TYPE_Int, SPA_TYPE_INFO_CHOICE_BASE "Range", NULL },
{ SPA_CHOICE_Step, SPA_TYPE_Int, SPA_TYPE_INFO_CHOICE_BASE "Step", NULL },
{ SPA_CHOICE_Enum, SPA_TYPE_Int, SPA_TYPE_INFO_CHOICE_BASE "Enum", NULL },
{ SPA_CHOICE_Flags, SPA_TYPE_Int, SPA_TYPE_INFO_CHOICE_BASE "Flags", NULL },
{ 0, 0, NULL, NULL }
};
static const struct spa_type_info spa_types[] = {
/* Basic types */
{ SPA_TYPE_START, SPA_TYPE_START, SPA_TYPE_INFO_BASE, NULL },