efl/player: pos -> playback_position

ref T7877

Reviewed-by: Cedric BAIL <cedric.bail@free.fr>
Differential Revision: https://phab.enlightenment.org/D10112
This commit is contained in:
Mike Blumenkrantz 2019-09-24 10:02:54 -04:00 committed by Cedric Bail
parent 5c2ea620a1
commit 9b0197e2af
8 changed files with 14 additions and 14 deletions

View File

@ -17,7 +17,7 @@ inline bool is_function_blacklisted(std::string const& c_name)
return
c_name == "efl_event_callback_array_priority_add"
|| c_name == "efl_constructor"
|| c_name == "efl_player_position_get"
|| c_name == "efl_player_playback_position_get"
|| c_name == "efl_ui_widget_focus_set"
|| c_name == "efl_ui_widget_focus_get"
|| c_name == "efl_ui_text_password_get"

View File

@ -24,7 +24,7 @@ interface @beta Efl.Player
play: bool; [[$true if playing, $false otherwise.]]
}
}
@property pos {
@property playback_position {
[[Position in the media file.
This property sets the current position of the media file

View File

@ -66,7 +66,7 @@ _running_cb(void *data, const Efl_Event *ev EINA_UNUSED)
EINA_SAFETY_ON_NULL_RETURN(pd);
//calculate absolut position, multiply pos with 2.0 because duration is only 0.5)
absolut_position = pd->from + (pd->to - pd->from)*(efl_player_pos_get(pd->show)*2.0);
absolut_position = pd->from + (pd->to - pd->from)*(efl_player_playback_position_get(pd->show)*2.0);
efl_event_callback_call(data, EFL_UI_SPOTLIGHT_MANAGER_EVENT_POS_UPDATE, &absolut_position);
}

View File

@ -330,7 +330,7 @@ _efl_ui_video_emotion_get(const 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_pos_set(obj, 0.0);
efl_player_playback_position_set(obj, 0.0);
efl_player_play_set(obj, EINA_TRUE);
}
@ -510,13 +510,13 @@ elm_video_is_seekable_get(const Evas_Object *obj)
EAPI void
elm_video_play_position_set(Evas_Object *obj, double position)
{
efl_player_pos_set(obj, position);
efl_player_playback_position_set(obj, position);
}
EAPI double
elm_video_play_position_get(const Evas_Object *obj)
{
return efl_player_pos_get(obj);
return efl_player_playback_position_get(obj);
}
EAPI Eina_Bool

View File

@ -58,7 +58,7 @@ class @beta Efl.Canvas.Video extends Efl.Canvas.Group
Efl.File.file { set; }
Efl.File.loaded { get; }
Efl.Player.play { get; set; }
Efl.Player.pos { get; set; }
Efl.Player.playback_position { get; set; }
Efl.Player.progress { get; }
Efl.Audio_Control.volume { get; set; }
Efl.Audio_Control.mute { get; set; }

View File

@ -682,11 +682,11 @@ _efl_canvas_video_efl_player_play_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Vide
EAPI void
emotion_object_position_set(Evas_Object *obj, double sec)
{
efl_player_pos_set(obj, sec);
efl_player_playback_position_set(obj, sec);
}
EOLIAN static void
_efl_canvas_video_efl_player_pos_set(Eo *obj, Efl_Canvas_Video_Data *sd, double sec)
_efl_canvas_video_efl_player_playback_position_set(Eo *obj, Efl_Canvas_Video_Data *sd, double sec)
{
DBG("sec=%f", sec);
if (!sd->engine_instance) return;
@ -707,11 +707,11 @@ _efl_canvas_video_efl_player_pos_set(Eo *obj, Efl_Canvas_Video_Data *sd, double
EAPI double
emotion_object_position_get(const Evas_Object *obj)
{
return efl_player_pos_get(obj);
return efl_player_playback_position_get(obj);
}
EOLIAN static double
_efl_canvas_video_efl_player_pos_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Video_Data *sd)
_efl_canvas_video_efl_player_playback_position_get(const 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);

View File

@ -326,7 +326,7 @@ _efl_canvas_animation_player_efl_playable_playable_get(const Eo *eo_obj,
}
EOLIAN static double
_efl_canvas_animation_player_efl_player_pos_get(const Eo *eo_obj,
_efl_canvas_animation_player_efl_player_playback_position_get(const Eo *eo_obj,
Efl_Canvas_Animation_Player_Data *pd EINA_UNUSED)
{
//TODO: this is not correct
@ -337,7 +337,7 @@ _efl_canvas_animation_player_efl_player_pos_get(const Eo *eo_obj,
}
EOLIAN static void
_efl_canvas_animation_player_efl_player_pos_set(Eo *eo_obj,
_efl_canvas_animation_player_efl_player_playback_position_set(Eo *eo_obj,
Efl_Canvas_Animation_Player_Data *pd EINA_UNUSED,
double sec)
{

View File

@ -39,7 +39,7 @@ class @beta Efl.Canvas.Animation_Player extends Efl.Object implements Efl.Player
Efl.Player.stop;
Efl.Player.play { get; set; }
Efl.Playable.playable { get; }
Efl.Player.pos { get; set; }
Efl.Player.playback_position { get; set; }
Efl.Player.progress { get;}
Efl.Player.play_speed { get; set; }
//Efl.Player.volume { get; set; }