summaryrefslogtreecommitdiff
path: root/src/lib/evas/canvas/efl_canvas_animation_player.c
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@samsung.com>2019-09-24 09:39:21 -0400
committerCedric Bail <cedric.bail@free.fr>2019-09-24 15:23:09 -0700
commit5c2ea620a18cea0d02fe5ae3315913448828e77e (patch)
tree65600a34470590b571cd513f02f11d709dfdf79a /src/lib/evas/canvas/efl_canvas_animation_player.c
parentc99f7d06cb60a5fe2e3f14f541119ff5f1e3dc19 (diff)
efl/player: prune properties duplicated in efl.playable
efl.playable implements a number of properties which are also present in efl.player. playable was intended to be separate, so enforce this split in all classes which use player ref T7877 Reviewed-by: Cedric BAIL <cedric.bail@free.fr> Differential Revision: https://phab.enlightenment.org/D10109
Diffstat (limited to '')
-rw-r--r--src/lib/evas/canvas/efl_canvas_animation_player.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/lib/evas/canvas/efl_canvas_animation_player.c b/src/lib/evas/canvas/efl_canvas_animation_player.c
index aa89c367ff..2dc7d55d43 100644
--- a/src/lib/evas/canvas/efl_canvas_animation_player.c
+++ b/src/lib/evas/canvas/efl_canvas_animation_player.c
@@ -83,7 +83,7 @@ _animator_cb(void *data)
83 EFL_ANIMATION_PLAYER_ANIMATION_GET(eo_obj, anim); 83 EFL_ANIMATION_PLAYER_ANIMATION_GET(eo_obj, anim);
84 double duration, elapsed_time, vector; 84 double duration, elapsed_time, vector;
85 85
86 if (efl_player_seekable_get(eo_obj)) 86 if (efl_playable_seekable_get(eo_obj))
87 { 87 {
88 pd->time.current = ecore_loop_time_get(); 88 pd->time.current = ecore_loop_time_get();
89 89
@@ -195,7 +195,7 @@ _efl_canvas_animation_player_efl_player_start(Eo *eo_obj,
195 double start_delay; 195 double start_delay;
196 EFL_ANIMATION_PLAYER_ANIMATION_GET(eo_obj, anim); 196 EFL_ANIMATION_PLAYER_ANIMATION_GET(eo_obj, anim);
197 197
198 if (!efl_player_playable_get(eo_obj)) return; 198 if (!efl_playable_get(eo_obj)) return;
199 pd->is_play = EINA_TRUE; 199 pd->is_play = EINA_TRUE;
200 //TODO: check this case is correct 200 //TODO: check this case is correct
201 if (pd->start_delay_timer) return; 201 if (pd->start_delay_timer) return;
@@ -317,7 +317,7 @@ _efl_canvas_animation_player_efl_player_play_get(const Eo *eo_obj EINA_UNUSED,
317} 317}
318 318
319EOLIAN static Eina_Bool 319EOLIAN static Eina_Bool
320_efl_canvas_animation_player_efl_player_playable_get(const Eo *eo_obj, 320_efl_canvas_animation_player_efl_playable_playable_get(const Eo *eo_obj,
321 Efl_Canvas_Animation_Player_Data *pd EINA_UNUSED) 321 Efl_Canvas_Animation_Player_Data *pd EINA_UNUSED)
322{ 322{
323 Efl_Canvas_Animation *anim = efl_animation_player_animation_get(eo_obj); 323 Efl_Canvas_Animation *anim = efl_animation_player_animation_get(eo_obj);
@@ -342,7 +342,7 @@ _efl_canvas_animation_player_efl_player_pos_set(Eo *eo_obj,
342 double sec) 342 double sec)
343{ 343{
344 //TODO: this is not correct 344 //TODO: this is not correct
345 if (!efl_player_seekable_get(eo_obj)) 345 if (!efl_playable_seekable_get(eo_obj))
346 return; 346 return;
347 347
348 EFL_ANIMATION_PLAYER_ANIMATION_GET(eo_obj, anim); 348 EFL_ANIMATION_PLAYER_ANIMATION_GET(eo_obj, anim);
@@ -382,7 +382,7 @@ _efl_canvas_animation_player_efl_player_play_speed_get(const Eo *eo_obj EINA_UNU
382} 382}
383 383
384EOLIAN static double 384EOLIAN static double
385_efl_canvas_animation_player_efl_player_length_get(const Eo *eo_obj, 385_efl_canvas_animation_player_efl_playable_length_get(const Eo *eo_obj,
386 Efl_Canvas_Animation_Player_Data *pd EINA_UNUSED) 386 Efl_Canvas_Animation_Player_Data *pd EINA_UNUSED)
387{ 387{
388 EFL_ANIMATION_PLAYER_ANIMATION_GET(eo_obj, anim); 388 EFL_ANIMATION_PLAYER_ANIMATION_GET(eo_obj, anim);
@@ -390,7 +390,7 @@ _efl_canvas_animation_player_efl_player_length_get(const Eo *eo_obj,
390} 390}
391 391
392EOLIAN static Eina_Bool 392EOLIAN static Eina_Bool
393_efl_canvas_animation_player_efl_player_seekable_get(const Eo *eo_obj EINA_UNUSED, 393_efl_canvas_animation_player_efl_playable_seekable_get(const Eo *eo_obj EINA_UNUSED,
394 Efl_Canvas_Animation_Player_Data *pd EINA_UNUSED) 394 Efl_Canvas_Animation_Player_Data *pd EINA_UNUSED)
395{ 395{
396 EFL_ANIMATION_PLAYER_ANIMATION_GET(eo_obj, anim); 396 EFL_ANIMATION_PLAYER_ANIMATION_GET(eo_obj, anim);