summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@samsung.com>2019-09-24 10:02:54 -0400
committerCedric Bail <cedric.bail@free.fr>2019-09-24 15:23:11 -0700
commit9b0197e2afbfca7ffa94f09ff5cac8fa9c7fe413 (patch)
treea9106b759181da477e35608510b93401ba1c8c24 /src
parent5c2ea620a18cea0d02fe5ae3315913448828e77e (diff)
efl/player: pos -> playback_position
ref T7877 Reviewed-by: Cedric BAIL <cedric.bail@free.fr> Differential Revision: https://phab.enlightenment.org/D10112
Diffstat (limited to 'src')
-rw-r--r--src/bin/eolian_mono/eolian/mono/blacklist.hh2
-rw-r--r--src/lib/efl/interfaces/efl_player.eo2
-rw-r--r--src/lib/elementary/efl_ui_spotlight_manager_stack.c2
-rw-r--r--src/lib/elementary/efl_ui_video.c6
-rw-r--r--src/lib/emotion/efl_canvas_video.eo2
-rw-r--r--src/lib/emotion/emotion_smart.c8
-rw-r--r--src/lib/evas/canvas/efl_canvas_animation_player.c4
-rw-r--r--src/lib/evas/canvas/efl_canvas_animation_player.eo2
8 files changed, 14 insertions, 14 deletions
diff --git a/src/bin/eolian_mono/eolian/mono/blacklist.hh b/src/bin/eolian_mono/eolian/mono/blacklist.hh
index c46f2f4..95a5000 100644
--- a/src/bin/eolian_mono/eolian/mono/blacklist.hh
+++ b/src/bin/eolian_mono/eolian/mono/blacklist.hh
@@ -17,7 +17,7 @@ inline bool is_function_blacklisted(std::string const& c_name)
17 return 17 return
18 c_name == "efl_event_callback_array_priority_add" 18 c_name == "efl_event_callback_array_priority_add"
19 || c_name == "efl_constructor" 19 || c_name == "efl_constructor"
20 || c_name == "efl_player_position_get" 20 || c_name == "efl_player_playback_position_get"
21 || c_name == "efl_ui_widget_focus_set" 21 || c_name == "efl_ui_widget_focus_set"
22 || c_name == "efl_ui_widget_focus_get" 22 || c_name == "efl_ui_widget_focus_get"
23 || c_name == "efl_ui_text_password_get" 23 || c_name == "efl_ui_text_password_get"
diff --git a/src/lib/efl/interfaces/efl_player.eo b/src/lib/efl/interfaces/efl_player.eo
index 3ff0649..2581bb5 100644
--- a/src/lib/efl/interfaces/efl_player.eo
+++ b/src/lib/efl/interfaces/efl_player.eo
@@ -24,7 +24,7 @@ interface @beta Efl.Player
24 play: bool; [[$true if playing, $false otherwise.]] 24 play: bool; [[$true if playing, $false otherwise.]]
25 } 25 }
26 } 26 }
27 @property pos { 27 @property playback_position {
28 [[Position in the media file. 28 [[Position in the media file.
29 29
30 This property sets the current position of the media file 30 This property sets the current position of the media file
diff --git a/src/lib/elementary/efl_ui_spotlight_manager_stack.c b/src/lib/elementary/efl_ui_spotlight_manager_stack.c
index 18756c0..501df21 100644
--- a/src/lib/elementary/efl_ui_spotlight_manager_stack.c
+++ b/src/lib/elementary/efl_ui_spotlight_manager_stack.c
@@ -66,7 +66,7 @@ _running_cb(void *data, const Efl_Event *ev EINA_UNUSED)
66 66
67 EINA_SAFETY_ON_NULL_RETURN(pd); 67 EINA_SAFETY_ON_NULL_RETURN(pd);
68 //calculate absolut position, multiply pos with 2.0 because duration is only 0.5) 68 //calculate absolut position, multiply pos with 2.0 because duration is only 0.5)
69 absolut_position = pd->from + (pd->to - pd->from)*(efl_player_pos_get(pd->show)*2.0); 69 absolut_position = pd->from + (pd->to - pd->from)*(efl_player_playback_position_get(pd->show)*2.0);
70 efl_event_callback_call(data, EFL_UI_SPOTLIGHT_MANAGER_EVENT_POS_UPDATE, &absolut_position); 70 efl_event_callback_call(data, EFL_UI_SPOTLIGHT_MANAGER_EVENT_POS_UPDATE, &absolut_position);
71} 71}
72 72
diff --git a/src/lib/elementary/efl_ui_video.c b/src/lib/elementary/efl_ui_video.c
index e29ce9a..1e26bba 100644
--- a/src/lib/elementary/efl_ui_video.c
+++ b/src/lib/elementary/efl_ui_video.c
@@ -330,7 +330,7 @@ _efl_ui_video_emotion_get(const Eo *obj EINA_UNUSED, Efl_Ui_Video_Data *sd)
330EOLIAN static void 330EOLIAN static void
331_efl_ui_video_efl_player_start(Eo *obj, Efl_Ui_Video_Data *sd EINA_UNUSED) 331_efl_ui_video_efl_player_start(Eo *obj, Efl_Ui_Video_Data *sd EINA_UNUSED)
332{ 332{
333 efl_player_pos_set(obj, 0.0); 333 efl_player_playback_position_set(obj, 0.0);
334 efl_player_play_set(obj, EINA_TRUE); 334 efl_player_play_set(obj, EINA_TRUE);
335} 335}
336 336
@@ -510,13 +510,13 @@ elm_video_is_seekable_get(const Evas_Object *obj)
510EAPI void 510EAPI void
511elm_video_play_position_set(Evas_Object *obj, double position) 511elm_video_play_position_set(Evas_Object *obj, double position)
512{ 512{
513 efl_player_pos_set(obj, position); 513 efl_player_playback_position_set(obj, position);
514} 514}
515 515
516EAPI double 516EAPI double
517elm_video_play_position_get(const Evas_Object *obj) 517elm_video_play_position_get(const Evas_Object *obj)
518{ 518{
519 return efl_player_pos_get(obj); 519 return efl_player_playback_position_get(obj);
520} 520}
521 521
522EAPI Eina_Bool 522EAPI Eina_Bool
diff --git a/src/lib/emotion/efl_canvas_video.eo b/src/lib/emotion/efl_canvas_video.eo
index 3e14920..d8bb286 100644
--- a/src/lib/emotion/efl_canvas_video.eo
+++ b/src/lib/emotion/efl_canvas_video.eo
@@ -58,7 +58,7 @@ class @beta Efl.Canvas.Video extends Efl.Canvas.Group
58 Efl.File.file { set; } 58 Efl.File.file { set; }
59 Efl.File.loaded { get; } 59 Efl.File.loaded { get; }
60 Efl.Player.play { get; set; } 60 Efl.Player.play { get; set; }
61 Efl.Player.pos { get; set; } 61 Efl.Player.playback_position { get; set; }
62 Efl.Player.progress { get; } 62 Efl.Player.progress { get; }
63 Efl.Audio_Control.volume { get; set; } 63 Efl.Audio_Control.volume { get; set; }
64 Efl.Audio_Control.mute { get; set; } 64 Efl.Audio_Control.mute { get; set; }
diff --git a/src/lib/emotion/emotion_smart.c b/src/lib/emotion/emotion_smart.c
index 9a30bed..e5183ea 100644
--- a/src/lib/emotion/emotion_smart.c
+++ b/src/lib/emotion/emotion_smart.c
@@ -682,11 +682,11 @@ _efl_canvas_video_efl_player_play_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Vide
682EAPI void 682EAPI void
683emotion_object_position_set(Evas_Object *obj, double sec) 683emotion_object_position_set(Evas_Object *obj, double sec)
684{ 684{
685 efl_player_pos_set(obj, sec); 685 efl_player_playback_position_set(obj, sec);
686} 686}
687 687
688EOLIAN static void 688EOLIAN static void
689_efl_canvas_video_efl_player_pos_set(Eo *obj, Efl_Canvas_Video_Data *sd, double sec) 689_efl_canvas_video_efl_player_playback_position_set(Eo *obj, Efl_Canvas_Video_Data *sd, double sec)
690{ 690{
691 DBG("sec=%f", sec); 691 DBG("sec=%f", sec);
692 if (!sd->engine_instance) return; 692 if (!sd->engine_instance) return;
@@ -707,11 +707,11 @@ _efl_canvas_video_efl_player_pos_set(Eo *obj, Efl_Canvas_Video_Data *sd, double
707EAPI double 707EAPI double
708emotion_object_position_get(const Evas_Object *obj) 708emotion_object_position_get(const Evas_Object *obj)
709{ 709{
710 return efl_player_pos_get(obj); 710 return efl_player_playback_position_get(obj);
711} 711}
712 712
713EOLIAN static double 713EOLIAN static double
714_efl_canvas_video_efl_player_pos_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Video_Data *sd) 714_efl_canvas_video_efl_player_playback_position_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Video_Data *sd)
715{ 715{
716 if (!sd->engine_instance) return 0.0; 716 if (!sd->engine_instance) return 0.0;
717 sd->pos = emotion_engine_instance_pos_get(sd->engine_instance); 717 sd->pos = emotion_engine_instance_pos_get(sd->engine_instance);
diff --git a/src/lib/evas/canvas/efl_canvas_animation_player.c b/src/lib/evas/canvas/efl_canvas_animation_player.c
index 2dc7d55..ea49297 100644
--- a/src/lib/evas/canvas/efl_canvas_animation_player.c
+++ b/src/lib/evas/canvas/efl_canvas_animation_player.c
@@ -326,7 +326,7 @@ _efl_canvas_animation_player_efl_playable_playable_get(const Eo *eo_obj,
326} 326}
327 327
328EOLIAN static double 328EOLIAN static double
329_efl_canvas_animation_player_efl_player_pos_get(const Eo *eo_obj, 329_efl_canvas_animation_player_efl_player_playback_position_get(const Eo *eo_obj,
330 Efl_Canvas_Animation_Player_Data *pd EINA_UNUSED) 330 Efl_Canvas_Animation_Player_Data *pd EINA_UNUSED)
331{ 331{
332 //TODO: this is not correct 332 //TODO: this is not correct
@@ -337,7 +337,7 @@ _efl_canvas_animation_player_efl_player_pos_get(const Eo *eo_obj,
337} 337}
338 338
339EOLIAN static void 339EOLIAN static void
340_efl_canvas_animation_player_efl_player_pos_set(Eo *eo_obj, 340_efl_canvas_animation_player_efl_player_playback_position_set(Eo *eo_obj,
341 Efl_Canvas_Animation_Player_Data *pd EINA_UNUSED, 341 Efl_Canvas_Animation_Player_Data *pd EINA_UNUSED,
342 double sec) 342 double sec)
343{ 343{
diff --git a/src/lib/evas/canvas/efl_canvas_animation_player.eo b/src/lib/evas/canvas/efl_canvas_animation_player.eo
index ffec283..6e739b5 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
39 Efl.Player.stop; 39 Efl.Player.stop;
40 Efl.Player.play { get; set; } 40 Efl.Player.play { get; set; }
41 Efl.Playable.playable { get; } 41 Efl.Playable.playable { get; }
42 Efl.Player.pos { get; set; } 42 Efl.Player.playback_position { get; set; }
43 Efl.Player.progress { get;} 43 Efl.Player.progress { get;}
44 Efl.Player.play_speed { get; set; } 44 Efl.Player.play_speed { get; set; }
45 //Efl.Player.volume { get; set; } 45 //Efl.Player.volume { get; set; }