cedric pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=a4597c8326d340b93cfcfd62a72057aae9b9f506
commit a4597c8326d340b93cfcfd62a72057aae9b9f506
Author: Mike Blumenkrantz <zm...@samsung.com>
Date: Wed Sep 25 06:47:49 2019 -0400
efl_ui/image: fix playback_speed timer calcs
I accidentally inverted this; the frame timing needs to be divided by
the playback speed to have the correct time here
Reviewed-by: Cedric BAIL <cedric.b...@free.fr>
Differential Revision: https://phab.enlightenment.org/D10147
---
src/lib/elementary/efl_ui_image.c | 8 ++++----
src/lib/elementary/efl_ui_image_zoomable.c | 8 ++++----
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/lib/elementary/efl_ui_image.c
b/src/lib/elementary/efl_ui_image.c
index ade335b3ee..f732d44add 100644
--- a/src/lib/elementary/efl_ui_image.c
+++ b/src/lib/elementary/efl_ui_image.c
@@ -141,7 +141,7 @@ _efl_ui_image_animate_cb(void *data)
(sd->img, sd->cur_frame, 0);
if (sd->frame_duration > 0)
- ecore_timer_interval_set(sd->anim_timer, sd->frame_duration *
sd->playback_speed);
+ ecore_timer_interval_set(sd->anim_timer, sd->frame_duration /
sd->playback_speed);
return ECORE_CALLBACK_RENEW;
}
@@ -1762,7 +1762,7 @@ _efl_ui_image_animated_set_internal(Eo *obj,
Efl_Ui_Image_Data *sd, Eina_Bool an
evas_object_image_animated_frame_set(sd->img, sd->cur_frame);
if (!sd->paused)//legacy
sd->anim_timer = ecore_timer_add
- (sd->frame_duration * sd->playback_speed,
_efl_ui_image_animate_cb, obj);
+ (sd->frame_duration / sd->playback_speed,
_efl_ui_image_animate_cb, obj);
}
else
{
@@ -1821,7 +1821,7 @@ _efl_ui_image_efl_player_playback_speed_set(Eo *obj
EINA_UNUSED, Efl_Ui_Image_Da
efl_player_playback_speed_set(sd->img, factor);
else if (sd->anim_timer)
{
- ecore_timer_interval_set(sd->anim_timer, sd->frame_duration *
sd->playback_speed);
+ ecore_timer_interval_set(sd->anim_timer, sd->frame_duration /
sd->playback_speed);
ecore_timer_reset(sd->anim_timer);
}
}
@@ -1881,7 +1881,7 @@ _efl_ui_image_animated_paused_set_internal(Eo *obj,
Efl_Ui_Image_Data *sd, Eina_
if (!paused)
{
sd->anim_timer = ecore_timer_add
- (sd->frame_duration * sd->playback_speed,
_efl_ui_image_animate_cb, obj);
+ (sd->frame_duration / sd->playback_speed,
_efl_ui_image_animate_cb, obj);
}
else
{
diff --git a/src/lib/elementary/efl_ui_image_zoomable.c
b/src/lib/elementary/efl_ui_image_zoomable.c
index b14bace8a2..a08a72ca8a 100644
--- a/src/lib/elementary/efl_ui_image_zoomable.c
+++ b/src/lib/elementary/efl_ui_image_zoomable.c
@@ -3035,7 +3035,7 @@ _efl_ui_image_zoomable_animate_cb(void *data)
(sd->img, sd->cur_frame, 0);
if (sd->frame_duration > 0)
- ecore_timer_interval_set(sd->anim_timer, sd->frame_duration *
sd->playback_speed);
+ ecore_timer_interval_set(sd->anim_timer, sd->frame_duration /
sd->playback_speed);
return ECORE_CALLBACK_RENEW;
}
@@ -3065,7 +3065,7 @@ _efl_ui_image_zoomable_animated_set_internal(Eo *obj
EINA_UNUSED, Efl_Ui_Image_Z
evas_object_image_animated_frame_set(sd->img, sd->cur_frame);
if (!sd->paused)//legacy
sd->anim_timer = ecore_timer_add
- (sd->frame_duration * sd->playback_speed,
_efl_ui_image_zoomable_animate_cb, obj);
+ (sd->frame_duration / sd->playback_speed,
_efl_ui_image_zoomable_animate_cb, obj);
}
else
{
@@ -3092,7 +3092,7 @@ _efl_ui_image_zoomable_animated_paused_set_internal(Eo
*obj, Efl_Ui_Image_Zoomab
if (!paused)
{
sd->anim_timer = ecore_timer_add
- (sd->frame_duration * sd->playback_speed,
_efl_ui_image_zoomable_animate_cb, obj);
+ (sd->frame_duration / sd->playback_speed,
_efl_ui_image_zoomable_animate_cb, obj);
}
else
{
@@ -3138,7 +3138,7 @@ _efl_ui_image_zoomable_efl_player_playback_speed_set(Eo
*obj EINA_UNUSED, Efl_Ui
efl_player_playback_speed_set(sd->edje, factor);
else if (sd->anim_timer)
{
- ecore_timer_interval_set(sd->anim_timer, sd->frame_duration *
sd->playback_speed);
+ ecore_timer_interval_set(sd->anim_timer, sd->frame_duration /
sd->playback_speed);
ecore_timer_reset(sd->anim_timer);
}
}
--
