summaryrefslogtreecommitdiff
path: root/src/lib/emotion
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@samsung.com>2019-09-24 09:39:21 -0400
committerCedric Bail <cedric.bail@free.fr>2019-09-24 15:23:09 -0700
commit5c2ea620a18cea0d02fe5ae3315913448828e77e (patch)
tree65600a34470590b571cd513f02f11d709dfdf79a /src/lib/emotion
parentc99f7d06cb60a5fe2e3f14f541119ff5f1e3dc19 (diff)
efl/player: prune properties duplicated in efl.playable
efl.playable implements a number of properties which are also present in efl.player. playable was intended to be separate, so enforce this split in all classes which use player ref T7877 Reviewed-by: Cedric BAIL <cedric.bail@free.fr> Differential Revision: https://phab.enlightenment.org/D10109
Diffstat (limited to 'src/lib/emotion')
-rw-r--r--src/lib/emotion/efl_canvas_video.eo6
-rw-r--r--src/lib/emotion/emotion_smart.c8
2 files changed, 7 insertions, 7 deletions
diff --git a/src/lib/emotion/efl_canvas_video.eo b/src/lib/emotion/efl_canvas_video.eo
index 4cb7c2e..3e14920 100644
--- a/src/lib/emotion/efl_canvas_video.eo
+++ b/src/lib/emotion/efl_canvas_video.eo
@@ -1,5 +1,5 @@
1class @beta Efl.Canvas.Video extends Efl.Canvas.Group 1class @beta Efl.Canvas.Video extends Efl.Canvas.Group
2 implements Efl.File, Efl.Audio_Control, Efl.Player, 2 implements Efl.File, Efl.Audio_Control, Efl.Player, Efl.Playable,
3 Efl.Gfx.Image, Efl.Gfx.Image_Load_Controller 3 Efl.Gfx.Image, Efl.Gfx.Image_Load_Controller
4{ 4{
5 [[Efl canvas video class]] 5 [[Efl canvas video class]]
@@ -62,8 +62,8 @@ class @beta Efl.Canvas.Video extends Efl.Canvas.Group
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; }
65 Efl.Player.length { get; } 65 Efl.Playable.length { get; }
66 Efl.Player.seekable { get; } 66 Efl.Playable.seekable { get; }
67 Efl.Gfx.Image_Load_Controller.load_size { get; } 67 Efl.Gfx.Image_Load_Controller.load_size { get; }
68 Efl.Gfx.Image.ratio { get; } 68 Efl.Gfx.Image.ratio { get; }
69 Efl.Gfx.Image.smooth_scale { get; set; } 69 Efl.Gfx.Image.smooth_scale { get; set; }
diff --git a/src/lib/emotion/emotion_smart.c b/src/lib/emotion/emotion_smart.c
index 73c588b..9a30bed 100644
--- a/src/lib/emotion/emotion_smart.c
+++ b/src/lib/emotion/emotion_smart.c
@@ -731,7 +731,7 @@ emotion_object_buffer_size_get(const Evas_Object *obj)
731EAPI Eina_Bool 731EAPI Eina_Bool
732emotion_object_seekable_get(const Evas_Object *obj) 732emotion_object_seekable_get(const Evas_Object *obj)
733{ 733{
734 return efl_player_seekable_get(obj); 734 return efl_playable_seekable_get(obj);
735} 735}
736 736
737EAPI Eina_Bool 737EAPI Eina_Bool
@@ -757,7 +757,7 @@ emotion_object_audio_handled_get(const Evas_Object *obj)
757EAPI double 757EAPI double
758emotion_object_play_length_get(const Evas_Object *obj) 758emotion_object_play_length_get(const Evas_Object *obj)
759{ 759{
760 return efl_player_length_get(obj); 760 return efl_playable_length_get(obj);
761} 761}
762 762
763EAPI void 763EAPI void
@@ -1171,7 +1171,7 @@ _efl_canvas_video_efl_player_progress_get(const Eo *obj EINA_UNUSED, Efl_Canvas_
1171} 1171}
1172 1172
1173EOLIAN static double 1173EOLIAN static double
1174_efl_canvas_video_efl_player_length_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Video_Data *sd) 1174_efl_canvas_video_efl_playable_length_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Video_Data *sd)
1175{ 1175{
1176 if (!sd->engine_instance) return 0.0; 1176 if (!sd->engine_instance) return 0.0;
1177 sd->len = emotion_engine_instance_len_get(sd->engine_instance); 1177 sd->len = emotion_engine_instance_len_get(sd->engine_instance);
@@ -1179,7 +1179,7 @@ _efl_canvas_video_efl_player_length_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Vi
1179} 1179}
1180 1180
1181EOLIAN static Eina_Bool 1181EOLIAN static Eina_Bool
1182_efl_canvas_video_efl_player_seekable_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Video_Data *sd) 1182_efl_canvas_video_efl_playable_seekable_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Video_Data *sd)
1183{ 1183{
1184 if (!sd->engine_instance) return EINA_FALSE; 1184 if (!sd->engine_instance) return EINA_FALSE;
1185 return emotion_engine_instance_seekable(sd->engine_instance); 1185 return emotion_engine_instance_seekable(sd->engine_instance);