summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@samsung.com>2019-09-24 14:16:13 -0400
committerCedric Bail <cedric.bail@free.fr>2019-09-24 15:23:16 -0700
commitb730443e2dfa8d7092ef51212856c1d7054f0272 (patch)
tree2ee19cbf5140523ce9b23fcb6acb0833c9dfb551
parent3d3cdc5955560726f0b9a8cef492274a1f7254a4 (diff)
efl/player: play_speed -> playback_speed
no functional changes ref T7877 Reviewed-by: Cedric BAIL <cedric.bail@free.fr> Differential Revision: https://phab.enlightenment.org/D10115
-rw-r--r--src/lib/edje/edje_legacy.c4
-rw-r--r--src/lib/edje/edje_smart.c4
-rw-r--r--src/lib/edje/efl_canvas_layout.eo4
-rw-r--r--src/lib/edje/efl_canvas_layout_eo.legacy.h4
-rw-r--r--src/lib/efl/interfaces/efl_player.eo2
-rw-r--r--src/lib/evas/canvas/efl_canvas_animation_player.c4
-rw-r--r--src/lib/evas/canvas/efl_canvas_animation_player.eo2
7 files changed, 12 insertions, 12 deletions
diff --git a/src/lib/edje/edje_legacy.c b/src/lib/edje/edje_legacy.c
index 5f04ead..a93ed06 100644
--- a/src/lib/edje/edje_legacy.c
+++ b/src/lib/edje/edje_legacy.c
@@ -1215,13 +1215,13 @@ EAPI void
1215edje_object_transition_duration_factor_set(Evas_Object *obj, double scale) 1215edje_object_transition_duration_factor_set(Evas_Object *obj, double scale)
1216{ 1216{
1217 if (scale <= 0.0) return; 1217 if (scale <= 0.0) return;
1218 efl_player_play_speed_set(obj, 1.0/scale); 1218 efl_player_playback_speed_set(obj, 1.0/scale);
1219} 1219}
1220 1220
1221EAPI double 1221EAPI double
1222edje_object_transition_duration_factor_get(const Evas_Object *obj) 1222edje_object_transition_duration_factor_get(const Evas_Object *obj)
1223{ 1223{
1224 double speed = efl_player_play_speed_get(obj); 1224 double speed = efl_player_playback_speed_get(obj);
1225 1225
1226 if (speed <= 0.0) speed = 1.0; 1226 if (speed <= 0.0) speed = 1.0;
1227 return 1.0/speed; 1227 return 1.0/speed;
diff --git a/src/lib/edje/edje_smart.c b/src/lib/edje/edje_smart.c
index c0b37db..de2575c 100644
--- a/src/lib/edje/edje_smart.c
+++ b/src/lib/edje/edje_smart.c
@@ -588,14 +588,14 @@ _efl_canvas_layout_efl_player_paused_get(const Eo *obj EINA_UNUSED, Edje *ed)
588} 588}
589 589
590EOLIAN void 590EOLIAN void
591_efl_canvas_layout_efl_player_play_speed_set(Eo *obj EINA_UNUSED, Edje *pd , double speed) 591_efl_canvas_layout_efl_player_playback_speed_set(Eo *obj EINA_UNUSED, Edje *pd , double speed)
592{ 592{
593 if (speed <= 0.0) speed = 1.0; 593 if (speed <= 0.0) speed = 1.0;
594 pd->duration_scale = 1.0/speed; 594 pd->duration_scale = 1.0/speed;
595} 595}
596 596
597EOLIAN double 597EOLIAN double
598_efl_canvas_layout_efl_player_play_speed_get(const Eo *obj EINA_UNUSED, Edje *pd) 598_efl_canvas_layout_efl_player_playback_speed_get(const Eo *obj EINA_UNUSED, Edje *pd)
599{ 599{
600 return 1.0/pd->duration_scale; 600 return 1.0/pd->duration_scale;
601} 601}
diff --git a/src/lib/edje/efl_canvas_layout.eo b/src/lib/edje/efl_canvas_layout.eo
index 5a9f0ac..f037f31 100644
--- a/src/lib/edje/efl_canvas_layout.eo
+++ b/src/lib/edje/efl_canvas_layout.eo
@@ -18,7 +18,7 @@ class @beta Efl.Canvas.Layout extends Efl.Canvas.Group implements Efl.File, Efl.
18 18
19 If animations are disabled, transitions between states (as 19 If animations are disabled, transitions between states (as
20 defined in EDC) are then instantaneous. This is conceptually similar 20 defined in EDC) are then instantaneous. This is conceptually similar
21 to setting the @Efl.Player.play_speed to an infinitely high 21 to setting the @Efl.Player.playback_speed to an infinitely high
22 value. 22 value.
23 ]] 23 ]]
24 get { 24 get {
@@ -128,6 +128,6 @@ class @beta Efl.Canvas.Layout extends Efl.Canvas.Group implements Efl.File, Efl.
128 Efl.Observer.update; 128 Efl.Observer.update;
129 Efl.Playable.playable { get; } 129 Efl.Playable.playable { get; }
130 Efl.Player.paused { get; set; } 130 Efl.Player.paused { get; set; }
131 Efl.Player.play_speed { get; set; } 131 Efl.Player.playback_speed { get; set; }
132 } 132 }
133} 133}
diff --git a/src/lib/edje/efl_canvas_layout_eo.legacy.h b/src/lib/edje/efl_canvas_layout_eo.legacy.h
index 0155eb9..057bd77 100644
--- a/src/lib/edje/efl_canvas_layout_eo.legacy.h
+++ b/src/lib/edje/efl_canvas_layout_eo.legacy.h
@@ -22,7 +22,7 @@ typedef Eo Efl_Canvas_Layout;
22 * 22 *
23 * If animations are disabled, transitions between states (as defined in EDC) 23 * If animations are disabled, transitions between states (as defined in EDC)
24 * are then instantaneous. This is conceptually similar to setting the 24 * are then instantaneous. This is conceptually similar to setting the
25 * @ref Efl.Player.play_speed to an infinitely high value. 25 * @ref Efl.Player.playback_speed to an infinitely high value.
26 * 26 *
27 * Start or stop animating this object. 27 * Start or stop animating this object.
28 * 28 *
@@ -41,7 +41,7 @@ EAPI void edje_object_animation_set(Efl_Canvas_Layout *obj, Eina_Bool on);
41 * 41 *
42 * If animations are disabled, transitions between states (as defined in EDC) 42 * If animations are disabled, transitions between states (as defined in EDC)
43 * are then instantaneous. This is conceptually similar to setting the 43 * are then instantaneous. This is conceptually similar to setting the
44 * @ref Efl.Player.play_speed to an infinitely high value. 44 * @ref Efl.Player.playback_speed to an infinitely high value.
45 * 45 *
46 * Get the current state of animation, @c true by default. 46 * Get the current state of animation, @c true by default.
47 * 47 *
diff --git a/src/lib/efl/interfaces/efl_player.eo b/src/lib/efl/interfaces/efl_player.eo
index bf100a2..a79c9b9 100644
--- a/src/lib/efl/interfaces/efl_player.eo
+++ b/src/lib/efl/interfaces/efl_player.eo
@@ -69,7 +69,7 @@ interface @beta Efl.Player
69 progress: double; [[The progress within the [0, 1] range.]] 69 progress: double; [[The progress within the [0, 1] range.]]
70 } 70 }
71 } 71 }
72 @property play_speed { 72 @property playback_speed {
73 [[Control the play speed of the media file. 73 [[Control the play speed of the media file.
74 74
75 This function control the speed with which the media file will 75 This function control the speed with which the media file will
diff --git a/src/lib/evas/canvas/efl_canvas_animation_player.c b/src/lib/evas/canvas/efl_canvas_animation_player.c
index 45c3be5..7db1787 100644
--- a/src/lib/evas/canvas/efl_canvas_animation_player.c
+++ b/src/lib/evas/canvas/efl_canvas_animation_player.c
@@ -367,7 +367,7 @@ _efl_canvas_animation_player_efl_player_progress_get(const Eo *eo_obj EINA_UNUSE
367} 367}
368 368
369EOLIAN static void 369EOLIAN static void
370_efl_canvas_animation_player_efl_player_play_speed_set(Eo *eo_obj EINA_UNUSED, 370_efl_canvas_animation_player_efl_player_playback_speed_set(Eo *eo_obj EINA_UNUSED,
371 Efl_Canvas_Animation_Player_Data *pd, 371 Efl_Canvas_Animation_Player_Data *pd,
372 double play_speed) 372 double play_speed)
373{ 373{
@@ -378,7 +378,7 @@ _efl_canvas_animation_player_efl_player_play_speed_set(Eo *eo_obj EINA_UNUSED,
378} 378}
379 379
380EOLIAN static double 380EOLIAN static double
381_efl_canvas_animation_player_efl_player_play_speed_get(const Eo *eo_obj EINA_UNUSED, 381_efl_canvas_animation_player_efl_player_playback_speed_get(const Eo *eo_obj EINA_UNUSED,
382 Efl_Canvas_Animation_Player_Data *pd) 382 Efl_Canvas_Animation_Player_Data *pd)
383{ 383{
384 return pd->play_speed; 384 return pd->play_speed;
diff --git a/src/lib/evas/canvas/efl_canvas_animation_player.eo b/src/lib/evas/canvas/efl_canvas_animation_player.eo
index 4bcdf60..2b716fc 100644
--- a/src/lib/evas/canvas/efl_canvas_animation_player.eo
+++ b/src/lib/evas/canvas/efl_canvas_animation_player.eo
@@ -40,7 +40,7 @@ class @beta Efl.Canvas.Animation_Player extends Efl.Object implements Efl.Player
40 Efl.Playable.playable { get; } 40 Efl.Playable.playable { get; }
41 Efl.Player.playback_position { get; set; } 41 Efl.Player.playback_position { get; set; }
42 Efl.Player.progress { get;} 42 Efl.Player.progress { get;}
43 Efl.Player.play_speed { get; set; } 43 Efl.Player.playback_speed { get; set; }
44 //Efl.Player.volume { get; set; } 44 //Efl.Player.volume { get; set; }
45 //Efl.Player.mute { get; set; } 45 //Efl.Player.mute { get; set; }
46 Efl.Playable.length { get; } 46 Efl.Playable.length { get; }