Deprecate ClutterAlpha

It's time. Now that we have clutter_actor_allocate() respecting the
easing state of an actor, and that the LayoutManager animation virtual
functions have been deprecated, we can put ClutterAlpha on the chopping
block, and be done with it, once and for all.

So long, ClutterAlpha; and thanks for all the fish.

diff --git a/clutter/Makefile.am b/clutter/Makefile.am
index e52edb2..3a7cb65 100644 (file)
--- a/clutter/Makefile.am
+++ b/clutter/Makefile.am
@@ -53,7 +53,6 @@ source_h =                                    \
        $(srcdir)/clutter-actor-meta.h          \
        $(srcdir)/clutter-actor.h               \
        $(srcdir)/clutter-align-constraint.h    \
-       $(srcdir)/clutter-alpha.h               \
        $(srcdir)/clutter-animatable.h          \
        $(srcdir)/clutter-backend.h             \
        $(srcdir)/clutter-bind-constraint.h     \
@@ -133,7 +132,6 @@ source_c = \
        $(srcdir)/clutter-actor-meta.c          \
        $(srcdir)/clutter-actor.c               \
        $(srcdir)/clutter-align-constraint.c    \
-       $(srcdir)/clutter-alpha.c               \
        $(srcdir)/clutter-animatable.c          \
        $(srcdir)/clutter-backend.c             \
        $(srcdir)/clutter-base-types.c          \
@@ -248,6 +246,7 @@ source_c_priv = \
 # deprecated installed headers
 deprecated_h = \
        $(srcdir)/deprecated/clutter-actor.h                    \
+       $(srcdir)/deprecated/clutter-alpha.h                    \
        $(srcdir)/deprecated/clutter-animatable.h               \
        $(srcdir)/deprecated/clutter-animation.h                \
        $(srcdir)/deprecated/clutter-animator.h                 \
@@ -284,6 +283,7 @@ deprecated_h = \
 # deprecated source code
 deprecated_c = \
        $(srcdir)/deprecated/clutter-actor-deprecated.c         \
+       $(srcdir)/deprecated/clutter-alpha.c                    \
        $(srcdir)/deprecated/clutter-animation.c                \
        $(srcdir)/deprecated/clutter-animator.c                 \
        $(srcdir)/deprecated/clutter-behaviour.c                \

diff --git a/clutter/clutter-box-layout.c b/clutter/clutter-box-layout.c
index f279d9a..1ef8826 100644 (file)
--- a/clutter/clutter-box-layout.c
+++ b/clutter/clutter-box-layout.c
@@ -77,6 +77,7 @@
 
 #define CLUTTER_DISABLE_DEPRECATION_WARNINGS
 #include "deprecated/clutter-container.h"
+#include "deprecated/clutter-alpha.h"
 
 #include "clutter-box-layout.h"
 

diff --git a/clutter/clutter-deprecated.h b/clutter/clutter-deprecated.h
index 868b053..b19dbab 100644 (file)
--- a/clutter/clutter-deprecated.h
+++ b/clutter/clutter-deprecated.h
@@ -4,6 +4,7 @@
 #define __CLUTTER_DEPRECATED_H_INSIDE__
 
 #include "deprecated/clutter-actor.h"
+#include "deprecated/clutter-alpha.h"
 #include "deprecated/clutter-animatable.h"
 #include "deprecated/clutter-animation.h"
 #include "deprecated/clutter-animator.h"

diff --git a/clutter/clutter-layout-manager.c b/clutter/clutter-layout-manager.c
index 07e035c..9e16e21 100644 (file)
--- a/clutter/clutter-layout-manager.c
+++ b/clutter/clutter-layout-manager.c
@@ -327,7 +327,10 @@
 #include <glib-object.h>
 #include <gobject/gvaluecollector.h>
 
-#include "clutter-alpha.h"
+#define CLUTTER_DISABLE_DEPRECATION_WARNINGS
+#include "deprecated/clutter-container.h"
+#include "deprecated/clutter-alpha.h"
+
 #include "clutter-debug.h"
 #include "clutter-layout-manager.h"
 #include "clutter-layout-meta.h"

diff --git a/clutter/clutter-layout-manager.h b/clutter/clutter-layout-manager.h
index 967bf3f..74efb76 100644 (file)
--- a/clutter/clutter-layout-manager.h
+++ b/clutter/clutter-layout-manager.h
@@ -29,9 +29,6 @@
 #ifndef __CLUTTER_LAYOUT_MANAGER_H__
 #define __CLUTTER_LAYOUT_MANAGER_H__
 
-#include <clutter/clutter-actor.h>
-#include <clutter/clutter-alpha.h>
-#include <clutter/clutter-container.h>
 #include <clutter/clutter-types.h>
 
 G_BEGIN_DECLS

diff --git a/clutter/clutter-script-parser.c b/clutter/clutter-script-parser.c
index d31df41..6eb6b2b 100644 (file)
--- a/clutter/clutter-script-parser.c
+++ b/clutter/clutter-script-parser.c
@@ -36,6 +36,7 @@
 
 #define CLUTTER_DISABLE_DEPRECATION_WARNINGS
 #include "deprecated/clutter-container.h"
+#include "deprecated/clutter-alpha.h"
 
 #include "clutter-actor.h"
 #include "clutter-debug.h"

diff --git a/clutter/clutter-table-layout.c b/clutter/clutter-table-layout.c
index 1c40c1f..082635f 100644 (file)
--- a/clutter/clutter-table-layout.c
+++ b/clutter/clutter-table-layout.c
@@ -84,6 +84,7 @@
 
 #define CLUTTER_DISABLE_DEPRECATION_WARNINGS
 #include "deprecated/clutter-container.h"
+#include "deprecated/clutter-alpha.h"
 
 #include "clutter-table-layout.h"
 

diff --git a/clutter/clutter.h b/clutter/clutter.h
index c5da997..b4a624a 100644 (file)
--- a/clutter/clutter.h
+++ b/clutter/clutter.h
@@ -35,7 +35,6 @@
 #include "clutter-actor.h"
 #include "clutter-actor-meta.h"
 #include "clutter-align-constraint.h"
-#include "clutter-alpha.h"
 #include "clutter-animatable.h"
 #include "clutter-backend.h"
 #include "clutter-bind-constraint.h"

diff --git a/clutter/clutter-alpha.c b/clutter/deprecated/clutter-alpha.c
similarity index 97%
rename from clutter/clutter-alpha.c
rename to clutter/deprecated/clutter-alpha.c
index 36a2155..bd1c715 100644 (file)
--- a/clutter/clutter-alpha.c
+++ b/clutter/deprecated/clutter-alpha.c
@@ -100,7 +100,11 @@
  *   in #ClutterAnimation.</para>
  * </refsect2>
  *
- * Since: 0.2
+ * #ClutterAlpha is available since Clutter 0.2.
+ *
+ * #ClutterAlpha is deprecated since Clutter 1.12; use #ClutterTimeline and the
+ * #ClutterTimeline:progress-mode property.
+ *
  */
 
 #ifdef HAVE_CONFIG_H
@@ -346,6 +350,8 @@ clutter_alpha_class_init (ClutterAlphaClass *klass)
    * A #ClutterTimeline instance used to drive the alpha function.
    *
    * Since: 0.2
+   *
+   * Deprecated: 1.12
    */
   obj_props[PROP_TIMELINE] =
     g_param_spec_object ("timeline",
@@ -362,6 +368,7 @@ clutter_alpha_class_init (ClutterAlphaClass *klass)
    * one unit in each direction, so the valid interval is -1.0 to 2.0.
    *
    * Since: 0.2
+   * Deprecated: 1.12
    */
   obj_props[PROP_ALPHA] =
     g_param_spec_double ("alpha",
@@ -383,6 +390,7 @@ clutter_alpha_class_init (ClutterAlphaClass *klass)
    * will be used.
    *
    * Since: 1.0
+   * Deprecated: 1.12
    */
   obj_props[PROP_MODE] =
     g_param_spec_ulong ("mode",
@@ -417,6 +425,8 @@ clutter_alpha_init (ClutterAlpha *self)
  * Return Value: The current alpha value for the alpha
  *
  * Since: 0.2
+ *
+ * Deprecated: 1.12
  */
 gdouble
 clutter_alpha_get_alpha (ClutterAlpha *alpha)
@@ -506,6 +516,8 @@ clutter_alpha_set_closure_internal (ClutterAlpha *alpha,
  * frame of the #ClutterTimeline bound to @alpha.
  *
  * Since: 0.8
+ *
+ * Deprecated: 1.12
  */
 void
 clutter_alpha_set_closure (ClutterAlpha *alpha,
@@ -538,6 +550,8 @@ clutter_alpha_set_closure (ClutterAlpha *alpha,
  * This function will not register @func as a global alpha function.
  *
  * Since: 0.2
+ *
+ * Deprecated: 1.12
  */
 void
 clutter_alpha_set_func (ClutterAlpha    *alpha,
@@ -579,6 +593,8 @@ clutter_alpha_set_func (ClutterAlpha    *alpha,
  * Binds @alpha to @timeline.
  *
  * Since: 0.2
+ *
+ * Deprecated: 1.12
  */
 void
 clutter_alpha_set_timeline (ClutterAlpha    *alpha,
@@ -625,6 +641,8 @@ clutter_alpha_set_timeline (ClutterAlpha    *alpha,
  * Return value: (transfer none): a #ClutterTimeline instance
  *
  * Since: 0.2
+ *
+ * Deprecated: 1.12
  */
 ClutterTimeline *
 clutter_alpha_get_timeline (ClutterAlpha *alpha)
@@ -648,6 +666,8 @@ clutter_alpha_get_timeline (ClutterAlpha *alpha)
  * Return value: the newly created empty #ClutterAlpha instance.
  *
  * Since: 0.2
+ *
+ * Deprecated: 1.12
  */
 ClutterAlpha *
 clutter_alpha_new (void)
@@ -668,6 +688,8 @@ clutter_alpha_new (void)
  * Return Value: the newly created #ClutterAlpha
  *
  * Since: 1.0
+ *
+ * Deprecated: 1.12
  */
 ClutterAlpha *
 clutter_alpha_new_full (ClutterTimeline *timeline,
@@ -699,6 +721,8 @@ clutter_alpha_new_full (ClutterTimeline *timeline,
  * Return value: the newly created #ClutterAlpha
  *
  * Since: 1.0
+ *
+ * Deprecated: 1.12
  */
 ClutterAlpha *
 clutter_alpha_new_with_func (ClutterTimeline  *timeline,
@@ -727,6 +751,8 @@ clutter_alpha_new_with_func (ClutterTimeline  *timeline,
  * Return value: the animation mode
  *
  * Since: 1.0
+ *
+ * Deprecated: 1.12
  */
 gulong
 clutter_alpha_get_mode (ClutterAlpha *alpha)
@@ -774,6 +800,8 @@ clutter_alpha_easing_func (ClutterAlpha *alpha,
  * using the value returned by clutter_alpha_register_func().
  *
  * Since: 1.0
+ *
+ * Deprecated: 1.12
  */
 void
 clutter_alpha_set_mode (ClutterAlpha *alpha,
@@ -881,6 +909,8 @@ register_alpha_internal (AlphaData *alpha_data)
  * Return value: the logical id of the alpha function
  *
  * Since: 1.0
+ *
+ * Deprecated: 1.12
  */
 gulong
 clutter_alpha_register_func (ClutterAlphaFunc func,
@@ -914,6 +944,8 @@ clutter_alpha_register_func (ClutterAlphaFunc func,
  * Return value: the logical id of the alpha function
  *
  * Since: 1.0
+ *
+ * Deprecated: 1.12
  */
 gulong
 clutter_alpha_register_closure (GClosure *closure)

diff --git a/clutter/clutter-alpha.h b/clutter/deprecated/clutter-alpha.h
similarity index 93%
rename from clutter/clutter-alpha.h
rename to clutter/deprecated/clutter-alpha.h
index 4cd85bc..347ff4a 100644 (file)
--- a/clutter/clutter-alpha.h
+++ b/clutter/deprecated/clutter-alpha.h
@@ -98,32 +98,45 @@ struct _ClutterAlphaClass
   void (*_clutter_alpha_5) (void);
 }; 
 
+CLUTTER_DEPRECATED_IN_1_12
 GType clutter_alpha_get_type (void) G_GNUC_CONST;
 
+CLUTTER_DEPRECATED_IN_1_12
 ClutterAlpha *   clutter_alpha_new              (void);
+CLUTTER_DEPRECATED_IN_1_12
 ClutterAlpha *   clutter_alpha_new_full         (ClutterTimeline  *timeline,
                                                  gulong            mode);
+CLUTTER_DEPRECATED_IN_1_12
 ClutterAlpha *   clutter_alpha_new_with_func    (ClutterTimeline  *timeline,
                                                  ClutterAlphaFunc  func,
                                                  gpointer          data,
                                                  GDestroyNotify    destroy);
 
+CLUTTER_DEPRECATED_IN_1_12
 gdouble          clutter_alpha_get_alpha        (ClutterAlpha     *alpha);
+CLUTTER_DEPRECATED_IN_1_12
 void             clutter_alpha_set_func         (ClutterAlpha     *alpha,
                                                  ClutterAlphaFunc  func,
                                                  gpointer          data,
                                                  GDestroyNotify    destroy);
+CLUTTER_DEPRECATED_IN_1_12
 void             clutter_alpha_set_closure      (ClutterAlpha     *alpha,
                                                  GClosure         *closure);
+CLUTTER_DEPRECATED_IN_1_12
 void             clutter_alpha_set_timeline     (ClutterAlpha     *alpha,
                                                  ClutterTimeline  *timeline);
+CLUTTER_DEPRECATED_IN_1_12
 ClutterTimeline *clutter_alpha_get_timeline     (ClutterAlpha     *alpha);
+CLUTTER_DEPRECATED_IN_1_12
 void             clutter_alpha_set_mode         (ClutterAlpha     *alpha,
                                                  gulong            mode);
+CLUTTER_DEPRECATED_IN_1_12
 gulong           clutter_alpha_get_mode         (ClutterAlpha     *alpha);
 
+CLUTTER_DEPRECATED_IN_1_12
 gulong           clutter_alpha_register_func    (ClutterAlphaFunc  func,
                                                  gpointer          data);
+CLUTTER_DEPRECATED_IN_1_12
 gulong           clutter_alpha_register_closure (GClosure         *closure);
 
 G_END_DECLS

diff --git a/clutter/deprecated/clutter-behaviour-depth.c b/clutter/deprecated/clutter-behaviour-depth.c
index fd329b5..afdf982 100644 (file)
--- a/clutter/deprecated/clutter-behaviour-depth.c
+++ b/clutter/deprecated/clutter-behaviour-depth.c
@@ -29,6 +29,7 @@
 
 #define CLUTTER_DISABLE_DEPRECATION_WARNINGS
 
+#include "clutter-alpha.h"
 #include "clutter-behaviour.h"
 #include "clutter-behaviour-depth.h"
 #include "clutter-enum-types.h"

diff --git a/clutter/deprecated/clutter-behaviour-ellipse.c b/clutter/deprecated/clutter-behaviour-ellipse.c
index ab05aca..e050fe6 100644 (file)
--- a/clutter/deprecated/clutter-behaviour-ellipse.c
+++ b/clutter/deprecated/clutter-behaviour-ellipse.c
@@ -52,6 +52,7 @@
 
 #define CLUTTER_DISABLE_DEPRECATION_WARNINGS
 
+#include "clutter-alpha.h"
 #include "clutter-behaviour.h"
 #include "clutter-behaviour-ellipse.h"
 #include "clutter-debug.h"

diff --git a/clutter/deprecated/clutter-behaviour-opacity.c b/clutter/deprecated/clutter-behaviour-opacity.c
index bfd2f0c..b685be0 100644 (file)
--- a/clutter/deprecated/clutter-behaviour-opacity.c
+++ b/clutter/deprecated/clutter-behaviour-opacity.c
@@ -44,6 +44,7 @@
 
 #define CLUTTER_DISABLE_DEPRECATION_WARNINGS
 
+#include "clutter-alpha.h"
 #include "clutter-behaviour.h"
 #include "clutter-behaviour-opacity.h"
 #include "clutter-private.h"

diff --git a/clutter/deprecated/clutter-behaviour-path.c b/clutter/deprecated/clutter-behaviour-path.c
index 69e94d7..9702a39 100644 (file)
--- a/clutter/deprecated/clutter-behaviour-path.c
+++ b/clutter/deprecated/clutter-behaviour-path.c
@@ -69,6 +69,7 @@
 
 #define CLUTTER_DISABLE_DEPRECATION_WARNINGS
 
+#include "clutter-alpha.h"
 #include "clutter-behaviour.h"
 #include "clutter-behaviour-path.h"
 #include "clutter-bezier.h"

diff --git a/clutter/deprecated/clutter-behaviour-rotate.c b/clutter/deprecated/clutter-behaviour-rotate.c
index 056eb54..e319f4b 100644 (file)
--- a/clutter/deprecated/clutter-behaviour-rotate.c
+++ b/clutter/deprecated/clutter-behaviour-rotate.c
@@ -43,6 +43,7 @@
 
 #define CLUTTER_DISABLE_DEPRECATION_WARNINGS
 
+#include "clutter-alpha.h"
 #include "clutter-behaviour.h"
 #include "clutter-behaviour-rotate.h"
 #include "clutter-debug.h"

diff --git a/clutter/deprecated/clutter-behaviour-scale.c b/clutter/deprecated/clutter-behaviour-scale.c
index 23292e1..a521fb5 100644 (file)
--- a/clutter/deprecated/clutter-behaviour-scale.c
+++ b/clutter/deprecated/clutter-behaviour-scale.c
@@ -43,6 +43,7 @@
 
 #define CLUTTER_DISABLE_DEPRECATION_WARNINGS
 
+#include "clutter-alpha.h"
 #include "clutter-behaviour.h"
 #include "clutter-behaviour-scale.h"
 #include "clutter-debug.h"

diff --git a/clutter/deprecated/clutter-behaviour.c b/clutter/deprecated/clutter-behaviour.c
index c79e532..08a11f4 100644 (file)
--- a/clutter/deprecated/clutter-behaviour.c
+++ b/clutter/deprecated/clutter-behaviour.c
@@ -79,6 +79,7 @@
 
 #define CLUTTER_DISABLE_DEPRECATION_WARNINGS
 #include "clutter-behaviour.h"
+#include "clutter-alpha.h"
 
 #include "clutter-debug.h"
 #include "clutter-main.h"