mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-20 06:59:58 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

More type fixes

Browse source 
Param ids and IO ids are now simple enums.
Move some type info in one place, delete some type-info files
Fix type debug
Make audio layout an enum
Mark more enums as enums in types so they show us with their names in
the debug.
This commit is contained in:
Wim Taymans 2018-08-25 12:08:29 +02:00
parent 93a8747a44
commit d26aecfef2
82 changed files with 869 additions and 1118 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -70,6 +70,7 @@ struct spa_type_info {
#include <spa/monitor/type-info.h>
#include <spa/node/type-info.h>
#include <spa/param/type-info.h>
static const struct spa_type_info spa_types[] = {
{ SPA_ID_INVALID, "*invalid*", SPA_ID_INVALID, },
@ -97,6 +98,11 @@ static const struct spa_type_info spa_types[] = {
{ SPA_ID_Fd, SPA_TYPE_BASE "Fd", SPA_ID_Fd, },
{ SPA_ID_Prop, SPA_TYPE_POD_BASE "Prop", SPA_ID_Pod, },
{ SPA_ID_POINTER_BASE, SPA_TYPE__Pointer, SPA_ID_Pointer, },
{ SPA_ID_POINTER_Buffer, SPA_TYPE_POINTER_BASE "Buffer", SPA_ID_Pointer, },
{ SPA_ID_POINTER_Meta, SPA_TYPE_POINTER_BASE "Meta", SPA_ID_Pointer, },
{ SPA_ID_POINTER_Dict, SPA_TYPE_POINTER_BASE "Dict", SPA_ID_Pointer, },
{ SPA_ID_INTERFACE_BASE, SPA_TYPE__Interface, SPA_ID_Pointer, },
{ SPA_ID_INTERFACE_Handle, SPA_TYPE_INTERFACE_BASE "Handle", SPA_ID_INTERFACE_BASE, },
{ SPA_ID_INTERFACE_HandleFactory, SPA_TYPE_INTERFACE_BASE "HandleFactory", SPA_ID_INTERFACE_BASE, },
@ -117,6 +123,16 @@ static const struct spa_type_info spa_types[] = {
{ SPA_ID_COMMAND_BASE, SPA_TYPE__Command, SPA_ID_Object, },
{ SPA_ID_COMMAND_Node, SPA_TYPE_COMMAND_BASE "Node", SPA_ID_COMMAND_BASE, },
{ SPA_ID_OBJECT_BASE, SPA_TYPE__Object, SPA_ID_Object, },
{ SPA_ID_OBJECT_MonitorItem, SPA_TYPE__MonitorItem, SPA_ID_Object, spa_type_monitor_item },
{ SPA_ID_OBJECT_ParamList, SPA_TYPE_PARAM__List, SPA_ID_Object, spa_type_param_list, },
{ SPA_ID_OBJECT_PropInfo, SPA_TYPE__PropInfo, SPA_ID_Object, spa_type_prop_info, },
{ SPA_ID_OBJECT_Props, SPA_TYPE__Props, SPA_ID_Object, spa_type_props },
{ SPA_ID_OBJECT_Format, SPA_TYPE__Format, SPA_ID_Object, },
{ SPA_ID_OBJECT_ParamBuffers, SPA_TYPE_PARAM__Buffers, SPA_ID_Object, spa_type_param_buffers, },
{ SPA_ID_OBJECT_ParamMeta, SPA_TYPE_PARAM__Meta, SPA_ID_Object, spa_type_param_meta },
{ SPA_ID_OBJECT_ParamIO, SPA_TYPE_PARAM__IO, SPA_ID_Object, spa_type_param_io },
{ 0, NULL, }
};

40
spa/include/spa/utils/type.h
View file

@ -52,8 +52,14 @@ enum {
SPA_ID_Prop,
SPA_ID_Pod,
/* Pointers */
SPA_ID_POINTER_BASE = 0x10000,
SPA_ID_POINTER_Buffer,
SPA_ID_POINTER_Meta,
SPA_ID_POINTER_Dict,
/* Interfaces */
SPA_ID_INTERFACE_BASE = 0x10000,
SPA_ID_INTERFACE_BASE = 0x20000,
SPA_ID_INTERFACE_Handle,
SPA_ID_INTERFACE_HandleFactory,
SPA_ID_INTERFACE_Log,
@ -67,18 +73,17 @@ enum {
SPA_ID_INTERFACE_Node,
/* Events */
SPA_ID_EVENT_BASE = 0x20000,
SPA_ID_EVENT_BASE = 0x30000,
SPA_ID_EVENT_Monitor,
SPA_ID_EVENT_Node,
/* Commands */
SPA_ID_COMMAND_BASE = 0x30000,
SPA_ID_COMMAND_BASE = 0x40000,
SPA_ID_COMMAND_Node,
/* Objects */
SPA_ID_OBJECT_BASE = 0x40000,
SPA_ID_OBJECT_BASE = 0x50000,
SPA_ID_OBJECT_MonitorItem,
SPA_ID_OBJECT_ParamList,
SPA_ID_OBJECT_PropInfo,
SPA_ID_OBJECT_Props,
@ -87,31 +92,6 @@ enum {
SPA_ID_OBJECT_ParamMeta,
SPA_ID_OBJECT_ParamIO,
/* IO */
SPA_ID_IO_BASE = 0x40000,
SPA_ID_IO_Buffers,
SPA_ID_IO_ControlRange,
SPA_ID_IO_Clock,
SPA_ID_IO_Prop,
SPA_ID_IO_Latency,
/* Params */
SPA_ID_PARAM_BASE = 0x50000,
SPA_ID_PARAM_List, /**< available params */
SPA_ID_PARAM_PropInfo, /**< property information */
SPA_ID_PARAM_Props, /**< properties */
SPA_ID_PARAM_EnumFormat, /**< available formats */
SPA_ID_PARAM_Format, /**< configured format */
SPA_ID_PARAM_Buffers, /**< buffer configurations */
SPA_ID_PARAM_Meta, /**< allowed metadata for buffers */
SPA_ID_PARAM_IO, /**< configurable IO areas */
/* Pointers */
SPA_ID_POINTER_BASE = 0x60000,
SPA_ID_POINTER_Buffer,
SPA_ID_POINTER_Meta,
SPA_ID_POINTER_Dict,
/* vendor extensions */
SPA_ID_VENDOR_PipeWire = 0x01000000,