efl/player: progress -> playback_progress
authorMike Blumenkrantz <zmike@samsung.com>
Tue, 24 Sep 2019 18:21:04 +0000 (14:21 -0400)
committerJongmin Lee <jm105.lee@samsung.com>
Wed, 25 Sep 2019 21:11:54 +0000 (06:11 +0900)
no functional changes

ref T7877

Reviewed-by: Cedric BAIL <cedric.bail@free.fr>
Differential Revision: https://phab.enlightenment.org/D10116

src/lib/efl/interfaces/efl_player.eo
src/lib/emotion/efl_canvas_video.eo
src/lib/emotion/emotion_smart.c
src/lib/evas/canvas/efl_canvas_animation_player.c
src/lib/evas/canvas/efl_canvas_animation_player.eo

index a79c9b9..5e991ae 100644 (file)
@@ -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
index 21bb8a3..162e0fc 100644 (file)
@@ -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; }
index 5569e54..9a86bfd 100644 (file)
@@ -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;
 }
index 7db1787..5e2d404 100644 (file)
@@ -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;
index 2b716fc..361dfcb 100644 (file)
@@ -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; }