Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/edje
Dir : e17/libs/edje/src/lib
Modified Files:
edje_private.h edje_program.c edje_var.c
Log Message:
use animators... :)
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/edje/src/lib/edje_private.h,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -3 -r1.71 -r1.72
--- edje_private.h 30 Aug 2004 16:08:31 -0000 1.71
+++ edje_private.h 5 Sep 2004 08:11:36 -0000 1.72
@@ -80,7 +80,7 @@
extern Eet_Data_Descriptor *_edje_edd_edje_part_image_id;
extern int _edje_anim_count;
-extern Ecore_Timer *_edje_timer;
+extern Ecore_Animator *_edje_timer;
extern Evas_List *_edje_animators;
extern Edje_Text_Style _edje_text_styles[EDJE_TEXT_EFFECT_LAST];
extern Evas_List *_edje_edjes;
@@ -139,7 +139,6 @@
int _edje_var_anim_add (Edje *ed, double len, char *fname, int
val);
void _edje_var_anim_del (Edje *ed, int id);
-void _edje_var_anim_frametime_reset(void);
void _edje_message_init (void);
void _edje_message_shutdown (void);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/edje/src/lib/edje_program.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -3 -r1.39 -r1.40
--- edje_program.c 18 Aug 2004 01:09:14 -0000 1.39
+++ edje_program.c 5 Sep 2004 08:11:36 -0000 1.40
@@ -3,11 +3,9 @@
static void _edje_emit_cb(Edje *ed, char *sig, char *src);
-static double _edje_frametime = 1.0 / 60.0;
-
-int _edje_anim_count = 0;
-Ecore_Timer *_edje_timer = NULL;
-Evas_List *_edje_animators = NULL;
+int _edje_anim_count = 0;
+Ecore_Animator *_edje_timer = NULL;
+Evas_List *_edje_animators = NULL;
/************************** API Routines **************************/
@@ -15,31 +13,24 @@
/** Set the frametime
* @param t The frametime
*
- * Sets the frametime in seconds, by default this is 1/60.
+ * Sets the frametime in seconds, by default this is 1/30.
*/
void
edje_frametime_set(double t)
{
- if (t == _edje_frametime) return;
- _edje_frametime = t;
- if (_edje_timer)
- {
- ecore_timer_del(_edje_timer);
- _edje_timer = ecore_timer_add(_edje_frametime, _edje_timer_cb, NULL);
- }
- _edje_var_anim_frametime_reset();
+ ecore_animator_frametime_set(t);
}
/* FIXDOC: Expand */
/** Get the frametime
* @return The frametime
*
- * Returns the frametime in seconds, by default this is 1/60.
+ * Returns the frametime in seconds, by default this is 1/30.
*/
double
edje_frametime_get(void)
{
- return _edje_frametime;
+ return ecore_animator_frametime_get();
}
/* FIXDOC: Expand */
@@ -501,7 +492,7 @@
runp->edje = ed;
runp->program = pr;
if (!_edje_timer)
- _edje_timer = ecore_timer_add(_edje_frametime, _edje_timer_cb, NULL);
+ _edje_timer = ecore_animator_add(_edje_timer_cb, NULL);
_edje_anim_count++;
}
else
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/edje/src/lib/edje_var.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- edje_var.c 24 Aug 2004 10:06:33 -0000 1.7
+++ edje_var.c 5 Sep 2004 08:11:36 -0000 1.8
@@ -979,7 +979,7 @@
_edje_anim_list = evas_list_append(_edje_anim_list, ed);
ed->var_pool->animators = evas_list_prepend(ed->var_pool->animators, ea);
if (!_edje_anim_timer)
- _edje_anim_timer = ecore_timer_add(edje_frametime_get(), _edje_var_anim_cb,
NULL);
+ _edje_anim_timer = ecore_animator_add(_edje_var_anim_cb, NULL);
return ea->id;
}
@@ -1019,16 +1019,3 @@
}
}
}
-
-void
-_edje_var_anim_frametime_reset(void)
-{
- double ft;
-
- if (_edje_anim_timer)
- {
- ft = edje_frametime_get();
- ecore_timer_del(_edje_anim_timer);
- _edje_anim_timer = ecore_timer_add(ft, _edje_var_anim_cb, NULL);
- }
-}
-------------------------------------------------------
This SF.Net email is sponsored by BEA Weblogic Workshop
FREE Java Enterprise J2EE developer tools!
Get your free copy of BEA WebLogic Workshop 8.1 today.
http://ads.osdn.com/?ad_id=5047&alloc_id=10808&op=click
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
