enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 3 Projects Releases Wiki Activity

Efl.Image_Load_Controller* (From Efl.Image.Load*) 

Ref https://phab.enlightenment.org/T6847

Reviewed-by: Cedric Bail <cedric@osg.samsung.com>
This commit is contained in:
Xavi Artigas 2018-04-05 17:50:35 +02:00 committed by Cedric Bail
parent a28b2ff1d3
commit c837b321bf
12 changed files with 49 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Makefile_Efl.am
View File

@ -22,7 +22,7 @@ efl_eolian_files = \
lib/efl/interfaces/efl_control.eo \
lib/efl/interfaces/efl_duplicate.eo \
lib/efl/interfaces/efl_file.eo \
lib/efl/interfaces/efl_image_load.eo \
lib/efl/interfaces/efl_image_load_controller.eo \
lib/efl/interfaces/efl_part.eo \
lib/efl/interfaces/efl_playable.eo \
lib/efl/interfaces/efl_player.eo \

2
src/lib/efl/Efl.h
View File

@ -74,7 +74,7 @@ typedef Efl_Gfx_Path_Command_Type Efl_Gfx_Path_Command;
#include "interfaces/efl_file.eo.h"
#include "interfaces/efl_image.eo.h"
#include "interfaces/efl_image_animation_controller.eo.h"
#include "interfaces/efl_image_load.eo.h"
#include "interfaces/efl_image_load_controller.eo.h"
#include "interfaces/efl_part.eo.h"
#include "interfaces/efl_playable.eo.h"
#include "interfaces/efl_player.eo.h"

8
src/lib/efl/interfaces/efl_image_load.eo → src/lib/efl/interfaces/efl_image_load_controller.eo
View File

@ -2,18 +2,18 @@ import eina_types;
import efl_gfx_types;
/*
enum Efl.Image.Load.State
enum Efl.Image_Load_Controller_State
{
none = 0, [[Not loading any image.]]
loaded = 1, [[Image data is loaded, nothing is pending.]]
pending = 2, [[The image has been queued for load, but actual loading may not have started yet.]]
loading = 3, [[The image is currently loading.]]
error = 4, [[Image load has failed. Call @Efl.Image.Load.load_error.get to know why.]]
error = 4, [[Image load has failed. Call @Efl.Image_Load_Controller.load_error.get to know why.]]
cancelled = 5 [[Image load has been cancelled.]]
}
*/
interface Efl.Image.Load ()
interface Efl.Image_Load_Controller ()
{
[[Common APIs for all loadable 2D images.]]
@ -44,7 +44,7 @@ interface Efl.Image.Load ()
]]
}
values {
state: Efl.Image.Load.State; [[Image loading status]]
state: Efl.Image_Load_Controller_State; [[Image loading status]]
}
}
*/

2
src/lib/efl/interfaces/efl_interfaces_main.c
View File

@ -13,7 +13,7 @@
#include "interfaces/efl_duplicate.eo.c"
#include "interfaces/efl_image.eo.c"
#include "interfaces/efl_image_animation_controller.eo.c"
#include "interfaces/efl_image_load.eo.c"
#include "interfaces/efl_image_load_controller.eo.c"
#include "interfaces/efl_part.eo.c"
#include "interfaces/efl_playable.eo.c"
#include "interfaces/efl_player.eo.c"

10
src/lib/elementary/efl_ui_bg_widget.c
View File

@ -178,19 +178,19 @@ EAPI void
elm_bg_load_size_set(Evas_Object *obj, int w, int h)
{
EFL_UI_BG_WIDGET_DATA_GET_OR_RETURN(obj, sd);
efl_image_load_size_set(sd->img, EINA_SIZE2D(w, h));
efl_image_load_controller_load_size_set(sd->img, EINA_SIZE2D(w, h));
}
EOLIAN static void
_efl_ui_bg_widget_efl_image_load_load_size_set(Eo *obj EINA_UNUSED, Efl_Ui_Bg_Widget_Data *sd, Eina_Size2D sz)
_efl_ui_bg_widget_efl_image_load_controller_load_size_set(Eo *obj EINA_UNUSED, Efl_Ui_Bg_Widget_Data *sd, Eina_Size2D sz)
{
efl_image_load_size_set(sd->img, sz);
efl_image_load_controller_load_size_set(sd->img, sz);
}
EOLIAN static Eina_Size2D
_efl_ui_bg_widget_efl_image_load_load_size_get(const Eo *obj EINA_UNUSED, Efl_Ui_Bg_Widget_Data *sd)
_efl_ui_bg_widget_efl_image_load_controller_load_size_get(const Eo *obj EINA_UNUSED, Efl_Ui_Bg_Widget_Data *sd)
{
return efl_image_load_size_get(sd->img);
return efl_image_load_controller_load_size_get(sd->img);
}
EAPI Eina_Bool

4
src/lib/elementary/efl_ui_bg_widget.eo
View File

@ -1,4 +1,4 @@
class Efl.Ui.Bg_Widget (Efl.Ui.Layout, Efl.Ui.Bg, Efl.Image.Load)
class Efl.Ui.Bg_Widget (Efl.Ui.Layout, Efl.Ui.Bg, Efl.Image_Load_Controller)
{
[[The bg (background) widget is used for setting (solid) background decorations
@ -14,6 +14,6 @@ class Efl.Ui.Bg_Widget (Efl.Ui.Layout, Efl.Ui.Bg, Efl.Image.Load)
Efl.File.mmap { get; set; }
Efl.Gfx.Color.color { get; set; }
Efl.Image.scale_type { get; set; }
Efl.Image.Load.load_size { get; set; }
Efl.Image_Load_Controller.load_size { get; set; }
}
}

8
src/lib/elementary/efl_ui_image.c
View File

@ -1270,11 +1270,11 @@ elm_image_prescale_set(Evas_Object *obj,
int size)
{
EFL_UI_IMAGE_CHECK(obj);
efl_image_load_size_set(obj, EINA_SIZE2D(size, size));
efl_image_load_controller_load_size_set(obj, EINA_SIZE2D(size, size));
}
EOLIAN static void
_efl_ui_image_efl_image_load_load_size_set(Eo *obj, Efl_Ui_Image_Data *sd, Eina_Size2D sz)
_efl_ui_image_efl_image_load_controller_load_size_set(Eo *obj, Efl_Ui_Image_Data *sd, Eina_Size2D sz)
{
sd->load_size = sz;
_efl_ui_image_load_size_set_internal(obj, sd);
@ -1286,13 +1286,13 @@ elm_image_prescale_get(const Evas_Object *obj)
Eina_Size2D sz;
EFL_UI_IMAGE_CHECK(obj) 0;
sz = efl_image_load_size_get(obj);
sz = efl_image_load_controller_load_size_get(obj);
return MAX(sz.w, sz.h);
}
EOLIAN static Eina_Size2D
_efl_ui_image_efl_image_load_load_size_get(const Eo *obj EINA_UNUSED, Efl_Ui_Image_Data *sd)
_efl_ui_image_efl_image_load_controller_load_size_get(const Eo *obj EINA_UNUSED, Efl_Ui_Image_Data *sd)
{
return sd->load_size;
}

4
src/lib/elementary/efl_ui_image.eo
View File

@ -19,7 +19,7 @@ struct Efl.Ui.Image.Error
}
class Efl.Ui.Image (Efl.Ui.Widget, Efl.Ui.Clickable, Efl.Ui.Draggable,
Efl.File, Efl.Image, Efl.Image.Load, Efl.Player, Efl.Gfx.View,
Efl.File, Efl.Image, Efl.Image_Load_Controller, Efl.Player, Efl.Gfx.View,
Efl.Access.Component, Efl.Access.Widget.Action, Efl.Gfx.Color,
Efl.Orientation,
Efl.Ui.View, Efl.Ui.Model.Connect, Efl.Layout.Calc,
@ -97,7 +97,7 @@ class Efl.Ui.Image (Efl.Ui.Widget, Efl.Ui.Clickable, Efl.Ui.Draggable,
Efl.Gfx.Entity.size { set; }
Efl.Gfx.View.view_size { get; }
Efl.Image.image_size { get; }
Efl.Image.Load.load_size { get; set; }
Efl.Image_Load_Controller.load_size { get; set; }
Efl.Image.smooth_scale { get; set; }
Efl.Image.scale_type { get; set; }
Efl.Orientation.orientation { get; set; }

4
src/lib/emotion/efl_canvas_video.eo
View File

@ -1,4 +1,4 @@
class Efl.Canvas.Video (Efl.Canvas.Group, Efl.File, Efl.Player, Efl.Image, Efl.Image.Load)
class Efl.Canvas.Video (Efl.Canvas.Group, Efl.File, Efl.Player, Efl.Image, Efl.Image_Load_Controller)
{
[[Efl canvas video class]]
methods {
@ -63,7 +63,7 @@ class Efl.Canvas.Video (Efl.Canvas.Group, Efl.File, Efl.Player, Efl.Image, Efl.I
Efl.Player.mute { get; set; }
Efl.Player.length { get; }
Efl.Player.seekable { get; }
Efl.Image.Load.load_size { get; }
Efl.Image_Load_Controller.load_size { get; }
Efl.Image.ratio { get; }
Efl.Image.smooth_scale { get; set; }
}

4
src/lib/emotion/emotion_smart.c
View File

@ -740,13 +740,13 @@ emotion_object_size_get(const Evas_Object *obj, int *iw, int *ih)
{
Eina_Size2D sz;
sz = efl_image_load_size_get(obj);
sz = efl_image_load_controller_load_size_get(obj);
if (iw) *iw = sz.w;
if (ih) *ih = sz.h;
}
EOLIAN static Eina_Size2D
_efl_canvas_video_efl_image_load_load_size_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Video_Data *sd)
_efl_canvas_video_efl_image_load_controller_load_size_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Video_Data *sd)
{
// FIXME: Shouldn't this be efl_gfx_view_size instead?
return EINA_SIZE2D(sd->video.w, sd->video.h);

30
src/lib/evas/canvas/efl_canvas_image.c
View File

@ -111,7 +111,7 @@ _evas_image_load_async_start(Eo *eo_obj)
}
EOLIAN static void
_efl_canvas_image_efl_image_load_load_async_start(Eo *eo_obj, void *_pd EINA_UNUSED EINA_UNUSED)
_efl_canvas_image_efl_image_load_controller_load_async_start(Eo *eo_obj, void *_pd EINA_UNUSED EINA_UNUSED)
{
_evas_image_load_async_start(eo_obj);
}
@ -127,7 +127,7 @@ _evas_image_load_async_cancel(Eo *eo_obj)
}
EOLIAN static void
_efl_canvas_image_efl_image_load_load_async_cancel(Eo *eo_obj, void *_pd EINA_UNUSED EINA_UNUSED)
_efl_canvas_image_efl_image_load_controller_load_async_cancel(Eo *eo_obj, void *_pd EINA_UNUSED EINA_UNUSED)
{
_evas_image_load_async_cancel(eo_obj);
}
@ -155,7 +155,7 @@ _evas_image_load_dpi_set(Eo *eo_obj, double dpi)
}
EOLIAN static void
_efl_canvas_image_efl_image_load_load_dpi_set(Eo *eo_obj, void *_pd EINA_UNUSED EINA_UNUSED, double dpi)
_efl_canvas_image_efl_image_load_controller_load_dpi_set(Eo *eo_obj, void *_pd EINA_UNUSED EINA_UNUSED, double dpi)
{
_evas_image_load_dpi_set(eo_obj, dpi);
}
@ -169,7 +169,7 @@ _evas_image_load_dpi_get(const Eo *eo_obj)
}
EOLIAN static double
_efl_canvas_image_efl_image_load_load_dpi_get(const Eo *eo_obj, void *_pd EINA_UNUSED EINA_UNUSED)
_efl_canvas_image_efl_image_load_controller_load_dpi_get(const Eo *eo_obj, void *_pd EINA_UNUSED EINA_UNUSED)
{
return _evas_image_load_dpi_get(eo_obj);
}
@ -201,7 +201,7 @@ _evas_image_load_size_set(Eo *eo_obj, int w, int h)
}
EOLIAN static void
_efl_canvas_image_efl_image_load_load_size_set(Eo *eo_obj, void *_pd EINA_UNUSED EINA_UNUSED, Eina_Size2D sz)
_efl_canvas_image_efl_image_load_controller_load_size_set(Eo *eo_obj, void *_pd EINA_UNUSED EINA_UNUSED, Eina_Size2D sz)
{
_evas_image_load_size_set(eo_obj, sz.w, sz.h);
}
@ -216,7 +216,7 @@ _evas_image_load_size_get(const Eo *eo_obj, int *w, int *h)
}
EOLIAN static Eina_Size2D
_efl_canvas_image_efl_image_load_load_size_get(const Eo *eo_obj, void *_pd EINA_UNUSED EINA_UNUSED)
_efl_canvas_image_efl_image_load_controller_load_size_get(const Eo *eo_obj, void *_pd EINA_UNUSED EINA_UNUSED)
{
Eina_Size2D sz;
_evas_image_load_size_get(eo_obj, &sz.w, &sz.h);
@ -246,7 +246,7 @@ _evas_image_load_scale_down_set(Eo *eo_obj, int scale_down)
}
EOLIAN static void
_efl_canvas_image_efl_image_load_load_scale_down_set(Eo *eo_obj, void *_pd EINA_UNUSED EINA_UNUSED, int scale_down)
_efl_canvas_image_efl_image_load_controller_load_scale_down_set(Eo *eo_obj, void *_pd EINA_UNUSED EINA_UNUSED, int scale_down)
{
_evas_image_load_scale_down_set(eo_obj, scale_down);
}
@ -260,7 +260,7 @@ _evas_image_load_scale_down_get(const Eo *eo_obj)
}
EOLIAN static int
_efl_canvas_image_efl_image_load_load_scale_down_get(const Eo *eo_obj, void *_pd EINA_UNUSED EINA_UNUSED)
_efl_canvas_image_efl_image_load_controller_load_scale_down_get(const Eo *eo_obj, void *_pd EINA_UNUSED EINA_UNUSED)
{
return _evas_image_load_scale_down_get(eo_obj);
}
@ -273,7 +273,7 @@ _evas_image_load_head_skip_set(const Eo *eo_obj, Eina_Bool skip)
}
EOLIAN static void
_efl_canvas_image_efl_image_load_load_skip_header_set(Eo *eo_obj, void *_pd EINA_UNUSED, Eina_Bool skip)
_efl_canvas_image_efl_image_load_controller_load_skip_header_set(Eo *eo_obj, void *_pd EINA_UNUSED, Eina_Bool skip)
{
_evas_image_load_head_skip_set(eo_obj, skip);
}
@ -286,7 +286,7 @@ _evas_image_load_head_skip_get(const Eo *eo_obj)
}
EOLIAN static Eina_Bool
_efl_canvas_image_efl_image_load_load_skip_header_get(const Eo *eo_obj, void *_pd EINA_UNUSED)
_efl_canvas_image_efl_image_load_controller_load_skip_header_get(const Eo *eo_obj, void *_pd EINA_UNUSED)
{
return _evas_image_load_head_skip_get(eo_obj);
}
@ -320,7 +320,7 @@ _evas_image_load_region_set(Eo *eo_obj, int x, int y, int w, int h)
}
EOLIAN static void
_efl_canvas_image_efl_image_load_load_region_set(Eo *eo_obj, void *_pd EINA_UNUSED EINA_UNUSED, Eina_Rect region)
_efl_canvas_image_efl_image_load_controller_load_region_set(Eo *eo_obj, void *_pd EINA_UNUSED EINA_UNUSED, Eina_Rect region)
{
_evas_image_load_region_set(eo_obj, region.x, region.y, region.w, region.h);
}
@ -337,7 +337,7 @@ _evas_image_load_region_get(const Eo *eo_obj, int *x, int *y, int *w, int *h)
}
EOLIAN static Eina_Rect
_efl_canvas_image_efl_image_load_load_region_get(const Eo *eo_obj, void *_pd EINA_UNUSED EINA_UNUSED)
_efl_canvas_image_efl_image_load_controller_load_region_get(const Eo *eo_obj, void *_pd EINA_UNUSED EINA_UNUSED)
{
Eina_Rect r;
_evas_image_load_region_get(eo_obj, &r.x, &r.y, &r.w, &r.h);
@ -359,7 +359,7 @@ _evas_image_load_orientation_set(Eo *eo_obj, Eina_Bool enable)
}
EOLIAN static void
_efl_canvas_image_efl_image_load_load_orientation_set(Eo *eo_obj, void *_pd EINA_UNUSED EINA_UNUSED, Eina_Bool enable)
_efl_canvas_image_efl_image_load_controller_load_orientation_set(Eo *eo_obj, void *_pd EINA_UNUSED EINA_UNUSED, Eina_Bool enable)
{
_evas_image_load_orientation_set(eo_obj, enable);
}
@ -373,7 +373,7 @@ _evas_image_load_orientation_get(const Eo *eo_obj)
}
EOLIAN static Eina_Bool
_efl_canvas_image_efl_image_load_load_orientation_get(const Eo *eo_obj, void *_pd EINA_UNUSED EINA_UNUSED)
_efl_canvas_image_efl_image_load_controller_load_orientation_get(const Eo *eo_obj, void *_pd EINA_UNUSED EINA_UNUSED)
{
return _evas_image_load_orientation_get(eo_obj);
}
@ -388,7 +388,7 @@ _evas_image_load_region_support_get(const Eo *eo_obj)
}
EOLIAN static Eina_Bool
_efl_canvas_image_efl_image_load_load_region_support_get(const Eo *eo_obj, void *_pd EINA_UNUSED EINA_UNUSED)
_efl_canvas_image_efl_image_load_controller_load_region_support_get(const Eo *eo_obj, void *_pd EINA_UNUSED EINA_UNUSED)
{
return _evas_image_load_region_support_get(eo_obj);
}

20
src/lib/evas/canvas/efl_canvas_image.eo
View File

@ -1,5 +1,5 @@
class Efl.Canvas.Image (Efl.Canvas.Image_Internal, Efl.Gfx.Buffer,
Efl.Image.Load, Efl.Image_Animation_Controller,
Efl.Image_Load_Controller, Efl.Image_Animation_Controller,
Efl.File)
{
[[Low-level Image object.
@ -24,14 +24,14 @@ class Efl.Canvas.Image (Efl.Canvas.Image_Internal, Efl.Gfx.Buffer,
Efl.Image_Animation_Controller.animated_loop_type { get; }
Efl.Image_Animation_Controller.animated_loop_count { get; }
Efl.Image_Animation_Controller.animated_frame_duration { get; }
Efl.Image.Load.load_async_start;
Efl.Image.Load.load_async_cancel;
Efl.Image.Load.load_dpi { get; set; }
Efl.Image.Load.load_size { get; set; }
Efl.Image.Load.load_orientation { get; set; }
Efl.Image.Load.load_scale_down { get; set; }
Efl.Image.Load.load_skip_header { get; set; }
Efl.Image.Load.load_region { get; set; }
Efl.Image.Load.load_region_support { get; }
Efl.Image_Load_Controller.load_async_start;
Efl.Image_Load_Controller.load_async_cancel;
Efl.Image_Load_Controller.load_dpi { get; set; }
Efl.Image_Load_Controller.load_size { get; set; }
Efl.Image_Load_Controller.load_orientation { get; set; }
Efl.Image_Load_Controller.load_scale_down { get; set; }
Efl.Image_Load_Controller.load_skip_header { get; set; }
Efl.Image_Load_Controller.load_region { get; set; }
Efl.Image_Load_Controller.load_region_support { get; }
}
}