From 76eb02303a092ce336d899d75431d1174c2e3ad4 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Wed, 14 Feb 2018 21:14:52 -0500 Subject: [PATCH] efl: rename player.position property -> player.pos position conflicts with gfx.position; this could maybe be named better? --- src/lib/efl/interfaces/efl_player.eo | 2 +- src/lib/elementary/efl_ui_video.c | 6 +++--- src/lib/emotion/efl_canvas_video.eo | 2 +- src/lib/emotion/emotion_smart.c | 8 ++++---- src/lib/evas/canvas/efl_animation_player.c | 4 ++-- src/lib/evas/canvas/efl_animation_player.eo | 2 +- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/lib/efl/interfaces/efl_player.eo b/src/lib/efl/interfaces/efl_player.eo index 2e977d94be..0353b36752 100644 --- a/src/lib/efl/interfaces/efl_player.eo +++ b/src/lib/efl/interfaces/efl_player.eo @@ -32,7 +32,7 @@ interface Efl.Player play: bool; [[$true if playing, $false otherwise.]] } } - @property position { + @property pos { set { [[Set the position in the media file. diff --git a/src/lib/elementary/efl_ui_video.c b/src/lib/elementary/efl_ui_video.c index 96a68d7218..71e698c623 100644 --- a/src/lib/elementary/efl_ui_video.c +++ b/src/lib/elementary/efl_ui_video.c @@ -298,7 +298,7 @@ _efl_ui_video_emotion_get(Eo *obj EINA_UNUSED, Efl_Ui_Video_Data *sd) EOLIAN static void _efl_ui_video_efl_player_start(Eo *obj, Efl_Ui_Video_Data *sd EINA_UNUSED) { - efl_player_position_set(obj, 0.0); + efl_player_pos_set(obj, 0.0); efl_player_play_set(obj, EINA_TRUE); } @@ -463,13 +463,13 @@ elm_video_is_seekable_get(const Evas_Object *obj) EAPI void elm_video_play_position_set(Evas_Object *obj, double position) { - efl_player_position_set(obj, position); + efl_player_pos_set(obj, position); } EAPI double elm_video_play_position_get(const Evas_Object *obj) { - return efl_player_position_get(obj); + return efl_player_pos_get(obj); } EAPI Eina_Bool diff --git a/src/lib/emotion/efl_canvas_video.eo b/src/lib/emotion/efl_canvas_video.eo index f425b0ba13..859b02cca6 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 Efl.Gfx.size { set; } Efl.File.file { get; set; } Efl.Player.play { get; set; } - Efl.Player.position { get; set; } + Efl.Player.pos { get; set; } Efl.Player.progress { get; } Efl.Player.volume { get; set; } Efl.Player.mute { get; set; } diff --git a/src/lib/emotion/emotion_smart.c b/src/lib/emotion/emotion_smart.c index 8feac862b1..abcdc826f9 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 EAPI void emotion_object_position_set(Evas_Object *obj, double sec) { - efl_player_position_set(obj, sec); + efl_player_pos_set(obj, sec); } EOLIAN static void -_efl_canvas_video_efl_player_position_set(Eo *obj, Efl_Canvas_Video_Data *sd, double sec) +_efl_canvas_video_efl_player_pos_set(Eo *obj, Efl_Canvas_Video_Data *sd, double sec) { DBG("sec=%f", sec); if (!sd->engine_instance) return; @@ -701,11 +701,11 @@ _efl_canvas_video_efl_player_position_set(Eo *obj, Efl_Canvas_Video_Data *sd, do EAPI double emotion_object_position_get(const Evas_Object *obj) { - return efl_player_position_get(obj); + return efl_player_pos_get(obj); } EOLIAN static double -_efl_canvas_video_efl_player_position_get(Eo *obj EINA_UNUSED, Efl_Canvas_Video_Data *sd) +_efl_canvas_video_efl_player_pos_get(Eo *obj EINA_UNUSED, Efl_Canvas_Video_Data *sd) { if (!sd->engine_instance) return 0.0; sd->pos = emotion_engine_instance_pos_get(sd->engine_instance); diff --git a/src/lib/evas/canvas/efl_animation_player.c b/src/lib/evas/canvas/efl_animation_player.c index 8baf84d7a5..50af3d33d6 100644 --- a/src/lib/evas/canvas/efl_animation_player.c +++ b/src/lib/evas/canvas/efl_animation_player.c @@ -275,7 +275,7 @@ _efl_animation_player_efl_player_playable_get(Eo *eo_obj, } EOLIAN static double -_efl_animation_player_efl_player_position_get(Eo *eo_obj, +_efl_animation_player_efl_player_pos_get(Eo *eo_obj, Efl_Animation_Player_Data *pd EINA_UNUSED) { //TODO: this is not correct @@ -286,7 +286,7 @@ _efl_animation_player_efl_player_position_get(Eo *eo_obj, } EOLIAN static void -_efl_animation_player_efl_player_position_set(Eo *eo_obj, +_efl_animation_player_efl_player_pos_set(Eo *eo_obj, Efl_Animation_Player_Data *pd EINA_UNUSED, double sec) { diff --git a/src/lib/evas/canvas/efl_animation_player.eo b/src/lib/evas/canvas/efl_animation_player.eo index b4df306d7e..6dc9ce3b2b 100644 --- a/src/lib/evas/canvas/efl_animation_player.eo +++ b/src/lib/evas/canvas/efl_animation_player.eo @@ -39,7 +39,7 @@ class Efl.Animation.Player (Efl.Object, Efl.Player) Efl.Player.stop; Efl.Player.play { get; set; } Efl.Player.playable { get; } - Efl.Player.position { get; set; } + Efl.Player.pos { get; set; } Efl.Player.progress { get;} Efl.Player.play_speed { get; set; } //Efl.Player.volume { get; set; }