efl: rename player.position property -> player.pos
position conflicts with gfx.position; this could maybe be named better?
This commit is contained in:
parent
5025569f77
commit
76eb02303a
|
@ -32,7 +32,7 @@ interface Efl.Player
|
||||||
play: bool; [[$true if playing, $false otherwise.]]
|
play: bool; [[$true if playing, $false otherwise.]]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@property position {
|
@property pos {
|
||||||
set {
|
set {
|
||||||
[[Set the position in the media file.
|
[[Set the position in the media file.
|
||||||
|
|
||||||
|
|
|
@ -298,7 +298,7 @@ _efl_ui_video_emotion_get(Eo *obj EINA_UNUSED, Efl_Ui_Video_Data *sd)
|
||||||
EOLIAN static void
|
EOLIAN static void
|
||||||
_efl_ui_video_efl_player_start(Eo *obj, Efl_Ui_Video_Data *sd EINA_UNUSED)
|
_efl_ui_video_efl_player_start(Eo *obj, Efl_Ui_Video_Data *sd EINA_UNUSED)
|
||||||
{
|
{
|
||||||
efl_player_position_set(obj, 0.0);
|
efl_player_pos_set(obj, 0.0);
|
||||||
efl_player_play_set(obj, EINA_TRUE);
|
efl_player_play_set(obj, EINA_TRUE);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -463,13 +463,13 @@ elm_video_is_seekable_get(const Evas_Object *obj)
|
||||||
EAPI void
|
EAPI void
|
||||||
elm_video_play_position_set(Evas_Object *obj, double position)
|
elm_video_play_position_set(Evas_Object *obj, double position)
|
||||||
{
|
{
|
||||||
efl_player_position_set(obj, position);
|
efl_player_pos_set(obj, position);
|
||||||
}
|
}
|
||||||
|
|
||||||
EAPI double
|
EAPI double
|
||||||
elm_video_play_position_get(const Evas_Object *obj)
|
elm_video_play_position_get(const Evas_Object *obj)
|
||||||
{
|
{
|
||||||
return efl_player_position_get(obj);
|
return efl_player_pos_get(obj);
|
||||||
}
|
}
|
||||||
|
|
||||||
EAPI Eina_Bool
|
EAPI Eina_Bool
|
||||||
|
|
|
@ -57,7 +57,7 @@ class Efl.Canvas.Video (Efl.Canvas.Group, Efl.File, Efl.Player, Efl.Image, Efl.I
|
||||||
Efl.Gfx.size { set; }
|
Efl.Gfx.size { set; }
|
||||||
Efl.File.file { get; set; }
|
Efl.File.file { get; set; }
|
||||||
Efl.Player.play { get; set; }
|
Efl.Player.play { get; set; }
|
||||||
Efl.Player.position { get; set; }
|
Efl.Player.pos { get; set; }
|
||||||
Efl.Player.progress { get; }
|
Efl.Player.progress { get; }
|
||||||
Efl.Player.volume { get; set; }
|
Efl.Player.volume { get; set; }
|
||||||
Efl.Player.mute { get; set; }
|
Efl.Player.mute { get; set; }
|
||||||
|
|
|
@ -676,11 +676,11 @@ _efl_canvas_video_efl_player_play_get(Eo *obj EINA_UNUSED, Efl_Canvas_Video_Data
|
||||||
EAPI void
|
EAPI void
|
||||||
emotion_object_position_set(Evas_Object *obj, double sec)
|
emotion_object_position_set(Evas_Object *obj, double sec)
|
||||||
{
|
{
|
||||||
efl_player_position_set(obj, sec);
|
efl_player_pos_set(obj, sec);
|
||||||
}
|
}
|
||||||
|
|
||||||
EOLIAN static void
|
EOLIAN static void
|
||||||
_efl_canvas_video_efl_player_position_set(Eo *obj, Efl_Canvas_Video_Data *sd, double sec)
|
_efl_canvas_video_efl_player_pos_set(Eo *obj, Efl_Canvas_Video_Data *sd, double sec)
|
||||||
{
|
{
|
||||||
DBG("sec=%f", sec);
|
DBG("sec=%f", sec);
|
||||||
if (!sd->engine_instance) return;
|
if (!sd->engine_instance) return;
|
||||||
|
@ -701,11 +701,11 @@ _efl_canvas_video_efl_player_position_set(Eo *obj, Efl_Canvas_Video_Data *sd, do
|
||||||
EAPI double
|
EAPI double
|
||||||
emotion_object_position_get(const Evas_Object *obj)
|
emotion_object_position_get(const Evas_Object *obj)
|
||||||
{
|
{
|
||||||
return efl_player_position_get(obj);
|
return efl_player_pos_get(obj);
|
||||||
}
|
}
|
||||||
|
|
||||||
EOLIAN static double
|
EOLIAN static double
|
||||||
_efl_canvas_video_efl_player_position_get(Eo *obj EINA_UNUSED, Efl_Canvas_Video_Data *sd)
|
_efl_canvas_video_efl_player_pos_get(Eo *obj EINA_UNUSED, Efl_Canvas_Video_Data *sd)
|
||||||
{
|
{
|
||||||
if (!sd->engine_instance) return 0.0;
|
if (!sd->engine_instance) return 0.0;
|
||||||
sd->pos = emotion_engine_instance_pos_get(sd->engine_instance);
|
sd->pos = emotion_engine_instance_pos_get(sd->engine_instance);
|
||||||
|
|
|
@ -275,7 +275,7 @@ _efl_animation_player_efl_player_playable_get(Eo *eo_obj,
|
||||||
}
|
}
|
||||||
|
|
||||||
EOLIAN static double
|
EOLIAN static double
|
||||||
_efl_animation_player_efl_player_position_get(Eo *eo_obj,
|
_efl_animation_player_efl_player_pos_get(Eo *eo_obj,
|
||||||
Efl_Animation_Player_Data *pd EINA_UNUSED)
|
Efl_Animation_Player_Data *pd EINA_UNUSED)
|
||||||
{
|
{
|
||||||
//TODO: this is not correct
|
//TODO: this is not correct
|
||||||
|
@ -286,7 +286,7 @@ _efl_animation_player_efl_player_position_get(Eo *eo_obj,
|
||||||
}
|
}
|
||||||
|
|
||||||
EOLIAN static void
|
EOLIAN static void
|
||||||
_efl_animation_player_efl_player_position_set(Eo *eo_obj,
|
_efl_animation_player_efl_player_pos_set(Eo *eo_obj,
|
||||||
Efl_Animation_Player_Data *pd EINA_UNUSED,
|
Efl_Animation_Player_Data *pd EINA_UNUSED,
|
||||||
double sec)
|
double sec)
|
||||||
{
|
{
|
||||||
|
|
|
@ -39,7 +39,7 @@ class Efl.Animation.Player (Efl.Object, Efl.Player)
|
||||||
Efl.Player.stop;
|
Efl.Player.stop;
|
||||||
Efl.Player.play { get; set; }
|
Efl.Player.play { get; set; }
|
||||||
Efl.Player.playable { get; }
|
Efl.Player.playable { get; }
|
||||||
Efl.Player.position { get; set; }
|
Efl.Player.pos { get; set; }
|
||||||
Efl.Player.progress { get;}
|
Efl.Player.progress { get;}
|
||||||
Efl.Player.play_speed { get; set; }
|
Efl.Player.play_speed { get; set; }
|
||||||
//Efl.Player.volume { get; set; }
|
//Efl.Player.volume { get; set; }
|
||||||
|
|
Loading…
Reference in New Issue