From e677ebc3e83132da67e8cbdbc3ac9fab87c1cea8 Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Fri, 8 Jul 2011 12:01:08 +0100 Subject: [PATCH] Deprecate ClutterScore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The class is of dubious utility, now that we have a complex animation API in ClutterAnimator and ClutterState, as opposed to a simple one in ClutterBehaviour. The Score API also suffers from some naïve design issues that made it far less useful than intended. --- clutter/clutter-score.c | 3 +++ clutter/clutter-score.h | 4 ++++ tests/conform/test-score.c | 2 ++ 3 files changed, 9 insertions(+) diff --git a/clutter/clutter-score.c b/clutter/clutter-score.c index 320f9f9d3..b3153b053 100644 --- a/clutter/clutter-score.c +++ b/clutter/clutter-score.c @@ -74,6 +74,9 @@ * The state can be queried using clutter_score_is_playing(). * * #ClutterScore is available since Clutter 0.6 + * + * Deprecated: 1.8: Use #ClutterAnimator or #ClutterState to create + * complex animations involving multiple timelines. */ #ifdef HAVE_CONFIG_H diff --git a/clutter/clutter-score.h b/clutter/clutter-score.h index 0d1fd294e..790e711f4 100644 --- a/clutter/clutter-score.h +++ b/clutter/clutter-score.h @@ -32,6 +32,8 @@ G_BEGIN_DECLS +#if !defined(CLUTTER_DISABLE_DEPRECATED) || defined(CLUTTER_COMPILATION) + #define CLUTTER_TYPE_SCORE (clutter_score_get_type ()) #define CLUTTER_SCORE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), CLUTTER_TYPE_SCORE, ClutterScore)) @@ -124,6 +126,8 @@ void clutter_score_pause (ClutterScore *score); void clutter_score_rewind (ClutterScore *score); gboolean clutter_score_is_playing (ClutterScore *score); +#endif /* CLUTTER_DISABLE_DEPRECATED */ + G_END_DECLS #endif /* __CLUTTER_SCORE_H__ */ diff --git a/tests/conform/test-score.c b/tests/conform/test-score.c index 65384f10c..8756942c3 100644 --- a/tests/conform/test-score.c +++ b/tests/conform/test-score.c @@ -1,3 +1,5 @@ +#undef CLUTTER_DISABLE_DEPRECATED + #include #include #include