[mutter] clutter/master-clock: Move out private timeline declarations
- From: Georges Basile Stavracas Neto <gbsneto src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mutter] clutter/master-clock: Move out private timeline declarations
- Date: Thu, 2 Jul 2020 20:50:37 +0000 (UTC)
commit 9676db4dbf684e42b92bfa1a1823260dec3f6e96
Author: Jonas Ã…dahl <jadahl gmail com>
Date: Wed Mar 25 17:54:18 2020 +0100
clutter/master-clock: Move out private timeline declarations
They are intended to be used by other objects than the master clock, so
don't keep the declaration there.
https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1285
clutter/clutter/clutter-master-clock-default.c | 1 +
clutter/clutter/clutter-master-clock.h | 6 -----
clutter/clutter/clutter-timeline-private.h | 33 ++++++++++++++++++++++++++
clutter/clutter/clutter-timeline.c | 1 +
clutter/clutter/clutter-transition-group.c | 1 +
clutter/clutter/meson.build | 1 +
6 files changed, 37 insertions(+), 6 deletions(-)
---
diff --git a/clutter/clutter/clutter-master-clock-default.c b/clutter/clutter/clutter-master-clock-default.c
index a34454a3a0..a6dd3fbc02 100644
--- a/clutter/clutter/clutter-master-clock-default.c
+++ b/clutter/clutter/clutter-master-clock-default.c
@@ -39,6 +39,7 @@
#include "clutter-private.h"
#include "clutter-stage-manager-private.h"
#include "clutter-stage-private.h"
+#include "clutter-timeline-private.h"
#ifdef CLUTTER_ENABLE_DEBUG
#define clutter_warn_if_over_budget(master_clock,start_time,section) G_STMT_START { \
diff --git a/clutter/clutter/clutter-master-clock.h b/clutter/clutter/clutter-master-clock.h
index 36e974f538..88ee6afea3 100644
--- a/clutter/clutter/clutter-master-clock.h
+++ b/clutter/clutter/clutter-master-clock.h
@@ -58,12 +58,6 @@ void _clutter_master_clock_ensure_next_iteration (Clutter
void _clutter_master_clock_set_paused (ClutterMasterClock *master_clock,
gboolean paused);
-void _clutter_timeline_advance (ClutterTimeline *timeline,
- gint64 tick_time);
-gint64 _clutter_timeline_get_delta (ClutterTimeline *timeline);
-void _clutter_timeline_do_tick (ClutterTimeline *timeline,
- gint64 tick_time);
-
G_END_DECLS
#endif /* __CLUTTER_MASTER_CLOCK_H__ */
diff --git a/clutter/clutter/clutter-timeline-private.h b/clutter/clutter/clutter-timeline-private.h
new file mode 100644
index 0000000000..38e712bfda
--- /dev/null
+++ b/clutter/clutter/clutter-timeline-private.h
@@ -0,0 +1,33 @@
+/*
+ * Clutter.
+ *
+ * An OpenGL based 'interactive canvas' library.
+ *
+ * Authored By: Emmanuele Bassi <ebassi linux intel com>
+ *
+ * Copyright (C) 2009 Intel Corporation.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef CLUTTER_TIMELINE_PRIVATE_H
+#define CLUTTER_TIMELINE_PRIVATE_H
+
+void _clutter_timeline_advance (ClutterTimeline *timeline,
+ int64_t tick_time);
+int64_t _clutter_timeline_get_delta (ClutterTimeline *timeline);
+void _clutter_timeline_do_tick (ClutterTimeline *timeline,
+ int64_t tick_time);
+
+#endif /* CLUTTER_TIMELINE_PRIVATE_H */
diff --git a/clutter/clutter/clutter-timeline.c b/clutter/clutter/clutter-timeline.c
index aff878c313..da9a0da4c8 100644
--- a/clutter/clutter/clutter-timeline.c
+++ b/clutter/clutter/clutter-timeline.c
@@ -104,6 +104,7 @@
#include "clutter-master-clock.h"
#include "clutter-private.h"
#include "clutter-scriptable.h"
+#include "clutter-timeline-private.h"
struct _ClutterTimelinePrivate
{
diff --git a/clutter/clutter/clutter-transition-group.c b/clutter/clutter/clutter-transition-group.c
index 59801af441..3d8c5a53b9 100644
--- a/clutter/clutter/clutter-transition-group.c
+++ b/clutter/clutter/clutter-transition-group.c
@@ -43,6 +43,7 @@
#include "clutter-debug.h"
#include "clutter-private.h"
+#include "clutter-timeline-private.h"
struct _ClutterTransitionGroupPrivate
{
diff --git a/clutter/clutter/meson.build b/clutter/clutter/meson.build
index 0a26709377..6ea1c1a405 100644
--- a/clutter/clutter/meson.build
+++ b/clutter/clutter/meson.build
@@ -213,6 +213,7 @@ clutter_private_headers = [
'clutter-stage-private.h',
'clutter-stage-view-private.h',
'clutter-stage-window.h',
+ 'clutter-timeline-private.h',
]
clutter_nonintrospected_sources = [
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]