[beryl-commits] Animation plugin: Changes to 'master' (8c3e2e3cea1fd30c6378945aaf61719fabe5e69a)

[cornelius at server.beryl-project.org]

New commits:
commit 8c3e2e3cea1fd30c6378945aaf61719fabe5e69a
Author: Erkin Bahceci <erkinbah at gmail.com>
Date:   Fri Jun 22 19:47:38 2007 -0400

    Get rid of remaining warnings.


 animation-internal.h |   64 ++++---------------------------------------------
 animation.c          |   58 +++++++++++++++++++++++++++++++++++++++++++--
 2 files changed, 61 insertions(+), 61 deletions(-)


Modified: fusion/plugins/animation/animation-internal.h
===================================================================
--- fusion/plugins/animation/animation-internal.h
+++ fusion/plugins/animation/animation-internal.h
@@ -302,72 +302,18 @@ typedef enum
 
 #define RANDOM_EFFECT_OFFSET 2 /* skip none and random */
 
-
-static AnimEffect minimizeEffectType[] = {
-	AnimEffectNone,
-	AnimEffectRandom,
-	AnimEffectBeamUp,
-	AnimEffectBurn,
-	AnimEffectCurvedFold,
-	AnimEffectDomino3D,
-	AnimEffectDream,
-	AnimEffectExplode3D,
-	AnimEffectFade,
-	AnimEffectGlide3D1,
-	AnimEffectGlide3D2,
-	AnimEffectHorizontalFolds,
-	AnimEffectLeafSpread3D,
-	AnimEffectMagicLamp,
-	AnimEffectRazr3D,
-	AnimEffectSidekick,
-	AnimEffectZoom
-};
-#define NUM_MINIMIZE_EFFECT (LIST_SIZE(minimizeEffectType))
+#define NUM_MINIMIZE_EFFECT 17
 #define LAST_MINIMIZE_EFFECT 16
 #define LAST_RANDOM_MINIMIZE_EFFECT 14
 
-static AnimEffect closeEffectType[] = {
-	AnimEffectNone,
-	AnimEffectRandom,
-	AnimEffectBeamUp,
-	AnimEffectBurn,
-	AnimEffectCurvedFold,
-	AnimEffectDomino3D,
-	AnimEffectDream,
-	AnimEffectExplode3D,
-	AnimEffectFade,
-	AnimEffectGlide3D1,
-	AnimEffectGlide3D2,
-	AnimEffectHorizontalFolds,
-	AnimEffectLeafSpread3D,
-	AnimEffectMagicLamp,
-	AnimEffectMagicLampVacuum,
-	AnimEffectRazr3D,
-	AnimEffectSidekick,
-	AnimEffectWave,
-	AnimEffectZoom
-};
-#define NUM_CLOSE_EFFECT (LIST_SIZE(closeEffectType))
+#define NUM_CLOSE_EFFECT 19
 #define LAST_CLOSE_EFFECT 18
 #define LAST_RANDOM_CLOSE_EFFECT 16
 
-static AnimEffect focusEffectType[] = {
-	AnimEffectNone,
-	AnimEffectDodge,
-	AnimEffectFocusFade,
-	AnimEffectWave
-};
-#define NUM_FOCUS_EFFECT (LIST_SIZE(focusEffectType))
+#define NUM_FOCUS_EFFECT 4
 #define LAST_FOCUS_EFFECT 3
 
-static AnimEffect shadeEffectType[] = {
-	AnimEffectNone,
-	AnimEffectRandom,
-	AnimEffectCurvedFold,
-	AnimEffectHorizontalFolds,
-	AnimEffectRollUp
-};
-#define NUM_SHADE_EFFECT (LIST_SIZE(shadeEffectType))
+#define NUM_SHADE_EFFECT 5
 #define LAST_SHADE_EFFECT 4
 #define LAST_RANDOM_SHADE_EFFECT 2
 
@@ -749,3 +695,5 @@ void finiParticles(ParticleSystem * ps);
 
 void cleanUpParentChildChainItem(AnimScreen *as, AnimWindow *aw);
 
+void animDrawWindowGeometry(CompWindow * w);
+

Modified: fusion/plugins/animation/animation.c
===================================================================
--- fusion/plugins/animation/animation.c
+++ fusion/plugins/animation/animation.c
@@ -97,10 +97,62 @@
 int displayPrivateIndex;
 CompMetadata animMetadata;
 
-static void
-animDrawWindowGeometry(CompWindow * w);
+static AnimEffect minimizeEffectType[] = {
+	AnimEffectNone,
+	AnimEffectRandom,
+	AnimEffectBeamUp,
+	AnimEffectBurn,
+	AnimEffectCurvedFold,
+	AnimEffectDomino3D,
+	AnimEffectDream,
+	AnimEffectExplode3D,
+	AnimEffectFade,
+	AnimEffectGlide3D1,
+	AnimEffectGlide3D2,
+	AnimEffectHorizontalFolds,
+	AnimEffectLeafSpread3D,
+	AnimEffectMagicLamp,
+	AnimEffectRazr3D,
+	AnimEffectSidekick,
+	AnimEffectZoom
+};
+
+static AnimEffect closeEffectType[] = {
+	AnimEffectNone,
+	AnimEffectRandom,
+	AnimEffectBeamUp,
+	AnimEffectBurn,
+	AnimEffectCurvedFold,
+	AnimEffectDomino3D,
+	AnimEffectDream,
+	AnimEffectExplode3D,
+	AnimEffectFade,
+	AnimEffectGlide3D1,
+	AnimEffectGlide3D2,
+	AnimEffectHorizontalFolds,
+	AnimEffectLeafSpread3D,
+	AnimEffectMagicLamp,
+	AnimEffectMagicLampVacuum,
+	AnimEffectRazr3D,
+	AnimEffectSidekick,
+	AnimEffectWave,
+	AnimEffectZoom
+};
 
+static AnimEffect focusEffectType[] = {
+	AnimEffectNone,
+	AnimEffectDodge,
+	AnimEffectFocusFade,
+	AnimEffectWave
+};
 
+static AnimEffect shadeEffectType[] = {
+	AnimEffectNone,
+	AnimEffectRandom,
+	AnimEffectCurvedFold,
+	AnimEffectHorizontalFolds,
+	AnimEffectRollUp
+};
 
 
 // iterate over given list
@@ -2319,7 +2371,7 @@ animDrawWindowTexture(CompWindow * w, CompTexture * texture,
 	WRAP(as, w->screen, drawWindowTexture, animDrawWindowTexture);
 }
 
-static void
+void
 animDrawWindowGeometry(CompWindow * w)
 {
 	ANIM_WINDOW(w);