summaryrefslogtreecommitdiff
path: root/src/lib/emotion
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@osg.samsung.com>2018-02-14 21:14:52 -0500
committerMike Blumenkrantz <zmike@osg.samsung.com>2018-02-15 13:11:00 -0500
commit76eb02303a092ce336d899d75431d1174c2e3ad4 (patch)
tree61ae97ac68b37b95a29bdae09aa36655d3848665 /src/lib/emotion
parent5025569f77683ad51b29baa064006a84254f98f8 (diff)
efl: rename player.position property -> player.pos
position conflicts with gfx.position; this could maybe be named better?
Diffstat (limited to 'src/lib/emotion')
-rw-r--r--src/lib/emotion/efl_canvas_video.eo2
-rw-r--r--src/lib/emotion/emotion_smart.c8
2 files changed, 5 insertions, 5 deletions
diff --git a/src/lib/emotion/efl_canvas_video.eo b/src/lib/emotion/efl_canvas_video.eo
index f425b0b..859b02c 100644
--- a/src/lib/emotion/efl_canvas_video.eo
+++ b/src/lib/emotion/efl_canvas_video.eo
@@ -57,7 +57,7 @@ class Efl.Canvas.Video (Efl.Canvas.Group, Efl.File, Efl.Player, Efl.Image, Efl.I
57 Efl.Gfx.size { set; } 57 Efl.Gfx.size { set; }
58 Efl.File.file { get; set; } 58 Efl.File.file { get; set; }
59 Efl.Player.play { get; set; } 59 Efl.Player.play { get; set; }
60 Efl.Player.position { get; set; } 60 Efl.Player.pos { get; set; }
61 Efl.Player.progress { get; } 61 Efl.Player.progress { get; }
62 Efl.Player.volume { get; set; } 62 Efl.Player.volume { get; set; }
63 Efl.Player.mute { get; set; } 63 Efl.Player.mute { get; set; }
diff --git a/src/lib/emotion/emotion_smart.c b/src/lib/emotion/emotion_smart.c
index 8feac86..abcdc82 100644
--- a/src/lib/emotion/emotion_smart.c
+++ b/src/lib/emotion/emotion_smart.c
@@ -676,11 +676,11 @@ _efl_canvas_video_efl_player_play_get(Eo *obj EINA_UNUSED, Efl_Canvas_Video_Data
676EAPI void 676EAPI void
677emotion_object_position_set(Evas_Object *obj, double sec) 677emotion_object_position_set(Evas_Object *obj, double sec)
678{ 678{
679 efl_player_position_set(obj, sec); 679 efl_player_pos_set(obj, sec);
680} 680}
681 681
682EOLIAN static void 682EOLIAN static void
683_efl_canvas_video_efl_player_position_set(Eo *obj, Efl_Canvas_Video_Data *sd, double sec) 683_efl_canvas_video_efl_player_pos_set(Eo *obj, Efl_Canvas_Video_Data *sd, double sec)
684{ 684{
685 DBG("sec=%f", sec); 685 DBG("sec=%f", sec);
686 if (!sd->engine_instance) return; 686 if (!sd->engine_instance) return;
@@ -701,11 +701,11 @@ _efl_canvas_video_efl_player_position_set(Eo *obj, Efl_Canvas_Video_Data *sd, do
701EAPI double 701EAPI double
702emotion_object_position_get(const Evas_Object *obj) 702emotion_object_position_get(const Evas_Object *obj)
703{ 703{
704 return efl_player_position_get(obj); 704 return efl_player_pos_get(obj);
705} 705}
706 706
707EOLIAN static double 707EOLIAN static double
708_efl_canvas_video_efl_player_position_get(Eo *obj EINA_UNUSED, Efl_Canvas_Video_Data *sd) 708_efl_canvas_video_efl_player_pos_get(Eo *obj EINA_UNUSED, Efl_Canvas_Video_Data *sd)
709{ 709{
710 if (!sd->engine_instance) return 0.0; 710 if (!sd->engine_instance) return 0.0;
711 sd->pos = emotion_engine_instance_pos_get(sd->engine_instance); 711 sd->pos = emotion_engine_instance_pos_get(sd->engine_instance);