From a66d2c87cc7cf9f3b3b560756922efb0d9918b00 Mon Sep 17 00:00:00 2001 From: Marius Vlad Date: Thu, 5 Sep 2019 16:46:31 +0300 Subject: [PATCH] libweston: Remove timeline-object and clean-up Removes timeline-object header and what is left of the older timeline part. Signed-off-by: Marius Vlad --- include/libweston/libweston.h | 5 --- include/libweston/meson.build | 1 - include/libweston/timeline-object.h | 47 ----------------------------- 3 files changed, 53 deletions(-) delete mode 100644 include/libweston/timeline-object.h diff --git a/include/libweston/libweston.h b/include/libweston/libweston.h index d0ef9865..1eab33af 100644 --- a/include/libweston/libweston.h +++ b/include/libweston/libweston.h @@ -43,7 +43,6 @@ extern "C" { #include #include -#include struct weston_geometry { int32_t x, y; @@ -320,8 +319,6 @@ struct weston_output { uint16_t *g, uint16_t *b); - struct weston_timeline_object timeline; - bool enabled; /**< is in the output_list, not pending list */ int scale; @@ -1465,8 +1462,6 @@ struct weston_surface { */ const char *role_name; - struct weston_timeline_object timeline; - bool is_mapped; bool is_opaque; diff --git a/include/libweston/meson.build b/include/libweston/meson.build index 2af2c0ef..2c2f7729 100644 --- a/include/libweston/meson.build +++ b/include/libweston/meson.build @@ -3,7 +3,6 @@ install_headers( 'libweston.h', 'matrix.h', 'plugin-registry.h', - 'timeline-object.h', 'windowed-output-api.h', 'weston-log.h', 'zalloc.h', diff --git a/include/libweston/timeline-object.h b/include/libweston/timeline-object.h deleted file mode 100644 index 6c9b2a8a..00000000 --- a/include/libweston/timeline-object.h +++ /dev/null @@ -1,47 +0,0 @@ -/* - * Copyright © 2014 Pekka Paalanen - * Copyright © 2014 Collabora, Ltd. - * - * 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 WESTON_TIMELINE_OBJECT_H -#define WESTON_TIMELINE_OBJECT_H - -/* - * This struct can be embedded in objects related to timeline output. - * It must be initialized to all-zero. Afterwards, the timeline code - * will handle it alone. No clean-up is necessary. - */ -struct weston_timeline_object { - /* - * Timeline series gets bumped every time a new log is opened. - * This triggers id allocation and object info emission. - * 0 is an invalid series value. - */ - unsigned series; - - /* Object id in the timeline JSON output. 0 is invalid. */ - unsigned id; -}; - -#endif /* WESTON_TIMELINE_OBJECT_H */