summaryrefslogtreecommitdiff
path: root/src/lib/emotion
diff options
context:
space:
mode:
authorXavi Artigas <xavierartigas@yahoo.es>2018-04-19 13:26:59 +0200
committerCedric Bail <cedric@osg.samsung.com>2018-04-24 09:03:40 -0700
commit5697f6e94b69ab1b5dd0e7b2f62b550fa226d56d (patch)
tree1eaf97d0f46d36b47feafbe98901e591c3cb9ccb /src/lib/emotion
parent6073833b903f321dca982c6d79934f9d4df6ebe4 (diff)
Efl.Gfx.Image* (From Efl.Image*)
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.eo8
-rw-r--r--src/lib/emotion/emotion_smart.c16
2 files changed, 12 insertions, 12 deletions
diff --git a/src/lib/emotion/efl_canvas_video.eo b/src/lib/emotion/efl_canvas_video.eo
index c08720e..9bd0c82 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_Controller) 1class Efl.Canvas.Video (Efl.Canvas.Group, Efl.File, Efl.Player, Efl.Gfx.Image, Efl.Gfx.Image_Load_Controller)
2{ 2{
3 [[Efl canvas video class]] 3 [[Efl canvas video class]]
4 methods { 4 methods {
@@ -63,9 +63,9 @@ 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_Controller.load_size { get; } 66 Efl.Gfx.Image_Load_Controller.load_size { get; }
67 Efl.Image.ratio { get; } 67 Efl.Gfx.Image.ratio { get; }
68 Efl.Image.smooth_scale { get; set; } 68 Efl.Gfx.Image.smooth_scale { get; set; }
69 } 69 }
70 events { 70 events {
71 frame,decode; [[Called when the frame was decoded]] 71 frame,decode; [[Called when the frame was decoded]]
diff --git a/src/lib/emotion/emotion_smart.c b/src/lib/emotion/emotion_smart.c
index 291a7ec..d52e27e 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_controller_load_size_get(obj); 743 sz = efl_gfx_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_controller_load_size_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Video_Data *sd) 749_efl_canvas_video_efl_gfx_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);
@@ -755,11 +755,11 @@ _efl_canvas_video_efl_image_load_controller_load_size_get(const Eo *obj EINA_UNU
755EAPI void 755EAPI void
756emotion_object_smooth_scale_set(Evas_Object *obj, Eina_Bool smooth) 756emotion_object_smooth_scale_set(Evas_Object *obj, Eina_Bool smooth)
757{ 757{
758 efl_image_smooth_scale_set(obj, smooth); 758 efl_gfx_image_smooth_scale_set(obj, smooth);
759} 759}
760 760
761EOLIAN static void 761EOLIAN static void
762_efl_canvas_video_efl_image_smooth_scale_set(Eo *obj EINA_UNUSED, Efl_Canvas_Video_Data *sd, Eina_Bool smooth) 762_efl_canvas_video_efl_gfx_image_smooth_scale_set(Eo *obj EINA_UNUSED, Efl_Canvas_Video_Data *sd, Eina_Bool smooth)
763{ 763{
764 evas_object_image_smooth_scale_set(sd->obj, smooth); 764 evas_object_image_smooth_scale_set(sd->obj, smooth);
765} 765}
@@ -767,11 +767,11 @@ _efl_canvas_video_efl_image_smooth_scale_set(Eo *obj EINA_UNUSED, Efl_Canvas_Vid
767EAPI Eina_Bool 767EAPI Eina_Bool
768emotion_object_smooth_scale_get(const Evas_Object *obj) 768emotion_object_smooth_scale_get(const Evas_Object *obj)
769{ 769{
770 return efl_image_smooth_scale_get(obj); 770 return efl_gfx_image_smooth_scale_get(obj);
771} 771}
772 772
773EOLIAN static Eina_Bool 773EOLIAN static Eina_Bool
774_efl_canvas_video_efl_image_smooth_scale_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Video_Data *sd) 774_efl_canvas_video_efl_gfx_image_smooth_scale_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Video_Data *sd)
775{ 775{
776 return evas_object_image_smooth_scale_get(sd->obj); 776 return evas_object_image_smooth_scale_get(sd->obj);
777} 777}
@@ -779,11 +779,11 @@ _efl_canvas_video_efl_image_smooth_scale_get(const Eo *obj EINA_UNUSED, Efl_Canv
779EAPI double 779EAPI double
780emotion_object_ratio_get(const Evas_Object *obj) 780emotion_object_ratio_get(const Evas_Object *obj)
781{ 781{
782 return efl_image_ratio_get(obj); 782 return efl_gfx_image_ratio_get(obj);
783} 783}
784 784
785EOLIAN static double 785EOLIAN static double
786_efl_canvas_video_efl_image_ratio_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Video_Data *sd) 786_efl_canvas_video_efl_gfx_image_ratio_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Video_Data *sd)
787{ 787{
788 if (!sd->engine_instance) return 0.0; 788 if (!sd->engine_instance) return 0.0;
789 return sd->ratio; 789 return sd->ratio;