diff --git a/clutter/deprecated/clutter-animation.c b/clutter/deprecated/clutter-animation.c index 8880b04d1..cdf6af2ea 100644 --- a/clutter/deprecated/clutter-animation.c +++ b/clutter/deprecated/clutter-animation.c @@ -139,7 +139,9 @@ * * * - * #ClutterAnimation is available since Clutter 1.0 + * #ClutterAnimation is available since Clutter 1.0. + * + * #ClutterAnimation has been deprecated in Clutter 1.12. */ #ifdef HAVE_CONFIG_H @@ -500,6 +502,7 @@ clutter_animation_class_init (ClutterAnimationClass *klass) * The #GObject to which the animation applies. * * Since: 1.0 + * Deprecated: 1.12: Use #ClutterPropertyTransition instead */ obj_props[PROP_OBJECT] = g_param_spec_object ("object", @@ -516,6 +519,7 @@ clutter_animation_class_init (ClutterAnimationClass *klass) * default value is %CLUTTER_LINEAR. * * Since: 1.0 + * Deprecated: 1.12: Use #ClutterPropertyTransition instead */ obj_props[PROP_MODE] = g_param_spec_ulong ("mode", @@ -531,6 +535,7 @@ clutter_animation_class_init (ClutterAnimationClass *klass) * The duration of the animation, expressed in milliseconds. * * Since: 1.0 + * Deprecated: 1.12: Use #ClutterPropertyTransition instead */ obj_props[PROP_DURATION] = g_param_spec_uint ("duration", @@ -546,6 +551,7 @@ clutter_animation_class_init (ClutterAnimationClass *klass) * Whether the animation should loop. * * Since: 1.0 + * Deprecated: 1.12: Use #ClutterPropertyTransition instead */ obj_props[PROP_LOOP] = g_param_spec_boolean ("loop", @@ -560,6 +566,7 @@ clutter_animation_class_init (ClutterAnimationClass *klass) * The #ClutterTimeline used by the animation. * * Since: 1.0 + * Deprecated: 1.12: Use #ClutterPropertyTransition instead */ obj_props[PROP_TIMELINE] = g_param_spec_object ("timeline", @@ -597,6 +604,7 @@ clutter_animation_class_init (ClutterAnimationClass *klass) * started * * Since: 1.0 + * Deprecated: 1.12: Use #ClutterPropertyTransition instead */ animation_signals[STARTED] = g_signal_new (I_("started"), @@ -618,6 +626,7 @@ clutter_animation_class_init (ClutterAnimationClass *klass) * duration of the signal emission chain. * * Since: 1.0 + * Deprecated: 1.12: Use #ClutterPropertyTransition instead */ animation_signals[COMPLETED] = g_signal_new (I_("completed"), @@ -771,6 +780,7 @@ clutter_animation_validate_bind (ClutterAnimation *animation, * * Return value: (transfer none): The animation itself. * Since: 1.0 + * Deprecated: 1.12: Use #ClutterPropertyTransition instead */ ClutterAnimation * clutter_animation_bind_interval (ClutterAnimation *animation, @@ -812,6 +822,7 @@ clutter_animation_bind_interval (ClutterAnimation *animation, * Return value: (transfer none): The animation itself. * * Since: 1.0 + * Deprecated: 1.12: Use #ClutterPropertyTransition instead */ ClutterAnimation * clutter_animation_bind (ClutterAnimation *animation, @@ -881,6 +892,7 @@ clutter_animation_bind (ClutterAnimation *animation, * Removes @property_name from the list of animated properties. * * Since: 1.0 + * Deprecated: 1.12: Use #ClutterPropertyTransition instead */ void clutter_animation_unbind_property (ClutterAnimation *animation, @@ -915,6 +927,7 @@ clutter_animation_unbind_property (ClutterAnimation *animation, * #ClutterAnimation, %FALSE otherwise * * Since: 1.0 + * Deprecated: 1.12: Use #ClutterPropertyTransition instead */ gboolean clutter_animation_has_property (ClutterAnimation *animation, @@ -940,6 +953,7 @@ clutter_animation_has_property (ClutterAnimation *animation, * will take ownership of the passed #ClutterInterval. * * Since: 1.0 + * Deprecated: 1.12: Use #ClutterPropertyTransition instead */ void clutter_animation_update_interval (ClutterAnimation *animation, @@ -1017,6 +1031,7 @@ clutter_animation_update_interval (ClutterAnimation *animation, * Return value: (transfer none): The animation itself. * * Since: 1.0 + * Deprecated: 1.12: Use #ClutterPropertyTransition instead */ ClutterAnimation * clutter_animation_update (ClutterAnimation *animation, @@ -1072,6 +1087,7 @@ clutter_animation_update (ClutterAnimation *animation, * owned by the #ClutterAnimation and should not be unreferenced * * Since: 1.0 + * Deprecated: 1.12: Use #ClutterPropertyTransition instead */ ClutterInterval * clutter_animation_get_interval (ClutterAnimation *animation, @@ -1334,6 +1350,7 @@ out: * to release the associated resources * * Since: 1.0 + * Deprecated: 1.12: Use #ClutterPropertyTransition instead */ ClutterAnimation * clutter_animation_new (void) @@ -1350,6 +1367,7 @@ clutter_animation_new (void) * reference on @object. * * Since: 1.0 + * Deprecated: 1.12: Use #ClutterPropertyTransition instead */ void clutter_animation_set_object (ClutterAnimation *animation, @@ -1385,6 +1403,7 @@ clutter_animation_set_object (ClutterAnimation *animation, * Return value: (transfer none): a #GObject * * Since: 1.0 + * Deprecated: 1.12: Use #ClutterPropertyTransition instead */ GObject * clutter_animation_get_object (ClutterAnimation *animation) @@ -1406,6 +1425,7 @@ clutter_animation_get_object (ClutterAnimation *animation) * This function will also set #ClutterAnimation:alpha if needed. * * Since: 1.0 + * Deprecated: 1.12: Use #ClutterPropertyTransition instead */ void clutter_animation_set_mode (ClutterAnimation *animation, @@ -1450,6 +1470,7 @@ clutter_animation_set_mode (ClutterAnimation *animation, * Return value: the mode for the animation * * Since: 1.0 + * Deprecated: 1.12: Use #ClutterPropertyTransition instead */ gulong clutter_animation_get_mode (ClutterAnimation *animation) @@ -1477,6 +1498,7 @@ clutter_animation_get_mode (ClutterAnimation *animation) * #ClutterAnimation:timeline if needed. * * Since: 1.0 + * Deprecated: 1.12: Use #ClutterPropertyTransition instead */ void clutter_animation_set_duration (ClutterAnimation *animation, @@ -1511,6 +1533,7 @@ clutter_animation_set_duration (ClutterAnimation *animation, * #ClutterAnimation:timeline if needed. * * Since: 1.0 + * Deprecated: 1.12: Use #ClutterPropertyTransition instead */ void clutter_animation_set_loop (ClutterAnimation *animation, @@ -1539,6 +1562,7 @@ clutter_animation_set_loop (ClutterAnimation *animation, * Return value: %TRUE if the animation is looping * * Since: 1.0 + * Deprecated: 1.12: Use #ClutterPropertyTransition instead */ gboolean clutter_animation_get_loop (ClutterAnimation *animation) @@ -1561,6 +1585,7 @@ clutter_animation_get_loop (ClutterAnimation *animation) * Return value: the duration of the animation * * Since: 1.0 + * Deprecated: 1.12: Use #ClutterPropertyTransition instead */ guint clutter_animation_get_duration (ClutterAnimation *animation) @@ -1585,6 +1610,7 @@ clutter_animation_get_duration (ClutterAnimation *animation) * This function will take a reference on the passed @timeline. * * Since: 1.0 + * Deprecated: 1.12: Use #ClutterPropertyTransition instead */ void clutter_animation_set_timeline (ClutterAnimation *animation, @@ -1667,6 +1693,7 @@ clutter_animation_set_timeline (ClutterAnimation *animation, * Return value: (transfer none): the timeline used by the animation * * Since: 1.0 + * Deprecated: 1.12: Use #ClutterPropertyTransition instead */ ClutterTimeline * clutter_animation_get_timeline (ClutterAnimation *animation) @@ -1736,6 +1763,7 @@ clutter_animation_get_alpha (ClutterAnimation *animation) * #ClutterAnimation::completed signal * * Since: 1.0 + * Deprecated: 1.12: Use #ClutterPropertyTransition instead */ void clutter_animation_completed (ClutterAnimation *animation) @@ -2161,6 +2189,7 @@ clutter_actor_animate_with_alpha (ClutterActor *actor, * g_object_unref() * * Since: 1.0 + * Deprecated: 1.12: Use #ClutterPropertyTransition instead */ ClutterAnimation * clutter_actor_animate_with_timeline (ClutterActor *actor, @@ -2346,6 +2375,7 @@ clutter_actor_animate_with_timeline (ClutterActor *actor, * g_object_unref() * * Since: 1.0 + * Deprecated: 1.12: Use #ClutterPropertyTransition instead */ ClutterAnimation * clutter_actor_animate (ClutterActor *actor, @@ -2401,6 +2431,7 @@ clutter_actor_animate (ClutterActor *actor, * g_object_unref() * * Since: 1.0 + * Deprecated: 1.12: Use #ClutterPropertyTransition instead */ ClutterAnimation * clutter_actor_animatev (ClutterActor *actor, @@ -2458,6 +2489,7 @@ clutter_actor_animatev (ClutterActor *actor, * g_object_unref() * * Since: 1.0 + * Deprecated: 1.12: Use #ClutterPropertyTransition instead */ ClutterAnimation * clutter_actor_animate_with_timelinev (ClutterActor *actor, @@ -2556,6 +2588,7 @@ clutter_actor_animate_with_alphav (ClutterActor *actor, * Return value: (transfer none): a #ClutterAnimation, or %NULL * * Since: 1.0 + * Deprecated: 1.12: Use #ClutterPropertyTransition instead */ ClutterAnimation * clutter_actor_get_animation (ClutterActor *actor) @@ -2578,6 +2611,7 @@ clutter_actor_get_animation (ClutterActor *actor) * The #ClutterAnimation::completed signal will not be emitted. * * Since: 1.4 + * Deprecated: 1.12: Use #ClutterPropertyTransition instead */ void clutter_actor_detach_animation (ClutterActor *actor) diff --git a/clutter/deprecated/clutter-animator.c b/clutter/deprecated/clutter-animator.c index 94db2d696..4b512eb86 100644 --- a/clutter/deprecated/clutter-animator.c +++ b/clutter/deprecated/clutter-animator.c @@ -118,6 +118,8 @@ * * * #ClutterAnimator is available since Clutter 1.2 + * + * #ClutterAnimator has been deprecated in Clutter 1.12 */ #ifdef HAVE_CONFIG_H @@ -209,6 +211,8 @@ G_DEFINE_TYPE_WITH_CODE (ClutterAnimator, * Return value: a new #ClutterAnimator. * * Since: 1.2 + * + * Deprecated: 1.12: Use #ClutterKeyframeTransition instead */ ClutterAnimator * clutter_animator_new (void) @@ -855,6 +859,7 @@ animation_animator_started (ClutterTimeline *timeline, * returned and the #GValue is left untouched * * Since: 1.2 + * Deprecated: 1.12: Use #ClutterKeyframeTransition instead */ gboolean clutter_animator_compute_value (ClutterAnimator *animator, @@ -1035,6 +1040,7 @@ clutter_animator_compute_value (ClutterAnimator *animator, * Sets an external timeline that will be used for driving the animation * * Since: 1.2 + * Deprecated: 1.12: Use #ClutterKeyframeTransition instead */ void clutter_animator_set_timeline (ClutterAnimator *animator, @@ -1080,6 +1086,7 @@ clutter_animator_set_timeline (ClutterAnimator *animator, * Return value: (transfer none): the #ClutterTimeline that drives the animator * * Since: 1.2 + * Deprecated: 1.12: Use #ClutterKeyframeTransition instead */ ClutterTimeline * clutter_animator_get_timeline (ClutterAnimator *animator) @@ -1100,6 +1107,7 @@ clutter_animator_get_timeline (ClutterAnimator *animator) * and it should not be unreferenced * * Since: 1.2 + * Deprecated: 1.12: Use #ClutterKeyframeTransition instead */ ClutterTimeline * clutter_animator_start (ClutterAnimator *animator) @@ -1125,6 +1133,7 @@ clutter_animator_start (ClutterAnimator *animator) * as specified. * * Since: 1.2 + * Deprecated: 1.12: Use #ClutterKeyframeTransition instead */ void clutter_animator_set_duration (ClutterAnimator *animator, @@ -1144,6 +1153,7 @@ clutter_animator_set_duration (ClutterAnimator *animator, * Return value: the duration of the animation, in milliseconds * * Since: 1.2 + * Deprecated: 1.12: Use #ClutterKeyframeTransition instead */ guint clutter_animator_get_duration (ClutterAnimator *animator) @@ -1174,6 +1184,7 @@ clutter_animator_get_duration (ClutterAnimator *animator) * value will be replaced with the new values. * * Since: 1.2 + * Deprecated: 1.12: Use #ClutterKeyframeTransition instead */ void clutter_animator_set (ClutterAnimator *animator, @@ -1317,6 +1328,7 @@ clutter_animator_set_key_internal (ClutterAnimator *animator, * Return value: (transfer none): The animator instance * * Since: 1.2 + * Deprecated: 1.12: Use #ClutterKeyframeTransition instead */ ClutterAnimator * clutter_animator_set_key (ClutterAnimator *animator, @@ -1366,6 +1378,7 @@ clutter_animator_set_key (ClutterAnimator *animator, * using g_list_free() * * Since: 1.2 + * Deprecated: 1.12: Use #ClutterKeyframeTransition instead */ GList * clutter_animator_get_keys (ClutterAnimator *animator, @@ -1474,6 +1487,7 @@ again: * Removes all keys matching the conditions specificed in the arguments. * * Since: 1.2 + * Deprecated: 1.12: Use #ClutterKeyframeTransition instead */ void clutter_animator_remove_key (ClutterAnimator *animator, @@ -1780,6 +1794,7 @@ clutter_animator_class_init (ClutterAnimatorClass *klass) * to drive the animation * * Since: 1.2 + * Deprecated: 1.12: Use #ClutterKeyframeTransition instead */ obj_props[PROP_DURATION] = g_param_spec_uint ("duration", @@ -1796,6 +1811,7 @@ clutter_animator_class_init (ClutterAnimatorClass *klass) * animation * * Since: 1.2 + * Deprecated: 1.12: Use #ClutterKeyframeTransition instead */ obj_props[PROP_TIMELINE] = g_param_spec_object ("timeline", @@ -1841,6 +1857,7 @@ clutter_animator_init (ClutterAnimator *animator) * Return value: %TRUE if the property is eased in * * Since: 1.2 + * Deprecated: 1.12: Use #ClutterKeyframeTransition instead */ gboolean clutter_animator_property_get_ease_in (ClutterAnimator *animator, @@ -1878,6 +1895,7 @@ clutter_animator_property_get_ease_in (ClutterAnimator *animator, * Sets whether a property value is to be eased into the animation. * * Since: 1.2 + * Deprecated: 1.12: Use #ClutterKeyframeTransition instead */ void clutter_animator_property_set_ease_in (ClutterAnimator *animator, @@ -1920,6 +1938,7 @@ clutter_animator_property_set_ease_in (ClutterAnimator *animator, * * Returns: a ClutterInterpolation value. * Since: 1.2 + * Deprecated: 1.12: Use #ClutterKeyframeTransition instead */ ClutterInterpolation clutter_animator_property_get_interpolation (ClutterAnimator *animator, @@ -1963,6 +1982,7 @@ clutter_animator_property_get_interpolation (ClutterAnimator *animator, * the values. * * Since: 1.2 + * Deprecated: 1.12: Use #ClutterKeyframeTransition instead */ void clutter_animator_property_set_interpolation (ClutterAnimator *animator, @@ -2001,6 +2021,7 @@ G_DEFINE_BOXED_TYPE (ClutterAnimatorKey, clutter_animator_key, * Return value: (transfer none): the object an animator_key exist for. * * Since: 1.2 + * Deprecated: 1.12: Use #ClutterKeyframeTransition instead */ GObject * clutter_animator_key_get_object (const ClutterAnimatorKey *key) @@ -2019,6 +2040,7 @@ clutter_animator_key_get_object (const ClutterAnimatorKey *key) * Return value: the name of the property an animator_key exist for. * * Since: 1.2 + * Deprecated: 1.12: Use #ClutterKeyframeTransition instead */ const gchar * clutter_animator_key_get_property_name (const ClutterAnimatorKey *key) @@ -2040,6 +2062,7 @@ clutter_animator_key_get_property_name (const ClutterAnimatorKey *key) * Return value: the #GType of the property * * Since: 1.2 + * Deprecated: 1.12: Use #ClutterKeyframeTransition instead */ GType clutter_animator_key_get_property_type (const ClutterAnimatorKey *key) @@ -2061,6 +2084,7 @@ clutter_animator_key_get_property_type (const ClutterAnimatorKey *key) * Return value: the mode of a #ClutterAnimatorKey * * Since: 1.2 + * Deprecated: 1.12: Use #ClutterKeyframeTransition instead */ gulong clutter_animator_key_get_mode (const ClutterAnimatorKey *key) @@ -2079,6 +2103,7 @@ clutter_animator_key_get_mode (const ClutterAnimatorKey *key) * Return value: the progress defined for a #ClutterAnimator key. * * Since: 1.2 + * Deprecated: 1.12: Use #ClutterKeyframeTransition instead */ gdouble clutter_animator_key_get_progress (const ClutterAnimatorKey *key) @@ -2105,6 +2130,7 @@ clutter_animator_key_get_progress (const ClutterAnimatorKey *key) * %FALSE otherwise * * Since: 1.2 + * Deprecated: 1.12: Use #ClutterKeyframeTransition instead */ gboolean clutter_animator_key_get_value (const ClutterAnimatorKey *key, diff --git a/clutter/deprecated/clutter-animator.h b/clutter/deprecated/clutter-animator.h index 019817dee..54be75b66 100644 --- a/clutter/deprecated/clutter-animator.h +++ b/clutter/deprecated/clutter-animator.h @@ -64,6 +64,8 @@ typedef struct _ClutterAnimatorKey ClutterAnimatorKey; * should be accessed using the provided API * * Since: 1.2 + * + * Deprecated: 1.12 */ struct _ClutterAnimator { @@ -79,6 +81,8 @@ struct _ClutterAnimator * The #ClutterAnimatorClass structure contains only private data * * Since: 1.2 + * + * Deprecated: 1.12 */ struct _ClutterAnimatorClass { @@ -89,68 +93,91 @@ struct _ClutterAnimatorClass gpointer _padding_dummy[16]; }; +CLUTTER_DEPRECATED_IN_1_12 GType clutter_animator_get_type (void) G_GNUC_CONST; +CLUTTER_DEPRECATED_IN_1_12 ClutterAnimator * clutter_animator_new (void); +CLUTTER_DEPRECATED_IN_1_12 ClutterAnimator * clutter_animator_set_key (ClutterAnimator *animator, GObject *object, const gchar *property_name, guint mode, gdouble progress, const GValue *value); +CLUTTER_DEPRECATED_IN_1_12 void clutter_animator_set (ClutterAnimator *animator, gpointer first_object, const gchar *first_property_name, guint first_mode, gdouble first_progress, ...) G_GNUC_NULL_TERMINATED; +CLUTTER_DEPRECATED_IN_1_12 GList * clutter_animator_get_keys (ClutterAnimator *animator, GObject *object, const gchar *property_name, gdouble progress); +CLUTTER_DEPRECATED_IN_1_12 void clutter_animator_remove_key (ClutterAnimator *animator, GObject *object, const gchar *property_name, gdouble progress); +CLUTTER_DEPRECATED_IN_1_12 ClutterTimeline * clutter_animator_start (ClutterAnimator *animator); +CLUTTER_DEPRECATED_IN_1_12 gboolean clutter_animator_compute_value (ClutterAnimator *animator, GObject *object, const gchar *property_name, gdouble progress, GValue *value); +CLUTTER_DEPRECATED_IN_1_12 ClutterTimeline * clutter_animator_get_timeline (ClutterAnimator *animator); +CLUTTER_DEPRECATED_IN_1_12 void clutter_animator_set_timeline (ClutterAnimator *animator, ClutterTimeline *timeline); +CLUTTER_DEPRECATED_IN_1_12 guint clutter_animator_get_duration (ClutterAnimator *animator); +CLUTTER_DEPRECATED_IN_1_12 void clutter_animator_set_duration (ClutterAnimator *animator, guint duration); +CLUTTER_DEPRECATED_IN_1_12 gboolean clutter_animator_property_get_ease_in (ClutterAnimator *animator, GObject *object, const gchar *property_name); +CLUTTER_DEPRECATED_IN_1_12 void clutter_animator_property_set_ease_in (ClutterAnimator *animator, GObject *object, const gchar *property_name, gboolean ease_in); +CLUTTER_DEPRECATED_IN_1_12 ClutterInterpolation clutter_animator_property_get_interpolation (ClutterAnimator *animator, GObject *object, const gchar *property_name); +CLUTTER_DEPRECATED_IN_1_12 void clutter_animator_property_set_interpolation (ClutterAnimator *animator, GObject *object, const gchar *property_name, ClutterInterpolation interpolation); +CLUTTER_DEPRECATED_IN_1_12 GType clutter_animator_key_get_type (void) G_GNUC_CONST; +CLUTTER_DEPRECATED_IN_1_12 GObject * clutter_animator_key_get_object (const ClutterAnimatorKey *key); +CLUTTER_DEPRECATED_IN_1_12 const gchar * clutter_animator_key_get_property_name (const ClutterAnimatorKey *key); +CLUTTER_DEPRECATED_IN_1_12 GType clutter_animator_key_get_property_type (const ClutterAnimatorKey *key); +CLUTTER_DEPRECATED_IN_1_12 gulong clutter_animator_key_get_mode (const ClutterAnimatorKey *key); +CLUTTER_DEPRECATED_IN_1_12 gdouble clutter_animator_key_get_progress (const ClutterAnimatorKey *key); +CLUTTER_DEPRECATED_IN_1_12 gboolean clutter_animator_key_get_value (const ClutterAnimatorKey *key, GValue *value); diff --git a/clutter/deprecated/clutter-state.c b/clutter/deprecated/clutter-state.c index b8c60877b..46535c500 100644 --- a/clutter/deprecated/clutter-state.c +++ b/clutter/deprecated/clutter-state.c @@ -173,6 +173,8 @@ * * * #ClutterState is available since Clutter 1.4. + * + * #ClutterState has been deprecated in Clutter 1.12. */ #ifdef HAVE_CONFIG_H @@ -298,6 +300,10 @@ G_DEFINE_TYPE_WITH_CODE (ClutterState, clutter_state, G_TYPE_OBJECT, * Creates a new #ClutterState * * Return value: the newly create #ClutterState instance + * + * Since: 1.4 + * Deprecated: 1.12: Use #ClutterKeyframeTransition and + * #ClutterTransitionGroup instead */ ClutterState * clutter_state_new (void) @@ -806,6 +812,8 @@ clutter_state_change (ClutterState *state, * and it should not be unreferenced * * Since: 1.4 + * Deprecated: 1.12: Use #ClutterKeyframeTransition and + * #ClutterTransitionGroup instead */ ClutterTimeline * clutter_state_set_state (ClutterState *state, @@ -828,6 +836,8 @@ clutter_state_set_state (ClutterState *state, * and it should not be unreferenced * * Since: 1.4 + * Deprecated: 1.12: Use #ClutterKeyframeTransition and + * #ClutterTransitionGroup instead */ ClutterTimeline * clutter_state_warp_to_state (ClutterState *state, @@ -956,6 +966,8 @@ get_property_from_object (GObject *gobject, * and 20% of the duration after animating. * * Since: 1.4 + * Deprecated: 1.12: Use #ClutterKeyframeTransition and + * #ClutterTransitionGroup instead */ void clutter_state_set (ClutterState *state, @@ -1191,6 +1203,8 @@ clutter_state_fetch_state (ClutterState *state, * chaining of multiple calls * * Since: 1.4 + * Deprecated: 1.12: Use #ClutterKeyframeTransition and + * #ClutterTransitionGroup instead */ ClutterState * clutter_state_set_key (ClutterState *state, @@ -1250,6 +1264,8 @@ clutter_state_set_key (ClutterState *state, * done using it * * Since: 1.4 + * Deprecated: 1.12: Use #ClutterKeyframeTransition and + * #ClutterTransitionGroup instead */ GList * clutter_state_get_states (ClutterState *state) @@ -1280,6 +1296,8 @@ clutter_state_get_states (ClutterState *state) * by the returned list when done using it * * Since: 1.4 + * Deprecated: 1.12: Use #ClutterKeyframeTransition and + * #ClutterTransitionGroup instead */ GList * clutter_state_get_keys (ClutterState *state, @@ -1352,6 +1370,8 @@ clutter_state_get_keys (ClutterState *state, * Removes all keys matching the search criteria passed in arguments. * * Since: 1.4 + * Deprecated: 1.12: Use #ClutterKeyframeTransition and + * #ClutterTransitionGroup instead */ void clutter_state_remove_key (ClutterState *state, @@ -1379,6 +1399,8 @@ clutter_state_remove_key (ClutterState *state, * by the #ClutterState and it should not be unreferenced directly * * Since: 1.4 + * Deprecated: 1.12: Use #ClutterKeyframeTransition and + * #ClutterTransitionGroup instead */ ClutterTimeline * clutter_state_get_timeline (ClutterState *state) @@ -1452,6 +1474,8 @@ clutter_state_class_init (ClutterStateClass *klass) * clutter_state_warp_to_state(). * * Since: 1.4 + * Deprecated: 1.12: Use #ClutterKeyframeTransition and + * #ClutterTransitionGroup instead */ state_signals[COMPLETED] = g_signal_new (I_("completed"), @@ -1469,6 +1493,10 @@ clutter_state_class_init (ClutterStateClass *klass) * state machine to transition to the new state, use * clutter_state_warp_to_state() to change state without * a transition. + * + * Since: 1.4 + * Deprecated: 1.12: Use #ClutterKeyframeTransition and + * #ClutterTransitionGroup instead */ pspec = g_param_spec_string ("state", P_("State"), @@ -1483,6 +1511,10 @@ clutter_state_class_init (ClutterStateClass *klass) * * Default duration used if an duration has not been specified for a specific * source/target state pair. The values is in milliseconds. + * + * Since: 1.4 + * Deprecated: 1.12: Use #ClutterKeyframeTransition and + * #ClutterTransitionGroup instead */ pspec = g_param_spec_uint ("duration", P_("Duration"), @@ -1533,6 +1565,8 @@ clutter_state_init (ClutterState *self) * Return value: (transfer none): a #ClutterAnimator instance, or %NULL * * Since: 1.4 + * Deprecated: 1.12: Use #ClutterKeyframeTransition and + * #ClutterTransitionGroup instead */ ClutterAnimator * clutter_state_get_animator (ClutterState *state, @@ -1586,6 +1620,8 @@ clutter_state_get_animator (ClutterState *state, * #ClutterState will take a reference on the passed @animator, if any * * Since: 1.4 + * Deprecated: 1.12: Use #ClutterKeyframeTransition and + * #ClutterTransitionGroup instead */ void clutter_state_set_animator (ClutterState *state, @@ -1664,6 +1700,8 @@ G_DEFINE_BOXED_TYPE (ClutterStateKey, clutter_state_key, * Return value: the pre delay used before starting the transition. * * Since: 1.4 + * Deprecated: 1.12: Use #ClutterKeyframeTransition and + * #ClutterTransitionGroup instead */ gdouble clutter_state_key_get_pre_delay (const ClutterStateKey *state_key) @@ -1683,6 +1721,8 @@ clutter_state_key_get_pre_delay (const ClutterStateKey *state_key) * Return value: the post delay, used after doing the transition. * * Since: 1.4 + * Deprecated: 1.12: Use #ClutterKeyframeTransition and + * #ClutterTransitionGroup instead */ gdouble clutter_state_key_get_post_delay (const ClutterStateKey *state_key) @@ -1701,6 +1741,8 @@ clutter_state_key_get_post_delay (const ClutterStateKey *state_key) * Return value: the mode of a #ClutterStateKey * * Since: 1.4 + * Deprecated: 1.12: Use #ClutterKeyframeTransition and + * #ClutterTransitionGroup instead */ gulong clutter_state_key_get_mode (const ClutterStateKey *state_key) @@ -1727,6 +1769,8 @@ clutter_state_key_get_mode (const ClutterStateKey *state_key) * and %FALSE otherwise * * Since: 1.4 + * Deprecated: 1.12: Use #ClutterKeyframeTransition and + * #ClutterTransitionGroup instead */ gboolean clutter_state_key_get_value (const ClutterStateKey *state_key, @@ -1777,6 +1821,8 @@ clutter_state_key_get_value (const ClutterStateKey *state_key, * Return value: (transfer none): the object this state key applies to. * * Since: 1.4 + * Deprecated: 1.12: Use #ClutterKeyframeTransition and + * #ClutterTransitionGroup instead */ GObject * clutter_state_key_get_object (const ClutterStateKey *state_key) @@ -1796,6 +1842,8 @@ clutter_state_key_get_object (const ClutterStateKey *state_key) * by the #ClutterStateKey and should never be modified or freed * * Since: 1.4 + * Deprecated: 1.12: Use #ClutterKeyframeTransition and + * #ClutterTransitionGroup instead */ const gchar * clutter_state_key_get_property_name (const ClutterStateKey *state_key) @@ -1817,6 +1865,8 @@ clutter_state_key_get_property_name (const ClutterStateKey *state_key) * by the #ClutterStateKey and should never be modified or freed * * Since: 1.4 + * Deprecated: 1.12: Use #ClutterKeyframeTransition and + * #ClutterTransitionGroup instead */ const gchar * clutter_state_key_get_source_state_name (const ClutterStateKey *state_key) @@ -1841,6 +1891,8 @@ clutter_state_key_get_source_state_name (const ClutterStateKey *state_key) * the key is generic * * Since: 1.4 + * Deprecated: 1.12: Use #ClutterKeyframeTransition and + * #ClutterTransitionGroup instead */ const gchar * clutter_state_key_get_target_state_name (const ClutterStateKey *state_key) @@ -1862,6 +1914,8 @@ clutter_state_key_get_target_state_name (const ClutterStateKey *state_key) * Return value: the #GType of the property * * Since: 1.4 + * Deprecated: 1.12: Use #ClutterKeyframeTransition and + * #ClutterTransitionGroup instead */ GType clutter_state_key_get_property_type (const ClutterStateKey *key) @@ -1890,6 +1944,8 @@ clutter_state_key_get_property_type (const ClutterStateKey *key) * to the specified transition. * * Since: 1.4 + * Deprecated: 1.12: Use #ClutterKeyframeTransition and + * #ClutterTransitionGroup instead */ void clutter_state_set_duration (ClutterState *state, @@ -1946,6 +2002,8 @@ clutter_state_set_duration (ClutterState *state, * Return value: the duration, in milliseconds * * Since: 1.4 + * Deprecated: 1.12: Use #ClutterKeyframeTransition and + * #ClutterTransitionGroup instead */ guint clutter_state_get_duration (ClutterState *state, @@ -2005,6 +2063,8 @@ clutter_state_get_duration (ClutterState *state, * is owned by the #ClutterState and should not be modified or freed * * Since: 1.4 + * Deprecated: 1.12: Use #ClutterKeyframeTransition and + * #ClutterTransitionGroup instead */ const gchar * clutter_state_get_state (ClutterState *state) diff --git a/clutter/deprecated/clutter-state.h b/clutter/deprecated/clutter-state.h index 2bbc7392b..c446e7784 100644 --- a/clutter/deprecated/clutter-state.h +++ b/clutter/deprecated/clutter-state.h @@ -72,6 +72,8 @@ struct _ClutterState * only private data * * Since: 1.4 + * + * Deprecated: 1.12 */ struct _ClutterStateClass { @@ -86,14 +88,20 @@ struct _ClutterStateClass gpointer _padding_dummy[8]; }; +CLUTTER_DEPRECATED_IN_1_12 GType clutter_state_get_type (void) G_GNUC_CONST; + +CLUTTER_DEPRECATED_IN_1_12 ClutterState *clutter_state_new (void); +CLUTTER_DEPRECATED_IN_1_12 ClutterTimeline * clutter_state_set_state (ClutterState *state, const gchar *target_state_name); +CLUTTER_DEPRECATED_IN_1_12 ClutterTimeline * clutter_state_warp_to_state (ClutterState *state, const gchar *target_state_name); +CLUTTER_DEPRECATED_IN_1_12 ClutterState * clutter_state_set_key (ClutterState *state, const gchar *source_state_name, const gchar *target_state_name, @@ -103,13 +111,16 @@ ClutterState * clutter_state_set_key (ClutterState *state, const GValue *value, gdouble pre_delay, gdouble post_delay); +CLUTTER_DEPRECATED_IN_1_12 void clutter_state_set_duration (ClutterState *state, const gchar *source_state_name, const gchar *target_state_name, guint duration); +CLUTTER_DEPRECATED_IN_1_12 guint clutter_state_get_duration (ClutterState *state, const gchar *source_state_name, const gchar *target_state_name); +CLUTTER_DEPRECATED_IN_1_12 void clutter_state_set (ClutterState *state, const gchar *source_state_name, const gchar *target_state_name, @@ -117,41 +128,58 @@ void clutter_state_set (ClutterState *state, const gchar *first_property_name, gulong first_mode, ...) G_GNUC_NULL_TERMINATED; +CLUTTER_DEPRECATED_IN_1_12 GList * clutter_state_get_states (ClutterState *state); +CLUTTER_DEPRECATED_IN_1_12 GList * clutter_state_get_keys (ClutterState *state, const gchar *source_state_name, const gchar *target_state_name, GObject *object, const gchar *property_name); +CLUTTER_DEPRECATED_IN_1_12 void clutter_state_remove_key (ClutterState *state, const gchar *source_state_name, const gchar *target_state_name, GObject *object, const gchar *property_name); +CLUTTER_DEPRECATED_IN_1_12 ClutterTimeline * clutter_state_get_timeline (ClutterState *state); +CLUTTER_DEPRECATED_IN_1_12 void clutter_state_set_animator (ClutterState *state, const gchar *source_state_name, const gchar *target_state_name, ClutterAnimator *animator); +CLUTTER_DEPRECATED_IN_1_12 ClutterAnimator * clutter_state_get_animator (ClutterState *state, const gchar *source_state_name, const gchar *target_state_name); +CLUTTER_DEPRECATED_IN_1_12 const gchar * clutter_state_get_state (ClutterState *state); /* * ClutterStateKey */ +CLUTTER_DEPRECATED_IN_1_12 GType clutter_state_key_get_type (void) G_GNUC_CONST; +CLUTTER_DEPRECATED_IN_1_12 gdouble clutter_state_key_get_pre_delay (const ClutterStateKey *state_key); +CLUTTER_DEPRECATED_IN_1_12 gdouble clutter_state_key_get_post_delay (const ClutterStateKey *state_key); +CLUTTER_DEPRECATED_IN_1_12 gulong clutter_state_key_get_mode (const ClutterStateKey *state_key); +CLUTTER_DEPRECATED_IN_1_12 gboolean clutter_state_key_get_value (const ClutterStateKey *state_key, GValue *value); +CLUTTER_DEPRECATED_IN_1_12 GType clutter_state_key_get_property_type (const ClutterStateKey *key); +CLUTTER_DEPRECATED_IN_1_12 GObject * clutter_state_key_get_object (const ClutterStateKey *state_key); +CLUTTER_DEPRECATED_IN_1_12 const gchar * clutter_state_key_get_property_name (const ClutterStateKey *state_key); +CLUTTER_DEPRECATED_IN_1_12 const gchar * clutter_state_key_get_source_state_name (const ClutterStateKey *state_key); +CLUTTER_DEPRECATED_IN_1_12 const gchar * clutter_state_key_get_target_state_name (const ClutterStateKey *state_key); G_END_DECLS