examples: remove some unused types

This commit is contained in:
Wim Taymans 2018-02-09 12:03:28 +01:00
parent c0f8f811e8
commit 60177646e9
5 changed files with 22 additions and 65 deletions

View file

@ -32,11 +32,6 @@
#include <pipewire/pipewire.h>
struct type {
uint32_t format;
uint32_t props;
struct spa_type_param param;
struct spa_type_meta meta;
struct spa_type_data data;
struct spa_type_media_type media_type;
struct spa_type_media_subtype media_subtype;
struct spa_type_format_video format_video;
@ -45,11 +40,6 @@ struct type {
static inline void init_type(struct type *type, struct spa_type_map *map)
{
type->format = spa_type_map_get_id(map, SPA_TYPE__Format);
type->props = spa_type_map_get_id(map, SPA_TYPE__Props);
spa_type_param_map(map, &type->param);
spa_type_meta_map(map, &type->meta);
spa_type_data_map(map, &type->data);
spa_type_media_type_map(map, &type->media_type);
spa_type_media_subtype_map(map, &type->media_subtype);
spa_type_format_video_map(map, &type->format_video);
@ -111,12 +101,12 @@ do_render(struct spa_loop *loop, bool async, uint32_t seq,
handle_events(data);
if (buf->datas[0].type == data->type.data.MemFd ||
buf->datas[0].type == data->type.data.DmaBuf) {
if (buf->datas[0].type == data->t->data.MemFd ||
buf->datas[0].type == data->t->data.DmaBuf) {
map = mmap(NULL, buf->datas[0].maxsize + buf->datas[0].mapoffset, PROT_READ,
MAP_PRIVATE, buf->datas[0].fd, 0);
sdata = SPA_MEMBER(map, buf->datas[0].mapoffset, uint8_t);
} else if (buf->datas[0].type == data->type.data.MemPtr) {
} else if (buf->datas[0].type == data->t->data.MemPtr) {
map = NULL;
sdata = buf->datas[0].data;
} else
@ -331,7 +321,7 @@ static void on_state_changed(void *_data, enum pw_remote_state old, enum pw_remo
SDL_GetRendererInfo(data->renderer, &info);
spa_pod_builder_push_object(&b,
data->type.param.idEnumFormat, data->type.format);
data->t->param.idEnumFormat, data->t->spa_format);
spa_pod_builder_id(&b, data->type.media_type.video);
spa_pod_builder_id(&b, data->type.media_subtype.raw);