From 4b9d85173b99e2b13d763dc0c878eabb07b379f0 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Tue, 24 Sep 2019 14:21:04 -0400 Subject: [PATCH] efl/player: progress -> playback_progress no functional changes ref T7877 Reviewed-by: Cedric BAIL Differential Revision: https://phab.enlightenment.org/D10116 --- src/lib/efl/interfaces/efl_player.eo | 2 +- src/lib/emotion/efl_canvas_video.eo | 2 +- src/lib/emotion/emotion_smart.c | 4 ++-- src/lib/evas/canvas/efl_canvas_animation_player.c | 4 ++-- src/lib/evas/canvas/efl_canvas_animation_player.eo | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/lib/efl/interfaces/efl_player.eo b/src/lib/efl/interfaces/efl_player.eo index a79c9b965f..5e991aea6e 100644 --- a/src/lib/efl/interfaces/efl_player.eo +++ b/src/lib/efl/interfaces/efl_player.eo @@ -57,7 +57,7 @@ interface @beta Efl.Player sec: double; [[The position (in seconds).]] } } - @property progress { + @property playback_progress { [[How much of the file has been played. This function gets the progress in playing the file, the diff --git a/src/lib/emotion/efl_canvas_video.eo b/src/lib/emotion/efl_canvas_video.eo index 21bb8a362a..162e0fcc27 100644 --- a/src/lib/emotion/efl_canvas_video.eo +++ b/src/lib/emotion/efl_canvas_video.eo @@ -60,7 +60,7 @@ class @beta Efl.Canvas.Video extends Efl.Canvas.Group Efl.Player.playing { get; set; } Efl.Player.paused { get; set; } Efl.Player.playback_position { get; set; } - Efl.Player.progress { get; } + Efl.Player.playback_progress { get; } Efl.Audio_Control.volume { get; set; } Efl.Audio_Control.mute { get; set; } Efl.Playable.length { get; } diff --git a/src/lib/emotion/emotion_smart.c b/src/lib/emotion/emotion_smart.c index 5569e54be6..9a86bfd689 100644 --- a/src/lib/emotion/emotion_smart.c +++ b/src/lib/emotion/emotion_smart.c @@ -1207,11 +1207,11 @@ emotion_object_progress_info_get(const Evas_Object *obj) EAPI double emotion_object_progress_status_get(const Evas_Object *obj) { - return efl_player_progress_get(obj); + return efl_player_playback_progress_get(obj); } EOLIAN static double -_efl_canvas_video_efl_player_progress_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Video_Data *sd) +_efl_canvas_video_efl_player_playback_progress_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Video_Data *sd) { return sd->progress.stat; } diff --git a/src/lib/evas/canvas/efl_canvas_animation_player.c b/src/lib/evas/canvas/efl_canvas_animation_player.c index 7db178754e..5e2d4046a0 100644 --- a/src/lib/evas/canvas/efl_canvas_animation_player.c +++ b/src/lib/evas/canvas/efl_canvas_animation_player.c @@ -336,7 +336,7 @@ _efl_canvas_animation_player_efl_player_playback_position_get(const Eo *eo_obj, Efl_Canvas_Animation *anim = efl_animation_player_animation_get(eo_obj); double length = efl_animation_duration_get(anim); - return length * efl_player_progress_get(eo_obj); + return length * efl_player_playback_progress_get(eo_obj); } EOLIAN static void @@ -360,7 +360,7 @@ _efl_canvas_animation_player_efl_player_playback_position_set(Eo *eo_obj, } EOLIAN static double -_efl_canvas_animation_player_efl_player_progress_get(const Eo *eo_obj EINA_UNUSED, +_efl_canvas_animation_player_efl_player_playback_progress_get(const Eo *eo_obj EINA_UNUSED, Efl_Canvas_Animation_Player_Data *pd) { return pd->progress; diff --git a/src/lib/evas/canvas/efl_canvas_animation_player.eo b/src/lib/evas/canvas/efl_canvas_animation_player.eo index 2b716fc2c0..361dfcbad5 100644 --- a/src/lib/evas/canvas/efl_canvas_animation_player.eo +++ b/src/lib/evas/canvas/efl_canvas_animation_player.eo @@ -39,7 +39,7 @@ class @beta Efl.Canvas.Animation_Player extends Efl.Object implements Efl.Player Efl.Player.paused { get; set; } Efl.Playable.playable { get; } Efl.Player.playback_position { get; set; } - Efl.Player.progress { get;} + Efl.Player.playback_progress { get;} Efl.Player.playback_speed { get; set; } //Efl.Player.volume { get; set; } //Efl.Player.mute { get; set; }