Rename timeline-object.h to libweston/timeline-object.h

This patch sets up the stage for similarly renaming compositor.h which will
justify this. That patch will be big, so moving timeline-object.h first makes
it easy to see the changes to the build and install directives.

This and all the following moves essentially break the API, so libweston major
is bumped.

Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.com>
This commit is contained in:
Pekka Paalanen
2019-03-28 16:35:56 +02:00
parent cb74afd482
commit a78cf77582
6 changed files with 14 additions and 6 deletions
+1 -1
View File
@@ -44,7 +44,7 @@ extern "C" {
#include "matrix.h"
#include "config-parser.h"
#include "zalloc.h"
#include "timeline-object.h"
#include <libweston/timeline-object.h>
struct weston_geometry {
int32_t x, y;
+3 -4
View File
@@ -59,7 +59,6 @@ srcs_libweston = [
install_headers(
'compositor.h',
'plugin-registry.h',
'timeline-object.h',
'windowed-output-api.h',
'../shared/config-parser.h',
'../shared/matrix.h',
@@ -78,7 +77,7 @@ endif
lib_weston = shared_library(
'weston-@0@'.format(libweston_major),
srcs_libweston,
include_directories: include_directories('..', '../shared'),
include_directories: [ include_directories('..', '../shared'), public_inc ],
link_args: [ '-Wl,-export-dynamic' ],
install: true,
version: '0.0.@0@'.format(libweston_revision),
@@ -88,7 +87,7 @@ lib_weston = shared_library(
dep_libweston = declare_dependency(
link_with: lib_weston,
include_directories: include_directories('.'),
include_directories: [ include_directories('.'), public_inc ],
dependencies: deps_libweston
)
@@ -97,7 +96,7 @@ dep_libweston = declare_dependency(
# https://github.com/mesonbuild/meson/pull/5167
# in hopefully Meson 0.51.
dep_libweston_h = declare_dependency(
include_directories: include_directories('.'),
include_directories: [ include_directories('.'), public_inc ],
dependencies: [
dep_pixman.partial_dependency(compile_args: true),
dep_xkbcommon.partial_dependency(compile_args: true),
-55
View File
@@ -1,55 +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;
/*
* If non-zero, forces a re-emission of object description.
* Should be set to non-zero, when changing long-lived
* object state that is not emitted on normal timeline
* events.
*/
unsigned force_refresh;
};
#endif /* WESTON_TIMELINE_OBJECT_H */