summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJaehyun Cho <jae_hyun.cho@samsung.com>2017-10-25 14:54:41 +0900
committerJaehyun Cho <jae_hyun.cho@samsung.com>2017-10-25 15:04:59 +0900
commit9d1fad8dc163684a74c31f552ba6b1b603273c49 (patch)
treec395ff63bf0d35e8c759bd6b4db9e958f8406072
parent56a4d3037e38a01903f2f35d45f86103976c0a5e (diff)
efl_animation: Remove duration_only_set and total_duration_set methods
Remove unnecessary methods, duration_only_set and total_duration_set.
-rw-r--r--src/lib/evas/Evas_Internal.h3
-rw-r--r--src/lib/evas/canvas/efl_animation.c25
-rw-r--r--src/lib/evas/canvas/efl_animation.eo8
-rw-r--r--src/lib/evas/canvas/efl_animation_alpha.c3
-rw-r--r--src/lib/evas/canvas/efl_animation_group.c10
-rw-r--r--src/lib/evas/canvas/efl_animation_group_parallel.c19
-rw-r--r--src/lib/evas/canvas/efl_animation_group_sequential.c17
-rw-r--r--src/lib/evas/canvas/efl_animation_object.c33
-rw-r--r--src/lib/evas/canvas/efl_animation_object_group.c12
-rw-r--r--src/lib/evas/canvas/efl_animation_object_group_parallel.c16
-rw-r--r--src/lib/evas/canvas/efl_animation_object_group_sequential.c16
-rw-r--r--src/lib/evas/canvas/efl_animation_object_private.h1
-rw-r--r--src/lib/evas/canvas/efl_animation_private.h1
-rw-r--r--src/lib/evas/canvas/efl_animation_rotate.c3
-rw-r--r--src/lib/evas/canvas/efl_animation_scale.c3
-rw-r--r--src/lib/evas/canvas/efl_animation_translate.c3
16 files changed, 13 insertions, 160 deletions
diff --git a/src/lib/evas/Evas_Internal.h b/src/lib/evas/Evas_Internal.h
index 0ce1d847ba..f2fa838863 100644
--- a/src/lib/evas/Evas_Internal.h
+++ b/src/lib/evas/Evas_Internal.h
@@ -93,9 +93,6 @@ EOAPI Eina_Bool efl_animation_object_final_state_keep_get(const Eo *obj);
93EOAPI void efl_animation_object_duration_set(Eo *obj, double duration); 93EOAPI void efl_animation_object_duration_set(Eo *obj, double duration);
94EOAPI double efl_animation_object_duration_get(const Eo *obj); 94EOAPI double efl_animation_object_duration_get(const Eo *obj);
95 95
96EOAPI void efl_animation_object_duration_only_set(Eo *obj, double duration);
97
98EOAPI void efl_animation_object_total_duration_set(Eo *obj, double total_duration);
99EOAPI double efl_animation_object_total_duration_get(const Eo *obj); 96EOAPI double efl_animation_object_total_duration_get(const Eo *obj);
100 97
101EOAPI void efl_animation_object_start_delay_set(Eo *obj, double delay_time); 98EOAPI void efl_animation_object_start_delay_set(Eo *obj, double delay_time);
diff --git a/src/lib/evas/canvas/efl_animation.c b/src/lib/evas/canvas/efl_animation.c
index 99b8907012..c5c461e0b1 100644
--- a/src/lib/evas/canvas/efl_animation.c
+++ b/src/lib/evas/canvas/efl_animation.c
@@ -27,12 +27,10 @@ _efl_animation_target_get(Eo *eo_obj EINA_UNUSED, Efl_Animation_Data *pd)
27} 27}
28 28
29EOLIAN static void 29EOLIAN static void
30_efl_animation_duration_set(Eo *eo_obj, 30_efl_animation_duration_set(Eo *eo_obj EINA_UNUSED,
31 Efl_Animation_Data *pd, 31 Efl_Animation_Data *pd,
32 double duration) 32 double duration)
33{ 33{
34 efl_animation_total_duration_set(eo_obj, duration);
35
36 pd->duration = duration; 34 pd->duration = duration;
37} 35}
38 36
@@ -42,27 +40,11 @@ _efl_animation_duration_get(Eo *eo_obj EINA_UNUSED, Efl_Animation_Data *pd)
42 return pd->duration; 40 return pd->duration;
43} 41}
44 42
45EOLIAN static void
46_efl_animation_duration_only_set(Eo *eo_obj EINA_UNUSED,
47 Efl_Animation_Data *pd,
48 double duration)
49{
50 pd->duration = duration;
51}
52
53EOLIAN static void
54_efl_animation_total_duration_set(Eo *eo_obj EINA_UNUSED,
55 Efl_Animation_Data *pd,
56 double total_duration)
57{
58 pd->total_duration = total_duration;
59}
60
61EOLIAN static double 43EOLIAN static double
62_efl_animation_total_duration_get(Eo *eo_obj EINA_UNUSED, 44_efl_animation_total_duration_get(Eo *eo_obj EINA_UNUSED,
63 Efl_Animation_Data *pd) 45 Efl_Animation_Data *pd)
64{ 46{
65 return pd->total_duration; 47 return pd->duration;
66} 48}
67 49
68EOLIAN static void 50EOLIAN static void
@@ -97,9 +79,6 @@ _efl_animation_object_create(Eo *eo_obj, Efl_Animation_Data *pd EINA_UNUSED)
97 double duration = efl_animation_duration_get(eo_obj); 79 double duration = efl_animation_duration_get(eo_obj);
98 efl_animation_object_duration_set(anim_obj, duration); 80 efl_animation_object_duration_set(anim_obj, duration);
99 81
100 double total_duration = efl_animation_total_duration_get(eo_obj);
101 efl_animation_object_total_duration_set(anim_obj, total_duration);
102
103 int repeat_count = efl_animation_repeat_count_get(eo_obj); 82 int repeat_count = efl_animation_repeat_count_get(eo_obj);
104 efl_animation_object_repeat_count_set(anim_obj, repeat_count); 83 efl_animation_object_repeat_count_set(anim_obj, repeat_count);
105 84
diff --git a/src/lib/evas/canvas/efl_animation.eo b/src/lib/evas/canvas/efl_animation.eo
index 617a109f67..9b5ca30eb7 100644
--- a/src/lib/evas/canvas/efl_animation.eo
+++ b/src/lib/evas/canvas/efl_animation.eo
@@ -32,15 +32,7 @@ class Efl.Animation (Efl.Object)
32 duration: double; [[Duration value.]] 32 duration: double; [[Duration value.]]
33 } 33 }
34 } 34 }
35 duration_only_set @protected {
36 [[Set duration only without setting total duration.]]
37 params {
38 @in duration: double; [[Duration value.]]
39 }
40 }
41 @property total_duration { 35 @property total_duration {
42 set @protected {
43 }
44 get { 36 get {
45 } 37 }
46 values { 38 values {
diff --git a/src/lib/evas/canvas/efl_animation_alpha.c b/src/lib/evas/canvas/efl_animation_alpha.c
index 8b14a37162..d077120881 100644
--- a/src/lib/evas/canvas/efl_animation_alpha.c
+++ b/src/lib/evas/canvas/efl_animation_alpha.c
@@ -38,9 +38,6 @@ _efl_animation_alpha_efl_animation_object_create(Eo *eo_obj,
38 double duration = efl_animation_duration_get(eo_obj); 38 double duration = efl_animation_duration_get(eo_obj);
39 efl_animation_object_duration_set(anim_obj, duration); 39 efl_animation_object_duration_set(anim_obj, duration);
40 40
41 double total_duration = efl_animation_total_duration_get(eo_obj);
42 efl_animation_object_total_duration_set(anim_obj, total_duration);
43
44 double start_delay_time = efl_animation_start_delay_get(eo_obj); 41 double start_delay_time = efl_animation_start_delay_get(eo_obj);
45 efl_animation_object_start_delay_set(anim_obj, start_delay_time); 42 efl_animation_object_start_delay_set(anim_obj, start_delay_time);
46 43
diff --git a/src/lib/evas/canvas/efl_animation_group.c b/src/lib/evas/canvas/efl_animation_group.c
index 9f1b105c30..2e657e67f1 100644
--- a/src/lib/evas/canvas/efl_animation_group.c
+++ b/src/lib/evas/canvas/efl_animation_group.c
@@ -72,11 +72,7 @@ _efl_animation_group_efl_animation_duration_set(Eo *eo_obj,
72 } 72 }
73 73
74end: 74end:
75 efl_animation_duration_only_set(efl_super(eo_obj, MY_CLASS), duration); 75 efl_animation_duration_set(efl_super(eo_obj, MY_CLASS), duration);
76
77 //efl_animation_total_duration_get() should calculate the new total duration.
78 double total_duration = efl_animation_total_duration_get(eo_obj);
79 efl_animation_total_duration_set(eo_obj, total_duration);
80} 76}
81 77
82EOLIAN static void 78EOLIAN static void
@@ -118,8 +114,8 @@ _efl_animation_group_efl_object_constructor(Eo *eo_obj,
118 pd->animations = NULL; 114 pd->animations = NULL;
119 115
120 //group animation does not affect its child duration by default. 116 //group animation does not affect its child duration by default.
121 efl_animation_duration_only_set(efl_super(eo_obj, MY_CLASS), 117 efl_animation_duration_set(efl_super(eo_obj, MY_CLASS),
122 EFL_ANIMATION_GROUP_DURATION_NONE); 118 EFL_ANIMATION_GROUP_DURATION_NONE);
123 119
124 return eo_obj; 120 return eo_obj;
125} 121}
diff --git a/src/lib/evas/canvas/efl_animation_group_parallel.c b/src/lib/evas/canvas/efl_animation_group_parallel.c
index fc98c0a02d..0e401614e8 100644
--- a/src/lib/evas/canvas/efl_animation_group_parallel.c
+++ b/src/lib/evas/canvas/efl_animation_group_parallel.c
@@ -9,14 +9,6 @@ _efl_animation_group_parallel_efl_animation_group_animation_add(Eo *eo_obj,
9 9
10 efl_animation_group_animation_add(efl_super(eo_obj, MY_CLASS), 10 efl_animation_group_animation_add(efl_super(eo_obj, MY_CLASS),
11 animation); 11 animation);
12
13 /* Total duration is calculated in efl_animation_total_duration_get() based
14 * on the current group animation list.
15 * Therefore, the calculated total duration should be set to update total
16 * duration. */
17 double total_duration =
18 efl_animation_total_duration_get(eo_obj);
19 efl_animation_total_duration_set(eo_obj, total_duration);
20} 12}
21 13
22EOLIAN static void 14EOLIAN static void
@@ -28,14 +20,6 @@ _efl_animation_group_parallel_efl_animation_group_animation_del(Eo *eo_obj,
28 20
29 efl_animation_group_animation_del(efl_super(eo_obj, MY_CLASS), 21 efl_animation_group_animation_del(efl_super(eo_obj, MY_CLASS),
30 animation); 22 animation);
31
32 /* Total duration is calculated in efl_animation_total_duration_get() based
33 * on the current group animation list.
34 * Therefore, the calculated total duration should be set to update total
35 * duration. */
36 double total_duration =
37 efl_animation_total_duration_get(eo_obj);
38 efl_animation_total_duration_set(eo_obj, total_duration);
39} 23}
40 24
41EOLIAN static double 25EOLIAN static double
@@ -95,9 +79,6 @@ _efl_animation_group_parallel_efl_animation_object_create(Eo *eo_obj,
95 double duration = efl_animation_duration_get(eo_obj); 79 double duration = efl_animation_duration_get(eo_obj);
96 efl_animation_object_duration_set(group_anim_obj, duration); 80 efl_animation_object_duration_set(group_anim_obj, duration);
97 81
98 double total_duration = efl_animation_total_duration_get(eo_obj);
99 efl_animation_object_total_duration_set(group_anim_obj, total_duration);
100
101 double start_delay_time = efl_animation_start_delay_get(eo_obj); 82 double start_delay_time = efl_animation_start_delay_get(eo_obj);
102 efl_animation_object_start_delay_set(group_anim_obj, start_delay_time); 83 efl_animation_object_start_delay_set(group_anim_obj, start_delay_time);
103 84
diff --git a/src/lib/evas/canvas/efl_animation_group_sequential.c b/src/lib/evas/canvas/efl_animation_group_sequential.c
index d70974b1d8..8db4928ff4 100644
--- a/src/lib/evas/canvas/efl_animation_group_sequential.c
+++ b/src/lib/evas/canvas/efl_animation_group_sequential.c
@@ -8,13 +8,6 @@ _efl_animation_group_sequential_efl_animation_group_animation_add(Eo *eo_obj,
8 if (!animation) return; 8 if (!animation) return;
9 9
10 efl_animation_group_animation_add(efl_super(eo_obj, MY_CLASS), animation); 10 efl_animation_group_animation_add(efl_super(eo_obj, MY_CLASS), animation);
11
12 /* Total duration is calculated in efl_animation_total_duration_get() based
13 * on the current group animation list.
14 * Therefore, the calculated total duration should be set to update total
15 * duration. */
16 double total_duration = efl_animation_total_duration_get(eo_obj);
17 efl_animation_total_duration_set(eo_obj, total_duration);
18} 11}
19 12
20EOLIAN static void 13EOLIAN static void
@@ -25,13 +18,6 @@ _efl_animation_group_sequential_efl_animation_group_animation_del(Eo *eo_obj,
25 if (!animation) return; 18 if (!animation) return;
26 19
27 efl_animation_group_animation_del(efl_super(eo_obj, MY_CLASS), animation); 20 efl_animation_group_animation_del(efl_super(eo_obj, MY_CLASS), animation);
28
29 /* Total duration is calculated in efl_animation_total_duration_get() based
30 * on the current group animation list.
31 * Therefore, the calculated total duration should be set to update total
32 * duration. */
33 double total_duration = efl_animation_total_duration_get(eo_obj);
34 efl_animation_total_duration_set(eo_obj, total_duration);
35} 21}
36 22
37EOLIAN static double 23EOLIAN static double
@@ -89,9 +75,6 @@ _efl_animation_group_sequential_efl_animation_object_create(Eo *eo_obj,
89 double duration = efl_animation_duration_get(eo_obj); 75 double duration = efl_animation_duration_get(eo_obj);
90 efl_animation_object_duration_set(group_anim_obj, duration); 76 efl_animation_object_duration_set(group_anim_obj, duration);
91 77
92 double total_duration = efl_animation_total_duration_get(eo_obj);
93 efl_animation_object_total_duration_set(group_anim_obj, total_duration);
94
95 double start_delay_time = efl_animation_start_delay_get(eo_obj); 78 double start_delay_time = efl_animation_start_delay_get(eo_obj);
96 efl_animation_object_start_delay_set(group_anim_obj, start_delay_time); 79 efl_animation_object_start_delay_set(group_anim_obj, start_delay_time);
97 80
diff --git a/src/lib/evas/canvas/efl_animation_object.c b/src/lib/evas/canvas/efl_animation_object.c
index d863289615..03c531af02 100644
--- a/src/lib/evas/canvas/efl_animation_object.c
+++ b/src/lib/evas/canvas/efl_animation_object.c
@@ -49,12 +49,10 @@ _efl_animation_object_target_get(Eo *eo_obj EINA_UNUSED,
49} 49}
50 50
51EOLIAN static void 51EOLIAN static void
52_efl_animation_object_duration_set(Eo *eo_obj, 52_efl_animation_object_duration_set(Eo *eo_obj EINA_UNUSED,
53 Efl_Animation_Object_Data *pd, 53 Efl_Animation_Object_Data *pd,
54 double duration) 54 double duration)
55{ 55{
56 efl_animation_object_total_duration_set(eo_obj, duration);
57
58 pd->duration = duration; 56 pd->duration = duration;
59} 57}
60 58
@@ -65,27 +63,11 @@ _efl_animation_object_duration_get(Eo *eo_obj EINA_UNUSED,
65 return pd->duration; 63 return pd->duration;
66} 64}
67 65
68EOLIAN static void
69_efl_animation_object_duration_only_set(Eo *eo_obj EINA_UNUSED,
70 Efl_Animation_Object_Data *pd,
71 double duration)
72{
73 pd->duration = duration;
74}
75
76EOLIAN static void
77_efl_animation_object_total_duration_set(Eo *eo_obj EINA_UNUSED,
78 Efl_Animation_Object_Data *pd,
79 double total_duration)
80{
81 pd->total_duration = total_duration;
82}
83
84EOLIAN static double 66EOLIAN static double
85_efl_animation_object_total_duration_get(Eo *eo_obj EINA_UNUSED, 67_efl_animation_object_total_duration_get(Eo *eo_obj EINA_UNUSED,
86 Efl_Animation_Object_Data *pd) 68 Efl_Animation_Object_Data *pd)
87{ 69{
88 return pd->total_duration; 70 return pd->duration;
89} 71}
90 72
91EOLIAN static void 73EOLIAN static void
@@ -262,7 +244,7 @@ _animator_cb(void *data)
262 244
263 double paused_time = pd->paused_time; 245 double paused_time = pd->paused_time;
264 246
265 double total_duration = pd->total_duration; 247 double total_duration = efl_animation_object_total_duration_get(eo_obj);
266 248
267 pd->time.current = ecore_loop_time_get(); 249 pd->time.current = ecore_loop_time_get();
268 double elapsed_time = pd->time.current - pd->time.begin; 250 double elapsed_time = pd->time.current - pd->time.begin;
@@ -351,7 +333,8 @@ end:
351static void 333static void
352_start(Eo *eo_obj, Efl_Animation_Object_Data *pd) 334_start(Eo *eo_obj, Efl_Animation_Object_Data *pd)
353{ 335{
354 if (pd->total_duration < 0.0) return; 336 double total_duration = efl_animation_object_total_duration_get(eo_obj);
337 if (total_duration < 0.0) return;
355 338
356 //Save the current state of the target 339 //Save the current state of the target
357 efl_animation_object_target_state_save(eo_obj); 340 efl_animation_object_target_state_save(eo_obj);
@@ -511,7 +494,6 @@ _efl_animation_object_efl_object_constructor(Eo *eo_obj,
511 pd->progress = 0.0; 494 pd->progress = 0.0;
512 495
513 pd->duration = 0.0; 496 pd->duration = 0.0;
514 pd->total_duration = 0.0;
515 497
516 pd->repeat_mode = EFL_ANIMATION_OBJECT_REPEAT_MODE_RESTART; 498 pd->repeat_mode = EFL_ANIMATION_OBJECT_REPEAT_MODE_RESTART;
517 pd->repeat_count = 0; 499 pd->repeat_count = 0;
@@ -559,9 +541,6 @@ EOAPI EFL_FUNC_BODY_CONST(efl_animation_object_final_state_keep_get, Eina_Bool,
559EOAPI EFL_VOID_FUNC_BODYV(efl_animation_object_duration_set, EFL_FUNC_CALL(duration), double duration); 541EOAPI EFL_VOID_FUNC_BODYV(efl_animation_object_duration_set, EFL_FUNC_CALL(duration), double duration);
560EOAPI EFL_FUNC_BODY_CONST(efl_animation_object_duration_get, double, 0); 542EOAPI EFL_FUNC_BODY_CONST(efl_animation_object_duration_get, double, 0);
561 543
562EOAPI EFL_VOID_FUNC_BODYV(efl_animation_object_duration_only_set, EFL_FUNC_CALL(duration), double duration);
563
564EOAPI EFL_VOID_FUNC_BODYV(efl_animation_object_total_duration_set, EFL_FUNC_CALL(total_duration), double total_duration);
565EOAPI EFL_FUNC_BODY_CONST(efl_animation_object_total_duration_get, double, 0); 544EOAPI EFL_FUNC_BODY_CONST(efl_animation_object_total_duration_get, double, 0);
566 545
567EOAPI EFL_VOID_FUNC_BODYV(efl_animation_object_start_delay_set, EFL_FUNC_CALL(delay_time), double delay_time); 546EOAPI EFL_VOID_FUNC_BODYV(efl_animation_object_start_delay_set, EFL_FUNC_CALL(delay_time), double delay_time);
@@ -583,8 +562,6 @@ EOAPI EFL_FUNC_BODY_CONST(efl_animation_object_interpolator_get, Efl_Interpolato
583 EFL_OBJECT_OP_FUNC(efl_animation_object_final_state_keep_get, _efl_animation_object_final_state_keep_get), \ 562 EFL_OBJECT_OP_FUNC(efl_animation_object_final_state_keep_get, _efl_animation_object_final_state_keep_get), \
584 EFL_OBJECT_OP_FUNC(efl_animation_object_duration_set, _efl_animation_object_duration_set), \ 563 EFL_OBJECT_OP_FUNC(efl_animation_object_duration_set, _efl_animation_object_duration_set), \
585 EFL_OBJECT_OP_FUNC(efl_animation_object_duration_get, _efl_animation_object_duration_get), \ 564 EFL_OBJECT_OP_FUNC(efl_animation_object_duration_get, _efl_animation_object_duration_get), \
586 EFL_OBJECT_OP_FUNC(efl_animation_object_duration_only_set, _efl_animation_object_duration_only_set), \
587 EFL_OBJECT_OP_FUNC(efl_animation_object_total_duration_set, _efl_animation_object_total_duration_set), \
588 EFL_OBJECT_OP_FUNC(efl_animation_object_total_duration_get, _efl_animation_object_total_duration_get), \ 565 EFL_OBJECT_OP_FUNC(efl_animation_object_total_duration_get, _efl_animation_object_total_duration_get), \
589 EFL_OBJECT_OP_FUNC(efl_animation_object_start_delay_set, _efl_animation_object_start_delay_set), \ 566 EFL_OBJECT_OP_FUNC(efl_animation_object_start_delay_set, _efl_animation_object_start_delay_set), \
590 EFL_OBJECT_OP_FUNC(efl_animation_object_start_delay_get, _efl_animation_object_start_delay_get), \ 567 EFL_OBJECT_OP_FUNC(efl_animation_object_start_delay_get, _efl_animation_object_start_delay_get), \
diff --git a/src/lib/evas/canvas/efl_animation_object_group.c b/src/lib/evas/canvas/efl_animation_object_group.c
index 09d45141c2..b7094d76b8 100644
--- a/src/lib/evas/canvas/efl_animation_object_group.c
+++ b/src/lib/evas/canvas/efl_animation_object_group.c
@@ -74,13 +74,7 @@ _efl_animation_object_group_efl_animation_object_duration_set(Eo *eo_obj,
74 } 74 }
75 75
76end: 76end:
77 efl_animation_object_duration_only_set(efl_super(eo_obj, MY_CLASS), 77 efl_animation_object_duration_set(efl_super(eo_obj, MY_CLASS), duration);
78 duration);
79
80 /* efl_animation_object_total_duration_get() should calculate the new total
81 * duration. */
82 double total_duration = efl_animation_object_total_duration_get(eo_obj);
83 efl_animation_object_total_duration_set(eo_obj, total_duration);
84} 78}
85 79
86EOLIAN static void 80EOLIAN static void
@@ -126,8 +120,8 @@ _efl_animation_object_group_efl_object_constructor(Eo *eo_obj,
126 pd->anim_objs = NULL; 120 pd->anim_objs = NULL;
127 121
128 //group animation object does not affect its child duration by default. 122 //group animation object does not affect its child duration by default.
129 efl_animation_object_duration_only_set(efl_super(eo_obj, MY_CLASS), 123 efl_animation_object_duration_set(efl_super(eo_obj, MY_CLASS),
130 EFL_ANIMATION_OBJECT_GROUP_DURATION_NONE); 124 EFL_ANIMATION_OBJECT_GROUP_DURATION_NONE);
131 125
132 return eo_obj; 126 return eo_obj;
133} 127}
diff --git a/src/lib/evas/canvas/efl_animation_object_group_parallel.c b/src/lib/evas/canvas/efl_animation_object_group_parallel.c
index 120b1e5fde..3c9d928d7b 100644
--- a/src/lib/evas/canvas/efl_animation_object_group_parallel.c
+++ b/src/lib/evas/canvas/efl_animation_object_group_parallel.c
@@ -66,14 +66,6 @@ _efl_animation_object_group_parallel_efl_animation_object_group_object_add(Eo *e
66 /* Add member object data and append the data to the member object data 66 /* Add member object data and append the data to the member object data
67 * list. */ 67 * list. */
68 _member_anim_obj_data_add(pd, anim_obj, 0); 68 _member_anim_obj_data_add(pd, anim_obj, 0);
69
70 /* Total duration is calculated in
71 * efl_animation_object_total_duration_get() based on the current group
72 * animation object list.
73 * Therefore, the calculated total duration should be set to update total
74 * duration. */
75 double total_duration = efl_animation_object_total_duration_get(eo_obj);
76 efl_animation_object_total_duration_set(eo_obj, total_duration);
77} 69}
78 70
79EOLIAN static void 71EOLIAN static void
@@ -88,14 +80,6 @@ _efl_animation_object_group_parallel_efl_animation_object_group_object_del(Eo *e
88 /* Delete member object data and remove the data from the member object 80 /* Delete member object data and remove the data from the member object
89 * data list. */ 81 * data list. */
90 _member_anim_obj_data_del(pd, anim_obj); 82 _member_anim_obj_data_del(pd, anim_obj);
91
92 /* Total duration is calculated in
93 * efl_animation_object_total_duration_get() based on the current group
94 * animation object list.
95 * Therefore, the calculated total duration should be set to update total
96 * duration. */
97 double total_duration = efl_animation_object_total_duration_get(eo_obj);
98 efl_animation_object_total_duration_set(eo_obj, total_duration);
99} 83}
100 84
101EOLIAN static double 85EOLIAN static double
diff --git a/src/lib/evas/canvas/efl_animation_object_group_sequential.c b/src/lib/evas/canvas/efl_animation_object_group_sequential.c
index d7f717885b..bc171a830d 100644
--- a/src/lib/evas/canvas/efl_animation_object_group_sequential.c
+++ b/src/lib/evas/canvas/efl_animation_object_group_sequential.c
@@ -68,14 +68,6 @@ _efl_animation_object_group_sequential_efl_animation_object_group_object_add(Eo
68 /* Add member object data and append the data to the member object data 68 /* Add member object data and append the data to the member object data
69 * list. */ 69 * list. */
70 _member_anim_obj_data_add(pd, anim_obj, 0); 70 _member_anim_obj_data_add(pd, anim_obj, 0);
71
72 /* Total duration is calculated in
73 * efl_animation_object_total_duration_get() based on the current group
74 * animation object list.
75 * Therefore, the calculated total duration should be set to update total
76 * duration. */
77 double total_duration = efl_animation_object_total_duration_get(eo_obj);
78 efl_animation_object_total_duration_set(eo_obj, total_duration);
79} 71}
80 72
81EOLIAN static void 73EOLIAN static void
@@ -90,14 +82,6 @@ _efl_animation_object_group_sequential_efl_animation_object_group_object_del(Eo
90 /* Delete member object data and remove the data from the member object 82 /* Delete member object data and remove the data from the member object
91 * data list. */ 83 * data list. */
92 _member_anim_obj_data_del(pd, anim_obj); 84 _member_anim_obj_data_del(pd, anim_obj);
93
94 /* Total duration is calculated in
95 * efl_animation_object_total_duration_get() based on the current group
96 * animation object list.
97 * Therefore, the calculated total duration should be set to update total
98 * duration. */
99 double total_duration = efl_animation_object_total_duration_get(eo_obj);
100 efl_animation_object_total_duration_set(eo_obj, total_duration);
101} 85}
102 86
103EOLIAN static double 87EOLIAN static double
diff --git a/src/lib/evas/canvas/efl_animation_object_private.h b/src/lib/evas/canvas/efl_animation_object_private.h
index 578e478537..27e9d13ea7 100644
--- a/src/lib/evas/canvas/efl_animation_object_private.h
+++ b/src/lib/evas/canvas/efl_animation_object_private.h
@@ -34,7 +34,6 @@ typedef struct _Efl_Animation_Object_Data
34 double progress; 34 double progress;
35 35
36 double duration; 36 double duration;
37 double total_duration;
38 double paused_time; 37 double paused_time;
39 38
40 Efl_Animation_Object_Repeat_Mode repeat_mode; 39 Efl_Animation_Object_Repeat_Mode repeat_mode;
diff --git a/src/lib/evas/canvas/efl_animation_private.h b/src/lib/evas/canvas/efl_animation_private.h
index 0d79ae901e..626eb78eb9 100644
--- a/src/lib/evas/canvas/efl_animation_private.h
+++ b/src/lib/evas/canvas/efl_animation_private.h
@@ -11,7 +11,6 @@ typedef struct _Efl_Animation_Data
11 Efl_Canvas_Object *target; 11 Efl_Canvas_Object *target;
12 12
13 double duration; 13 double duration;
14 double total_duration;
15 14
16 double start_delay_time; 15 double start_delay_time;
17 16
diff --git a/src/lib/evas/canvas/efl_animation_rotate.c b/src/lib/evas/canvas/efl_animation_rotate.c
index 18edfa5465..f1238f71d9 100644
--- a/src/lib/evas/canvas/efl_animation_rotate.c
+++ b/src/lib/evas/canvas/efl_animation_rotate.c
@@ -182,9 +182,6 @@ _efl_animation_rotate_efl_animation_object_create(Eo *eo_obj,
182 double duration = efl_animation_duration_get(eo_obj); 182 double duration = efl_animation_duration_get(eo_obj);
183 efl_animation_object_duration_set(anim_obj, duration); 183 efl_animation_object_duration_set(anim_obj, duration);
184 184
185 double total_duration = efl_animation_total_duration_get(eo_obj);
186 efl_animation_object_total_duration_set(anim_obj, total_duration);
187
188 double start_delay_time = efl_animation_start_delay_get(eo_obj); 185 double start_delay_time = efl_animation_start_delay_get(eo_obj);
189 efl_animation_object_start_delay_set(anim_obj, start_delay_time); 186 efl_animation_object_start_delay_set(anim_obj, start_delay_time);
190 187
diff --git a/src/lib/evas/canvas/efl_animation_scale.c b/src/lib/evas/canvas/efl_animation_scale.c
index da676910b6..c34ddf7e8b 100644
--- a/src/lib/evas/canvas/efl_animation_scale.c
+++ b/src/lib/evas/canvas/efl_animation_scale.c
@@ -208,9 +208,6 @@ _efl_animation_scale_efl_animation_object_create(Eo *eo_obj,
208 double duration = efl_animation_duration_get(eo_obj); 208 double duration = efl_animation_duration_get(eo_obj);
209 efl_animation_object_duration_set(anim_obj, duration); 209 efl_animation_object_duration_set(anim_obj, duration);
210 210
211 double total_duration = efl_animation_total_duration_get(eo_obj);
212 efl_animation_object_total_duration_set(anim_obj, total_duration);
213
214 double start_delay_time = efl_animation_start_delay_get(eo_obj); 211 double start_delay_time = efl_animation_start_delay_get(eo_obj);
215 efl_animation_object_start_delay_set(anim_obj, start_delay_time); 212 efl_animation_object_start_delay_set(anim_obj, start_delay_time);
216 213
diff --git a/src/lib/evas/canvas/efl_animation_translate.c b/src/lib/evas/canvas/efl_animation_translate.c
index 074971d294..4dad1d87ea 100644
--- a/src/lib/evas/canvas/efl_animation_translate.c
+++ b/src/lib/evas/canvas/efl_animation_translate.c
@@ -150,9 +150,6 @@ _efl_animation_translate_efl_animation_object_create(Eo *eo_obj,
150 double duration = efl_animation_duration_get(eo_obj); 150 double duration = efl_animation_duration_get(eo_obj);
151 efl_animation_object_duration_set(anim_obj, duration); 151 efl_animation_object_duration_set(anim_obj, duration);
152 152
153 double total_duration = efl_animation_total_duration_get(eo_obj);
154 efl_animation_object_total_duration_set(anim_obj, total_duration);
155
156 double start_delay_time = efl_animation_start_delay_get(eo_obj); 153 double start_delay_time = efl_animation_start_delay_get(eo_obj);
157 efl_animation_object_start_delay_set(anim_obj, start_delay_time); 154 efl_animation_object_start_delay_set(anim_obj, start_delay_time);
158 155