summaryrefslogtreecommitdiff
path: root/src/lib/emotion
diff options
context:
space:
mode:
authorXavi Artigas <xavierartigas@yahoo.es>2018-04-05 17:50:35 +0200
committerCedric Bail <cedric@osg.samsung.com>2018-04-24 09:03:39 -0700
commitc837b321bf23598645773006d98dd01141a0810f (patch)
tree3693169431fe38e7d88489816e2182b469badf0d /src/lib/emotion
parenta28b2ff1d3baa3633433489d06bf9c1f13751297 (diff)
Efl.Image_Load_Controller* (From Efl.Image.Load*)
Ref https://phab.enlightenment.org/T6847 Reviewed-by: Cedric Bail <cedric@osg.samsung.com>
Diffstat (limited to 'src/lib/emotion')
-rw-r--r--src/lib/emotion/efl_canvas_video.eo4
-rw-r--r--src/lib/emotion/emotion_smart.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/emotion/efl_canvas_video.eo b/src/lib/emotion/efl_canvas_video.eo
index 5513a6a..c08720e 100644
--- a/src/lib/emotion/efl_canvas_video.eo
+++ b/src/lib/emotion/efl_canvas_video.eo
@@ -1,4 +1,4 @@
1class Efl.Canvas.Video (Efl.Canvas.Group, Efl.File, Efl.Player, Efl.Image, Efl.Image.Load) 1class Efl.Canvas.Video (Efl.Canvas.Group, Efl.File, Efl.Player, Efl.Image, Efl.Image_Load_Controller)
2{ 2{
3 [[Efl canvas video class]] 3 [[Efl canvas video class]]
4 methods { 4 methods {
@@ -63,7 +63,7 @@ class Efl.Canvas.Video (Efl.Canvas.Group, Efl.File, Efl.Player, Efl.Image, Efl.I
63 Efl.Player.mute { get; set; } 63 Efl.Player.mute { get; set; }
64 Efl.Player.length { get; } 64 Efl.Player.length { get; }
65 Efl.Player.seekable { get; } 65 Efl.Player.seekable { get; }
66 Efl.Image.Load.load_size { get; } 66 Efl.Image_Load_Controller.load_size { get; }
67 Efl.Image.ratio { get; } 67 Efl.Image.ratio { get; }
68 Efl.Image.smooth_scale { get; set; } 68 Efl.Image.smooth_scale { get; set; }
69 } 69 }
diff --git a/src/lib/emotion/emotion_smart.c b/src/lib/emotion/emotion_smart.c
index bc043ec..291a7ec 100644
--- a/src/lib/emotion/emotion_smart.c
+++ b/src/lib/emotion/emotion_smart.c
@@ -740,13 +740,13 @@ emotion_object_size_get(const Evas_Object *obj, int *iw, int *ih)
740{ 740{
741 Eina_Size2D sz; 741 Eina_Size2D sz;
742 742
743 sz = efl_image_load_size_get(obj); 743 sz = efl_image_load_controller_load_size_get(obj);
744 if (iw) *iw = sz.w; 744 if (iw) *iw = sz.w;
745 if (ih) *ih = sz.h; 745 if (ih) *ih = sz.h;
746} 746}
747 747
748EOLIAN static Eina_Size2D 748EOLIAN static Eina_Size2D
749_efl_canvas_video_efl_image_load_load_size_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Video_Data *sd) 749_efl_canvas_video_efl_image_load_controller_load_size_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Video_Data *sd)
750{ 750{
751 // FIXME: Shouldn't this be efl_gfx_view_size instead? 751 // FIXME: Shouldn't this be efl_gfx_view_size instead?
752 return EINA_SIZE2D(sd->video.w, sd->video.h); 752 return EINA_SIZE2D(sd->video.w, sd->video.h);