mainnika/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libweston: Remove timeline-object and clean-up

Browse Source 
Removes timeline-object header and what is left of the older
timeline part.

Signed-off-by: Marius Vlad <marius.vlad@collabora.com>
This commit is contained in:
Marius Vlad
2019-09-05 16:46:31 +03:00
parent 5de9297df2
commit a66d2c87cc
3 changed files with 0 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/libweston/libweston.h
-5
View File
@@ -43,7 +43,6 @@ extern "C" {
#include <libweston/matrix.h> #include <libweston/matrix.h>
#include <libweston/zalloc.h> #include <libweston/zalloc.h>
#include <libweston/timeline-object.h>
struct weston_geometry { struct weston_geometry {
int32_t x, y; int32_t x, y;
@@ -320,8 +319,6 @@ struct weston_output {
uint16_t *g, uint16_t *g,
uint16_t *b); uint16_t *b);
struct weston_timeline_object timeline;
bool enabled; /**< is in the output_list, not pending list */ bool enabled; /**< is in the output_list, not pending list */
int scale; int scale;
@@ -1465,8 +1462,6 @@ struct weston_surface {
*/ */
const char *role_name; const char *role_name;
struct weston_timeline_object timeline;
bool is_mapped; bool is_mapped;
bool is_opaque; bool is_opaque;
include/libweston/meson.build
-1
View File
@@ -3,7 +3,6 @@ install_headers(
'libweston.h', 'libweston.h',
'matrix.h', 'matrix.h',
'plugin-registry.h', 'plugin-registry.h',
'timeline-object.h',
'windowed-output-api.h', 'windowed-output-api.h',
'weston-log.h', 'weston-log.h',
'zalloc.h', 'zalloc.h',
include/libweston/timeline-object.h
-47
View File
@@ -1,47 +0,0 @@
/*
* Copyright © 2014 Pekka Paalanen <pq@iki.fi>
* 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 */