summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--src/Makefile_Efl.am2
-rw-r--r--src/lib/efl/Efl.h4
-rw-r--r--src/lib/efl/interfaces/efl_gfx_frame_controller.eo (renamed from src/lib/efl/interfaces/efl_gfx_image_animation_controller.eo)57
-rw-r--r--src/lib/efl/interfaces/efl_interfaces_main.c2
-rw-r--r--src/lib/efl/interfaces/meson.build2
-rw-r--r--src/lib/evas/canvas/efl_canvas_image.c22
-rw-r--r--src/lib/evas/canvas/efl_canvas_image.eo14
-rw-r--r--src/lib/evas/canvas/evas_image_private.h2
8 files changed, 51 insertions, 54 deletions
diff --git a/src/Makefile_Efl.am b/src/Makefile_Efl.am
index 2d65f20a46..ada411a1d5 100644
--- a/src/Makefile_Efl.am
+++ b/src/Makefile_Efl.am
@@ -4,7 +4,7 @@ efl_eolian_legacy_files = \
4 lib/efl/interfaces/efl_gfx_entity.eo \ 4 lib/efl/interfaces/efl_gfx_entity.eo \
5 lib/efl/interfaces/efl_gfx_color.eo \ 5 lib/efl/interfaces/efl_gfx_color.eo \
6 lib/efl/interfaces/efl_gfx_image.eo \ 6 lib/efl/interfaces/efl_gfx_image.eo \
7 lib/efl/interfaces/efl_gfx_image_animation_controller.eo \ 7 lib/efl/interfaces/efl_gfx_frame_controller.eo \
8 lib/efl/interfaces/efl_input_device.eo \ 8 lib/efl/interfaces/efl_input_device.eo \
9 lib/efl/interfaces/efl_ui_draggable.eo \ 9 lib/efl/interfaces/efl_ui_draggable.eo \
10 lib/efl/interfaces/efl_ui_clickable.eo \ 10 lib/efl/interfaces/efl_ui_clickable.eo \
diff --git a/src/lib/efl/Efl.h b/src/lib/efl/Efl.h
index 46bd09b4ee..f4c79916ab 100644
--- a/src/lib/efl/Efl.h
+++ b/src/lib/efl/Efl.h
@@ -86,7 +86,7 @@ typedef Efl_Gfx_Path_Command_Type Efl_Gfx_Path_Command;
86#include "interfaces/efl_duplicate.eo.h" 86#include "interfaces/efl_duplicate.eo.h"
87#include "interfaces/efl_file.eo.h" 87#include "interfaces/efl_file.eo.h"
88#include "interfaces/efl_gfx_image.eo.h" 88#include "interfaces/efl_gfx_image.eo.h"
89#include "interfaces/efl_gfx_image_animation_controller.eo.h" 89#include "interfaces/efl_gfx_frame_controller.eo.h"
90#include "interfaces/efl_gfx_image_load_controller.eo.h" 90#include "interfaces/efl_gfx_image_load_controller.eo.h"
91#include "interfaces/efl_part.eo.h" 91#include "interfaces/efl_part.eo.h"
92#include "interfaces/efl_playable.eo.h" 92#include "interfaces/efl_playable.eo.h"
@@ -227,7 +227,7 @@ EAPI Eina_Future *efl_ui_view_factory_create_with_event(Efl_Ui_Factory *factory,
227#include "interfaces/efl_gfx_fill.eo.legacy.h" 227#include "interfaces/efl_gfx_fill.eo.legacy.h"
228#include "interfaces/efl_gfx_entity.eo.legacy.h" 228#include "interfaces/efl_gfx_entity.eo.legacy.h"
229#include "interfaces/efl_gfx_image.eo.legacy.h" 229#include "interfaces/efl_gfx_image.eo.legacy.h"
230#include "interfaces/efl_gfx_image_animation_controller.eo.legacy.h" 230#include "interfaces/efl_gfx_frame_controller.eo.legacy.h"
231#include "interfaces/efl_input_device.eo.legacy.h" 231#include "interfaces/efl_input_device.eo.legacy.h"
232#include "interfaces/efl_text_types.eot.h" 232#include "interfaces/efl_text_types.eot.h"
233#endif 233#endif
diff --git a/src/lib/efl/interfaces/efl_gfx_image_animation_controller.eo b/src/lib/efl/interfaces/efl_gfx_frame_controller.eo
index ef11fe6d4d..dcb54f6eea 100644
--- a/src/lib/efl/interfaces/efl_gfx_image_animation_controller.eo
+++ b/src/lib/efl/interfaces/efl_gfx_frame_controller.eo
@@ -1,42 +1,39 @@
1/* FIXME: invalid type from evas/emile! */ 1/* FIXME: invalid type from evas/emile! */
2/* type @extern Evas.Animated_Loop_Hint: int; */ 2/* type @extern Evas.Animated_Loop_Hint: int; */
3 3
4enum Efl.Gfx.Image_Animation_Controller_Loop_Hint { 4enum Efl.Gfx.Frame_Controller_Loop_Hint {
5 [[Image animation loop modes]] 5 [[Frame loop modes]]
6 none = 0, [[No looping order specified.]] 6 none = 0, [[No looping order specified.]]
7 loop = 1, [[Standard loop: 1->2->3->1->2->3->1]] 7 loop = 1, [[Standard loop: 1->2->3->1->2->3->1]]
8 pingpong = 2 [[Ping-pong bouncing loop: 1->2->3->2->1->2->3->1]] 8 pingpong = 2 [[Ping-pong bouncing loop: 1->2->3->2->1->2->3->1]]
9} 9}
10 10
11/* FIXME: rename to Efl.Gfx.Image_Animation_Controller when eo/eolian are fixed */ 11interface Efl.Gfx.Frame_Controller
12
13interface Efl.Gfx.Image_Animation_Controller
14{ 12{
15 [[Efl animated image interface]] 13 [[Efl frame controller of frame based animated object interface.]]
16 eo_prefix: efl_gfx_image;
17 14
18 methods { 15 methods {
19 @property animated { 16 @property animated {
20 get { 17 get {
21 [[Check if an image can be animated (has multiple frames). 18 [[Check if an object can be animated (has multiple frames).
22 19
23 This will be $true for animated Gif files for instance but $false 20 This will be $true for animated object for instance but $false
24 for still images. 21 for still image.
25 22
26 @since 1.1 23 @since 1.1
27 ]] 24 ]]
28 } 25 }
29 values { 26 values {
30 is_animated: bool; [[$true if the image is animated]] 27 is_animated: bool; [[$true if the object is animated]]
31 } 28 }
32 } 29 }
33 @property animated_frame { 30 @property frame {
34 [[Index of the current frame of an animated image. 31 [[Index of the current frame of an animated object.
35 32
36 Ranges from 1 to @.animated_frame_count. Valid only if @.animated. 33 Ranges from 1 to @.frame_count. Valid only if @.animated.
37 ]] 34 ]]
38 set { 35 set {
39 [[Set the frame to current frame of an image object. 36 [[Set the frame to current frame of an animated object.
40 37
41 @since 1.1 38 @since 1.1
42 ]] 39 ]]
@@ -47,43 +44,43 @@ interface Efl.Gfx.Image_Animation_Controller
47 frame_index: int; [[The index of current frame.]] 44 frame_index: int; [[The index of current frame.]]
48 } 45 }
49 } 46 }
50 @property animated_frame_count { 47 @property frame_count {
51 get { 48 get {
52 [[Get the total number of frames of the image, if animated. 49 [[Get the total number of frames of the object, if animated.
53 50
54 Returns -1 if not animated. 51 Returns -1 if not animated.
55 52
56 @since 1.1 53 @since 1.1
57 ]] 54 ]]
58 return: int; [[The number of frames in the animated image.]] 55 return: int; [[The number of frames in the animated object.]]
59 } 56 }
60 } 57 }
61 @property animated_loop_type { 58 @property loop_type {
62 /* FIXME: external type used from evas / emile */ 59 /* FIXME: external type used from evas / emile */
63 get { 60 get {
64 [[Get the kind of looping the image object does. 61 [[Get the kind of looping the animated object does.
65 62
66 This returns the kind of looping the image object wants to do. 63 This returns the kind of looping the animated object wants to do.
67 64
68 If it returns @Efl.Gfx.Image_Animation_Controller_Loop_Hint.loop, you should 65 If it returns @Efl.Gfx.Frame_Controller_Loop_Hint.loop, you should
69 display frames in a sequence like: 1->2->3->1->2->3->1... 66 display frames in a sequence like: 1->2->3->1->2->3->1...
70 67
71 If it returns @Efl.Gfx.Image_Animation_Controller_Loop_Hint.pingpong, it is 68 If it returns @Efl.Gfx.Frame_Controller_Loop_Hint.pingpong, it is
72 better to display frames in a sequence like: 69 better to display frames in a sequence like:
73 1->2->3->2->1->2->3->1... 70 1->2->3->2->1->2->3->1...
74 71
75 The default type is @Efl.Gfx.Image_Animation_Controller_Loop_Hint.loop. 72 The default type is @Efl.Gfx.Frame_Controller_Loop_Hint.loop.
76 73
77 @since 1.1 74 @since 1.1
78 ]] 75 ]]
79 return: Efl.Gfx.Image_Animation_Controller_Loop_Hint; [[Loop type of the image object.]] 76 return: Efl.Gfx.Frame_Controller_Loop_Hint; [[Loop type of the animated object.]]
80 } 77 }
81 } 78 }
82 @property animated_loop_count { 79 @property loop_count {
83 get { 80 get {
84 [[Get the number times the animation of the object loops. 81 [[Get the number times the animation of the object loops.
85 82
86 This returns loop count of image. The loop count is the number 83 This returns loop count of animated object. The loop count is the number
87 of times the animation will play fully from first to last frame 84 of times the animation will play fully from first to last frame
88 until the animation should stop (at the final frame). 85 until the animation should stop (at the final frame).
89 86
@@ -92,10 +89,10 @@ interface Efl.Gfx.Image_Animation_Controller
92 89
93 @since 1.1 90 @since 1.1
94 ]] 91 ]]
95 return: int; [[The number of loop of an animated image object.]] 92 return: int; [[The number of loop of an animated object.]]
96 } 93 }
97 } 94 }
98 @property animated_frame_duration { 95 @property frame_duration {
99 get { 96 get {
100 [[Get the duration of a sequence of frames. 97 [[Get the duration of a sequence of frames.
101 98
@@ -110,7 +107,7 @@ interface Efl.Gfx.Image_Animation_Controller
110 ]] 107 ]]
111 } 108 }
112 keys { 109 keys {
113 start_frame: int; [[The first frame, rangers from 1 to @.animated_frame_count.]] 110 start_frame: int; [[The first frame, rangers from 1 to @.frame_count.]]
114 frame_num: int; [[Number of frames in the sequence, starts from 0.]] 111 frame_num: int; [[Number of frames in the sequence, starts from 0.]]
115 } 112 }
116 values { 113 values {
diff --git a/src/lib/efl/interfaces/efl_interfaces_main.c b/src/lib/efl/interfaces/efl_interfaces_main.c
index 4e6c699950..3e6f983cbd 100644
--- a/src/lib/efl/interfaces/efl_interfaces_main.c
+++ b/src/lib/efl/interfaces/efl_interfaces_main.c
@@ -15,7 +15,7 @@
15#include "interfaces/efl_control.eo.c" 15#include "interfaces/efl_control.eo.c"
16#include "interfaces/efl_duplicate.eo.c" 16#include "interfaces/efl_duplicate.eo.c"
17#include "interfaces/efl_gfx_image.eo.c" 17#include "interfaces/efl_gfx_image.eo.c"
18#include "interfaces/efl_gfx_image_animation_controller.eo.c" 18#include "interfaces/efl_gfx_frame_controller.eo.c"
19#include "interfaces/efl_gfx_image_load_controller.eo.c" 19#include "interfaces/efl_gfx_image_load_controller.eo.c"
20#include "interfaces/efl_part.eo.c" 20#include "interfaces/efl_part.eo.c"
21#include "interfaces/efl_playable.eo.c" 21#include "interfaces/efl_playable.eo.c"
diff --git a/src/lib/efl/interfaces/meson.build b/src/lib/efl/interfaces/meson.build
index 871375776a..e325bdc15d 100644
--- a/src/lib/efl/interfaces/meson.build
+++ b/src/lib/efl/interfaces/meson.build
@@ -5,7 +5,7 @@ pub_legacy_eo_files = [
5 'efl_gfx_entity.eo', 5 'efl_gfx_entity.eo',
6 'efl_gfx_color.eo', 6 'efl_gfx_color.eo',
7 'efl_gfx_image.eo', 7 'efl_gfx_image.eo',
8 'efl_gfx_image_animation_controller.eo', 8 'efl_gfx_frame_controller.eo',
9 'efl_input_device.eo', 9 'efl_input_device.eo',
10 'efl_ui_draggable.eo', 10 'efl_ui_draggable.eo',
11 'efl_ui_clickable.eo', 11 'efl_ui_clickable.eo',
diff --git a/src/lib/evas/canvas/efl_canvas_image.c b/src/lib/evas/canvas/efl_canvas_image.c
index d8da0ff1cd..d00ee659d4 100644
--- a/src/lib/evas/canvas/efl_canvas_image.c
+++ b/src/lib/evas/canvas/efl_canvas_image.c
@@ -409,7 +409,7 @@ _evas_image_animated_get(const Eo *eo_obj)
409} 409}
410 410
411EOLIAN static Eina_Bool 411EOLIAN static Eina_Bool
412_efl_canvas_image_efl_gfx_image_animation_controller_animated_get(const Eo *eo_obj, void *_pd EINA_UNUSED) 412_efl_canvas_image_efl_gfx_frame_controller_animated_get(const Eo *eo_obj, void *_pd EINA_UNUSED)
413{ 413{
414 return _evas_image_animated_get(eo_obj); 414 return _evas_image_animated_get(eo_obj);
415} 415}
@@ -429,12 +429,12 @@ _evas_image_animated_frame_count_get(const Eo *eo_obj)
429} 429}
430 430
431EOLIAN static int 431EOLIAN static int
432_efl_canvas_image_efl_gfx_image_animation_controller_animated_frame_count_get(const Eo *eo_obj, void *_pd EINA_UNUSED) 432_efl_canvas_image_efl_gfx_frame_controller_frame_count_get(const Eo *eo_obj, void *_pd EINA_UNUSED)
433{ 433{
434 return _evas_image_animated_frame_count_get(eo_obj); 434 return _evas_image_animated_frame_count_get(eo_obj);
435} 435}
436 436
437Efl_Gfx_Image_Animation_Controller_Loop_Hint 437Efl_Gfx_Frame_Controller_Loop_Hint
438_evas_image_animated_loop_type_get(const Eo *eo_obj) 438_evas_image_animated_loop_type_get(const Eo *eo_obj)
439{ 439{
440 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); 440 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
@@ -442,13 +442,13 @@ _evas_image_animated_loop_type_get(const Eo *eo_obj)
442 442
443 if (!ENFN->image_animated_loop_type_get || 443 if (!ENFN->image_animated_loop_type_get ||
444 !evas_object_image_animated_get(eo_obj)) 444 !evas_object_image_animated_get(eo_obj))
445 return EFL_GFX_IMAGE_ANIMATION_CONTROLLER_LOOP_HINT_NONE; 445 return EFL_GFX_FRAME_CONTROLLER_LOOP_HINT_NONE;
446 446
447 return (Efl_Gfx_Image_Animation_Controller_Loop_Hint) ENFN->image_animated_loop_type_get(ENC, o->engine_data); 447 return (Efl_Gfx_Frame_Controller_Loop_Hint) ENFN->image_animated_loop_type_get(ENC, o->engine_data);
448} 448}
449 449
450EOLIAN static Efl_Gfx_Image_Animation_Controller_Loop_Hint 450EOLIAN static Efl_Gfx_Frame_Controller_Loop_Hint
451_efl_canvas_image_efl_gfx_image_animation_controller_animated_loop_type_get(const Eo *eo_obj, void *_pd EINA_UNUSED) 451_efl_canvas_image_efl_gfx_frame_controller_loop_type_get(const Eo *eo_obj, void *_pd EINA_UNUSED)
452{ 452{
453 return _evas_image_animated_loop_type_get(eo_obj); 453 return _evas_image_animated_loop_type_get(eo_obj);
454} 454}
@@ -467,7 +467,7 @@ _evas_image_animated_loop_count_get(const Eo *eo_obj)
467} 467}
468 468
469EOLIAN static int 469EOLIAN static int
470_efl_canvas_image_efl_gfx_image_animation_controller_animated_loop_count_get(const Eo *eo_obj, void *_pd EINA_UNUSED) 470_efl_canvas_image_efl_gfx_frame_controller_loop_count_get(const Eo *eo_obj, void *_pd EINA_UNUSED)
471{ 471{
472 return _evas_image_animated_loop_count_get(eo_obj); 472 return _evas_image_animated_loop_count_get(eo_obj);
473} 473}
@@ -491,7 +491,7 @@ _evas_image_animated_frame_duration_get(const Eo *eo_obj, int start_frame, int f
491} 491}
492 492
493EOLIAN static double 493EOLIAN static double
494_efl_canvas_image_efl_gfx_image_animation_controller_animated_frame_duration_get(const Eo *eo_obj, void *_pd EINA_UNUSED, int start_frame, int frame_num) 494_efl_canvas_image_efl_gfx_frame_controller_frame_duration_get(const Eo *eo_obj, void *_pd EINA_UNUSED, int start_frame, int frame_num)
495{ 495{
496 return _evas_image_animated_frame_duration_get(eo_obj, start_frame, frame_num); 496 return _evas_image_animated_frame_duration_get(eo_obj, start_frame, frame_num);
497} 497}
@@ -533,7 +533,7 @@ _evas_image_animated_frame_set(Eo *eo_obj, int frame_index)
533} 533}
534 534
535EOLIAN static Eina_Bool 535EOLIAN static Eina_Bool
536_efl_canvas_image_efl_gfx_image_animation_controller_animated_frame_set(Eo *eo_obj, void *_pd EINA_UNUSED, int frame_index) 536_efl_canvas_image_efl_gfx_frame_controller_frame_set(Eo *eo_obj, void *_pd EINA_UNUSED, int frame_index)
537{ 537{
538 return _evas_image_animated_frame_set(eo_obj, frame_index); 538 return _evas_image_animated_frame_set(eo_obj, frame_index);
539} 539}
@@ -549,7 +549,7 @@ _evas_image_animated_frame_get(const Eo *eo_obj)
549} 549}
550 550
551EOLIAN static int 551EOLIAN static int
552_efl_canvas_image_efl_gfx_image_animation_controller_animated_frame_get(const Eo *eo_obj, void *_pd EINA_UNUSED) 552_efl_canvas_image_efl_gfx_frame_controller_frame_get(const Eo *eo_obj, void *_pd EINA_UNUSED)
553{ 553{
554 return _evas_image_animated_frame_get(eo_obj); 554 return _evas_image_animated_frame_get(eo_obj);
555} 555}
diff --git a/src/lib/evas/canvas/efl_canvas_image.eo b/src/lib/evas/canvas/efl_canvas_image.eo
index 21cdd85876..d49839125c 100644
--- a/src/lib/evas/canvas/efl_canvas_image.eo
+++ b/src/lib/evas/canvas/efl_canvas_image.eo
@@ -1,5 +1,5 @@
1class Efl.Canvas.Image extends Efl.Canvas.Image_Internal implements 1class Efl.Canvas.Image extends Efl.Canvas.Image_Internal implements
2 Efl.Gfx.Image_Load_Controller, Efl.Gfx.Image_Animation_Controller, 2 Efl.Gfx.Image_Load_Controller, Efl.Gfx.Frame_Controller,
3 Efl.File 3 Efl.File
4{ 4{
5 [[Low-level Image object. 5 [[Low-level Image object.
@@ -18,12 +18,12 @@ class Efl.Canvas.Image extends Efl.Canvas.Image_Internal implements
18 Efl.Gfx.Buffer.buffer_unmap; 18 Efl.Gfx.Buffer.buffer_unmap;
19 Efl.File.mmap { get; set; } 19 Efl.File.mmap { get; set; }
20 Efl.File.load_error { get; } 20 Efl.File.load_error { get; }
21 Efl.Gfx.Image_Animation_Controller.animated { get; } 21 Efl.Gfx.Frame_Controller.animated { get; }
22 Efl.Gfx.Image_Animation_Controller.animated_frame { get; set; } 22 Efl.Gfx.Frame_Controller.frame { get; set; }
23 Efl.Gfx.Image_Animation_Controller.animated_frame_count { get; } 23 Efl.Gfx.Frame_Controller.frame_count { get; }
24 Efl.Gfx.Image_Animation_Controller.animated_loop_type { get; } 24 Efl.Gfx.Frame_Controller.loop_type { get; }
25 Efl.Gfx.Image_Animation_Controller.animated_loop_count { get; } 25 Efl.Gfx.Frame_Controller.loop_count { get; }
26 Efl.Gfx.Image_Animation_Controller.animated_frame_duration { get; } 26 Efl.Gfx.Frame_Controller.frame_duration { get; }
27 Efl.Gfx.Image_Load_Controller.load_async_start; 27 Efl.Gfx.Image_Load_Controller.load_async_start;
28 Efl.Gfx.Image_Load_Controller.load_async_cancel; 28 Efl.Gfx.Image_Load_Controller.load_async_cancel;
29 Efl.Gfx.Image_Load_Controller.load_dpi { get; set; } 29 Efl.Gfx.Image_Load_Controller.load_dpi { get; set; }
diff --git a/src/lib/evas/canvas/evas_image_private.h b/src/lib/evas/canvas/evas_image_private.h
index ac7b29c574..ac16b87f5f 100644
--- a/src/lib/evas/canvas/evas_image_private.h
+++ b/src/lib/evas/canvas/evas_image_private.h
@@ -187,7 +187,7 @@ void _evas_image_orientation_set(Eo *eo_obj, Evas_Image_Data *o, Evas_Image_Orie
187/* Efl.Image_Animation_Controller */ 187/* Efl.Image_Animation_Controller */
188Eina_Bool _evas_image_animated_get(const Eo *eo_obj); 188Eina_Bool _evas_image_animated_get(const Eo *eo_obj);
189int _evas_image_animated_frame_count_get(const Eo *eo_obj); 189int _evas_image_animated_frame_count_get(const Eo *eo_obj);
190Efl_Gfx_Image_Animation_Controller_Loop_Hint _evas_image_animated_loop_type_get(const Eo *eo_obj); 190Efl_Gfx_Frame_Controller_Loop_Hint _evas_image_animated_loop_type_get(const Eo *eo_obj);
191int _evas_image_animated_loop_count_get(const Eo *eo_obj); 191int _evas_image_animated_loop_count_get(const Eo *eo_obj);
192double _evas_image_animated_frame_duration_get(const Eo *eo_obj, int start_frame, int frame_num); 192double _evas_image_animated_frame_duration_get(const Eo *eo_obj, int start_frame, int frame_num);
193Eina_Bool _evas_image_animated_frame_set(Eo *eo_obj, int frame_index); 193Eina_Bool _evas_image_animated_frame_set(Eo *eo_obj, int frame_index);