isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2025-02-17 05:44:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add deprecated header for ClutterAnimation

Browse Source
This commit is contained in:
Emmanuele Bassi 2012-02-27 15:29:50 +00:00
parent 4ae36f1e5f
commit 3c12b3575d
8 changed files with 91 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
clutter/Makefile.am
View File

@ -233,6 +233,7 @@ source_c_priv = \
deprecated_h = \ deprecated_h = \
$(srcdir)/deprecated/clutter-actor.h \ $(srcdir)/deprecated/clutter-actor.h \
$(srcdir)/deprecated/clutter-animatable.h \ $(srcdir)/deprecated/clutter-animatable.h \
$(srcdir)/deprecated/clutter-animation.h \
$(srcdir)/deprecated/clutter-backend.h \ $(srcdir)/deprecated/clutter-backend.h \
$(srcdir)/deprecated/clutter-behaviour.h \ $(srcdir)/deprecated/clutter-behaviour.h \
$(srcdir)/deprecated/clutter-behaviour-depth.h \ $(srcdir)/deprecated/clutter-behaviour-depth.h \

3
clutter/clutter-actor.c
View File

@ -338,9 +338,10 @@
#include "clutter-effect-private.h" #include "clutter-effect-private.h"
#include "clutter-enum-types.h" #include "clutter-enum-types.h"
#include "clutter-fixed-layout.h" #include "clutter-fixed-layout.h"
#include "clutter-flatten-effect.h"
#include "clutter-interval.h"
#include "clutter-main.h" #include "clutter-main.h"
#include "clutter-marshal.h" #include "clutter-marshal.h"
#include "clutter-flatten-effect.h"
#include "clutter-paint-volume-private.h" #include "clutter-paint-volume-private.h"
#include "clutter-private.h" #include "clutter-private.h"
#include "clutter-profile.h" #include "clutter-profile.h"

1
clutter/clutter-animatable.c
View File

@ -50,6 +50,7 @@
#endif #endif
#include "clutter-animatable.h" #include "clutter-animatable.h"
#include "clutter-interval.h"
#include "clutter-debug.h" #include "clutter-debug.h"
#include "clutter-private.h" #include "clutter-private.h"

74
clutter/clutter-animation.h
View File

@ -29,10 +29,6 @@
#ifndef __CLUTTER_ANIMATION_H__ #ifndef __CLUTTER_ANIMATION_H__
#define __CLUTTER_ANIMATION_H__ #define __CLUTTER_ANIMATION_H__
#include <clutter/clutter-actor.h>
#include <clutter/clutter-alpha.h>
#include <clutter/clutter-interval.h>
#include <clutter/clutter-timeline.h>
#include <clutter/clutter-types.h> #include <clutter/clutter-types.h>
G_BEGIN_DECLS G_BEGIN_DECLS
@ -135,51 +131,35 @@ ClutterInterval *clutter_animation_get_interval (ClutterAnimation *an
const gchar *property_name); const gchar *property_name);
void clutter_animation_completed (ClutterAnimation *animation); void clutter_animation_completed (ClutterAnimation *animation);
CLUTTER_DEPRECATED_IN_1_10_FOR(clutter_animation_set_timeline) /*
void clutter_animation_set_alpha (ClutterAnimation *animation, * ClutterActor API
ClutterAlpha *alpha); */
CLUTTER_DEPRECATED_IN_1_10_FOR(clutter_animation_get_timeline) ClutterAnimation * clutter_actor_animate (ClutterActor *actor,
ClutterAlpha * clutter_animation_get_alpha (ClutterAnimation *animation); gulong mode,
guint duration,
const gchar *first_property_name,
...) G_GNUC_NULL_TERMINATED;
ClutterAnimation * clutter_actor_animate_with_timeline (ClutterActor *actor,
gulong mode,
ClutterTimeline *timeline,
const gchar *first_property_name,
...) G_GNUC_NULL_TERMINATED;
ClutterAnimation * clutter_actor_animatev (ClutterActor *actor,
gulong mode,
guint duration,
gint n_properties,
const gchar * const properties[],
const GValue *values);
ClutterAnimation * clutter_actor_animate_with_timelinev (ClutterActor *actor,
gulong mode,
ClutterTimeline *timeline,
gint n_properties,
const gchar * const properties[],
const GValue *values);
ClutterAnimation * clutter_actor_get_animation (ClutterActor *actor);
void clutter_actor_detach_animation (ClutterActor *actor);
ClutterAnimation * clutter_actor_animate (ClutterActor *actor,
gulong mode,
guint duration,
const gchar *first_property_name,
...) G_GNUC_NULL_TERMINATED;
ClutterAnimation * clutter_actor_animate_with_timeline (ClutterActor *actor,
gulong mode,
ClutterTimeline *timeline,
const gchar *first_property_name,
...) G_GNUC_NULL_TERMINATED;
ClutterAnimation * clutter_actor_animatev (ClutterActor *actor,
gulong mode,
guint duration,
gint n_properties,
const gchar * const properties[],
const GValue *values);
ClutterAnimation * clutter_actor_animate_with_timelinev (ClutterActor *actor,
gulong mode,
ClutterTimeline *timeline,
gint n_properties,
const gchar * const properties[],
const GValue *values);
ClutterAnimation * clutter_actor_get_animation (ClutterActor *actor);
void clutter_actor_detach_animation (ClutterActor *actor);
CLUTTER_DEPRECATED_IN_1_10_FOR(clutter_actor_animate_with_timeline)
ClutterAnimation * clutter_actor_animate_with_alpha (ClutterActor *actor,
ClutterAlpha *alpha,
const gchar *first_property_name,
...) G_GNUC_NULL_TERMINATED;
CLUTTER_DEPRECATED_IN_1_10_FOR(clutter_actor_animate_with_timelinev)
ClutterAnimation * clutter_actor_animate_with_alphav (ClutterActor *actor,
ClutterAlpha *alpha,
gint n_properties,
const gchar * const properties[],
const GValue *values);
G_END_DECLS G_END_DECLS
#endif /* __CLUTTER_ANIMATION_H__ */ #endif /* __CLUTTER_ANIMATION_H__ */

1
clutter/clutter-deprecated.h
View File

@ -5,6 +5,7 @@
#include "deprecated/clutter-actor.h" #include "deprecated/clutter-actor.h"
#include "deprecated/clutter-animatable.h" #include "deprecated/clutter-animatable.h"
#include "deprecated/clutter-animation.h"
#include "deprecated/clutter-backend.h" #include "deprecated/clutter-backend.h"
#include "deprecated/clutter-behaviour.h" #include "deprecated/clutter-behaviour.h"
#include "deprecated/clutter-behaviour-depth.h" #include "deprecated/clutter-behaviour-depth.h"

3
clutter/clutter-interval.h
View File

@ -29,7 +29,7 @@
#ifndef __CLUTTER_INTERVAL_H__ #ifndef __CLUTTER_INTERVAL_H__
#define __CLUTTER_INTERVAL_H__ #define __CLUTTER_INTERVAL_H__
#include <glib-object.h> #include <clutter/clutter-types.h>
G_BEGIN_DECLS G_BEGIN_DECLS
@ -40,7 +40,6 @@ G_BEGIN_DECLS
#define CLUTTER_IS_INTERVAL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), CLUTTER_TYPE_INTERVAL)) #define CLUTTER_IS_INTERVAL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), CLUTTER_TYPE_INTERVAL))
#define CLUTTER_INTERVAL_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), CLUTTER_TYPE_INTERVAL, ClutterIntervalClass)) #define CLUTTER_INTERVAL_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), CLUTTER_TYPE_INTERVAL, ClutterIntervalClass))
typedef struct _ClutterInterval ClutterInterval;
typedef struct _ClutterIntervalPrivate ClutterIntervalPrivate; typedef struct _ClutterIntervalPrivate ClutterIntervalPrivate;
typedef struct _ClutterIntervalClass ClutterIntervalClass; typedef struct _ClutterIntervalClass ClutterIntervalClass;

1
clutter/clutter-types.h
View File

@ -57,6 +57,7 @@ typedef struct _ClutterActorIter ClutterActorIter;
typedef struct _ClutterAlpha ClutterAlpha; typedef struct _ClutterAlpha ClutterAlpha;
typedef struct _ClutterAnimatable ClutterAnimatable; /* dummy */ typedef struct _ClutterAnimatable ClutterAnimatable; /* dummy */
typedef struct _ClutterAnimator ClutterAnimator; typedef struct _ClutterAnimator ClutterAnimator;
typedef struct _ClutterInterval ClutterInterval;
typedef struct _ClutterState ClutterState; typedef struct _ClutterState ClutterState;
typedef struct _ClutterTimeline ClutterTimeline; typedef struct _ClutterTimeline ClutterTimeline;

57
clutter/deprecated/clutter-animation.h Normal file
View File

@ -0,0 +1,57 @@
/*
* Clutter.
*
* An OpenGL based 'interactive canvas' library.
*
* Copyright (C) 2008 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/>.
*
* Author:
* Emmanuele Bassi <ebassi@linux.intel.com>
*/
#if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
#error "Only <clutter/clutter.h> can be included directly."
#endif
#ifndef __CLUTTER_ANIMATION_DEPRECATED_H__
#define __CLUTTER_ANIMATION_DEPRECATED_H__
#include <clutter/clutter-animation.h>
G_BEGIN_DECLS
CLUTTER_DEPRECATED_IN_1_10_FOR(clutter_animation_set_timeline)
void clutter_animation_set_alpha (ClutterAnimation *animation,
ClutterAlpha *alpha);
CLUTTER_DEPRECATED_IN_1_10_FOR(clutter_animation_get_timeline)
ClutterAlpha * clutter_animation_get_alpha (ClutterAnimation *animation);
CLUTTER_DEPRECATED_IN_1_10_FOR(clutter_actor_animate_with_timeline)
ClutterAnimation * clutter_actor_animate_with_alpha (ClutterActor *actor,
ClutterAlpha *alpha,
const gchar *first_property_name,
...) G_GNUC_NULL_TERMINATED;
CLUTTER_DEPRECATED_IN_1_10_FOR(clutter_actor_animate_with_timelinev)
ClutterAnimation * clutter_actor_animate_with_alphav (ClutterActor *actor,
ClutterAlpha *alpha,
gint n_properties,
const gchar * const properties[],
const GValue *values);
G_END_DECLS
#endif /* __CLUTTER_ANIMATION_DEPRECATED_H__ */