summaryrefslogtreecommitdiff
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
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
-rw-r--r--src/bin/elementary/test_evas_snapshot.c2
-rw-r--r--src/bin/elementary/test_gfx_filters.c2
-rw-r--r--src/bin/elementary/test_photocam.c4
-rw-r--r--src/lib/edje/edje_smart.c2
-rw-r--r--src/lib/edje/efl_canvas_layout.eo4
-rw-r--r--src/lib/efl/interfaces/efl_player.eo24
-rw-r--r--src/lib/elementary/efl_ui_image.c4
-rw-r--r--src/lib/elementary/efl_ui_image.eo4
-rw-r--r--src/lib/elementary/efl_ui_image_zoomable.c2
-rw-r--r--src/lib/elementary/efl_ui_image_zoomable.eo2
-rw-r--r--src/lib/elementary/efl_ui_video.c4
-rw-r--r--src/lib/emotion/efl_canvas_video.eo6
-rw-r--r--src/lib/emotion/emotion_smart.c8
-rw-r--r--src/lib/evas/canvas/efl_canvas_animation_player.c12
-rw-r--r--src/lib/evas/canvas/efl_canvas_animation_player.eo8
15 files changed, 32 insertions, 56 deletions
diff --git a/src/bin/elementary/test_evas_snapshot.c b/src/bin/elementary/test_evas_snapshot.c
index ea79aa8..ecfee19 100644
--- a/src/bin/elementary/test_evas_snapshot.c
+++ b/src/bin/elementary/test_evas_snapshot.c
@@ -46,7 +46,7 @@ _anim_toggle(void *data, const Efl_Event *ev EINA_UNUSED)
46 it = efl_content_iterate(table); 46 it = efl_content_iterate(table);
47 EINA_ITERATOR_FOREACH(it, o) 47 EINA_ITERATOR_FOREACH(it, o)
48 { 48 {
49 if (efl_isa(o, EFL_PLAYER_INTERFACE) && efl_player_playable_get(o)) 49 if (efl_isa(o, EFL_PLAYER_INTERFACE) && efl_playable_get(o))
50 efl_player_play_set(o, !efl_player_play_get(o)); 50 efl_player_play_set(o, !efl_player_play_get(o));
51 } 51 }
52 eina_iterator_free(it); 52 eina_iterator_free(it);
diff --git a/src/bin/elementary/test_gfx_filters.c b/src/bin/elementary/test_gfx_filters.c
index 4fdee9d..e7410c8 100644
--- a/src/bin/elementary/test_gfx_filters.c
+++ b/src/bin/elementary/test_gfx_filters.c
@@ -407,7 +407,7 @@ test_gfx_filters(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *eve
407 efl_file_set(efl_added, buf), 407 efl_file_set(efl_added, buf),
408 efl_name_set(efl_added, images[k].src_name), 408 efl_name_set(efl_added, images[k].src_name),
409 elm_object_tooltip_text_set(efl_added, images[k].src_name)); 409 elm_object_tooltip_text_set(efl_added, images[k].src_name));
410 if (efl_player_playable_get(o)) 410 if (efl_playable_get(o))
411 efl_player_play_set(o, 1); 411 efl_player_play_set(o, 1);
412 efl_event_callback_add(o, EFL_INPUT_EVENT_CLICKED, _img_click, win); 412 efl_event_callback_add(o, EFL_INPUT_EVENT_CLICKED, _img_click, win);
413 efl_pack(box2, o); 413 efl_pack(box2, o);
diff --git a/src/bin/elementary/test_photocam.c b/src/bin/elementary/test_photocam.c
index 6f50740..70d6da2 100644
--- a/src/bin/elementary/test_photocam.c
+++ b/src/bin/elementary/test_photocam.c
@@ -152,7 +152,7 @@ my_bt_open(void *data, Evas_Object *obj EINA_UNUSED, void *event_info)
152 } 152 }
153 153
154 if (file && eina_str_has_extension(file, ".gif") 154 if (file && eina_str_has_extension(file, ".gif")
155 && efl_player_playable_get(ph)) 155 && efl_playable_get(ph))
156 efl_player_play_set(ph, EINA_TRUE); 156 efl_player_play_set(ph, EINA_TRUE);
157} 157}
158 158
@@ -829,7 +829,7 @@ test_image_zoomable_animated(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSE
829 efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _zoomable_clicked_cb, NULL) 829 efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _zoomable_clicked_cb, NULL)
830 ); 830 );
831 831
832 if (efl_player_playable_get(zoomable)) 832 if (efl_playable_get(zoomable))
833 { 833 {
834 printf("animation is available for this image.\n"); 834 printf("animation is available for this image.\n");
835 efl_player_play_set(zoomable, EINA_TRUE); 835 efl_player_play_set(zoomable, EINA_TRUE);
diff --git a/src/lib/edje/edje_smart.c b/src/lib/edje/edje_smart.c
index 4801432..7acf644 100644
--- a/src/lib/edje/edje_smart.c
+++ b/src/lib/edje/edje_smart.c
@@ -538,7 +538,7 @@ _efl_canvas_layout_efl_observer_update(Eo *obj EINA_UNUSED, Edje *ed, Efl_Object
538} 538}
539 539
540EOLIAN Eina_Bool 540EOLIAN Eina_Bool
541_efl_canvas_layout_efl_player_playable_get(const Eo *obj EINA_UNUSED, Edje *pd EINA_UNUSED) 541_efl_canvas_layout_efl_playable_playable_get(const Eo *obj EINA_UNUSED, Edje *pd EINA_UNUSED)
542{ 542{
543 return EINA_TRUE; 543 return EINA_TRUE;
544} 544}
diff --git a/src/lib/edje/efl_canvas_layout.eo b/src/lib/edje/efl_canvas_layout.eo
index 63fbc4c..0f7a185 100644
--- a/src/lib/edje/efl_canvas_layout.eo
+++ b/src/lib/edje/efl_canvas_layout.eo
@@ -3,7 +3,7 @@
3class @beta Efl.Canvas.Layout extends Efl.Canvas.Group implements Efl.File, Efl.Container, Efl.Part, 3class @beta Efl.Canvas.Layout extends Efl.Canvas.Group implements Efl.File, Efl.Container, Efl.Part,
4 Efl.Observer, Efl.Ui.I18n, Efl.Layout.Calc, 4 Efl.Observer, Efl.Ui.I18n, Efl.Layout.Calc,
5 Efl.Layout.Signal, Efl.Layout.Group, 5 Efl.Layout.Signal, Efl.Layout.Group,
6 Efl.Player, Efl.Gfx.Color_Class, Efl.Gfx.Text_Class, 6 Efl.Player, Efl.Playable, Efl.Gfx.Color_Class, Efl.Gfx.Text_Class,
7 Efl.Gfx.Size_Class 7 Efl.Gfx.Size_Class
8{ 8{
9 [[Edje object class]] 9 [[Edje object class]]
@@ -126,7 +126,7 @@ class @beta Efl.Canvas.Layout extends Efl.Canvas.Group implements Efl.File, Efl.
126 Efl.Container.content_count; 126 Efl.Container.content_count;
127 Efl.Part.part_get; [[Returns @Efl.Canvas.Layout_Part]] 127 Efl.Part.part_get; [[Returns @Efl.Canvas.Layout_Part]]
128 Efl.Observer.update; 128 Efl.Observer.update;
129 Efl.Player.playable { get; } 129 Efl.Playable.playable { get; }
130 Efl.Player.play { get; set; } 130 Efl.Player.play { get; set; }
131 Efl.Player.play_speed { get; set; } 131 Efl.Player.play_speed { get; set; }
132 } 132 }
diff --git a/src/lib/efl/interfaces/efl_player.eo b/src/lib/efl/interfaces/efl_player.eo
index 1aecb53..3ff0649 100644
--- a/src/lib/efl/interfaces/efl_player.eo
+++ b/src/lib/efl/interfaces/efl_player.eo
@@ -9,14 +9,6 @@ interface @beta Efl.Player
9 stop { 9 stop {
10 [[Stop playable object.]] 10 [[Stop playable object.]]
11 } 11 }
12 @property playable {
13 [[Whether or not the playable can be played.]]
14 get {
15 }
16 values {
17 play: bool; [[$true if the object have playable data, $false otherwise]]
18 }
19 }
20 @property play { 12 @property play {
21 [[Playback state of the media file. 13 [[Playback state of the media file.
22 14
@@ -75,21 +67,5 @@ interface @beta Efl.Player
75 speed: double; [[The play speed in the [0, infinity) range.]] 67 speed: double; [[The play speed in the [0, infinity) range.]]
76 } 68 }
77 } 69 }
78 @property length {
79 [[Get the length of play for the media file.]]
80 get {
81 }
82 values {
83 length: double; [[The length of the stream in seconds.]]
84 }
85 }
86 @property seekable {
87 [[Get whether the media file is seekable.]]
88 get {
89 }
90 values {
91 seekable: bool; [[$true if seekable.]]
92 }
93 }
94 } 70 }
95} 71}
diff --git a/src/lib/elementary/efl_ui_image.c b/src/lib/elementary/efl_ui_image.c
index 9cde2f8..bbeffb2 100644
--- a/src/lib/elementary/efl_ui_image.c
+++ b/src/lib/elementary/efl_ui_image.c
@@ -1716,11 +1716,11 @@ _efl_ui_image_efl_ui_draggable_drag_target_get(const Eo *obj EINA_UNUSED, Efl_Ui
1716EAPI Eina_Bool 1716EAPI Eina_Bool
1717elm_image_animated_available_get(const Evas_Object *obj) 1717elm_image_animated_available_get(const Evas_Object *obj)
1718{ 1718{
1719 return efl_player_playable_get(obj); 1719 return efl_playable_get(obj);
1720} 1720}
1721 1721
1722EOLIAN static Eina_Bool 1722EOLIAN static Eina_Bool
1723_efl_ui_image_efl_player_playable_get(const Eo *obj, Efl_Ui_Image_Data *sd) 1723_efl_ui_image_efl_playable_playable_get(const Eo *obj, Efl_Ui_Image_Data *sd)
1724{ 1724{
1725 if (sd->edje) return EINA_TRUE; 1725 if (sd->edje) return EINA_TRUE;
1726 1726
diff --git a/src/lib/elementary/efl_ui_image.eo b/src/lib/elementary/efl_ui_image.eo
index 080c0ce..2103545 100644
--- a/src/lib/elementary/efl_ui_image.eo
+++ b/src/lib/elementary/efl_ui_image.eo
@@ -17,7 +17,7 @@ struct @beta Efl.Ui.Image_Error
17} 17}
18 18
19class Efl.Ui.Image extends Efl.Ui.Widget implements Efl.Input.Clickable, Efl.Ui.Draggable, 19class Efl.Ui.Image extends Efl.Ui.Widget implements Efl.Input.Clickable, Efl.Ui.Draggable,
20 Efl.File, Efl.Gfx.Image, Efl.Gfx.Image_Load_Controller, Efl.Player, Efl.Gfx.View, 20 Efl.File, Efl.Gfx.Image, Efl.Gfx.Image_Load_Controller, Efl.Player, Efl.Playable, Efl.Gfx.View,
21 Efl.Access.Component, Efl.Access.Widget.Action, Efl.Gfx.Color, 21 Efl.Access.Component, Efl.Access.Widget.Action, Efl.Gfx.Color,
22 Efl.Gfx.Image_Orientable, 22 Efl.Gfx.Image_Orientable,
23 Efl.Layout.Calc, Efl.Layout.Group, Efl.Layout.Signal, 23 Efl.Layout.Calc, Efl.Layout.Group, Efl.Layout.Signal,
@@ -97,7 +97,7 @@ class Efl.Ui.Image extends Efl.Ui.Widget implements Efl.Input.Clickable, Efl.Ui.
97 Efl.Gfx.Image.scale_hint { get; set; } 97 Efl.Gfx.Image.scale_hint { get; set; }
98 Efl.Gfx.Image.content_hint { get; set; } 98 Efl.Gfx.Image.content_hint { get; set; }
99 Efl.Gfx.Image.image_load_error { get; } 99 Efl.Gfx.Image.image_load_error { get; }
100 Efl.Player.playable { get; } 100 Efl.Playable.playable { get; }
101 Efl.Player.play { get; set; } 101 Efl.Player.play { get; set; }
102 Efl.Layout.Signal.signal_emit; 102 Efl.Layout.Signal.signal_emit;
103 Efl.Layout.Signal.message_send; 103 Efl.Layout.Signal.message_send;
diff --git a/src/lib/elementary/efl_ui_image_zoomable.c b/src/lib/elementary/efl_ui_image_zoomable.c
index 49d3e04..0549a67 100644
--- a/src/lib/elementary/efl_ui_image_zoomable.c
+++ b/src/lib/elementary/efl_ui_image_zoomable.c
@@ -3003,7 +3003,7 @@ _efl_ui_image_zoomable_gesture_enabled_get(const Eo *obj EINA_UNUSED, Efl_Ui_Ima
3003} 3003}
3004 3004
3005EOLIAN static Eina_Bool 3005EOLIAN static Eina_Bool
3006_efl_ui_image_zoomable_efl_player_playable_get(const Eo *obj EINA_UNUSED, Efl_Ui_Image_Zoomable_Data *sd) 3006_efl_ui_image_zoomable_efl_playable_playable_get(const Eo *obj EINA_UNUSED, Efl_Ui_Image_Zoomable_Data *sd)
3007{ 3007{
3008 if (sd->edje) return EINA_TRUE; 3008 if (sd->edje) return EINA_TRUE;
3009 return evas_object_image_animated_get(sd->img); 3009 return evas_object_image_animated_get(sd->img);
diff --git a/src/lib/elementary/efl_ui_image_zoomable.eo b/src/lib/elementary/efl_ui_image_zoomable.eo
index 4b48388..1157cbd 100644
--- a/src/lib/elementary/efl_ui_image_zoomable.eo
+++ b/src/lib/elementary/efl_ui_image_zoomable.eo
@@ -43,7 +43,7 @@ class @beta Efl.Ui.Image_Zoomable extends Efl.Ui.Image implements Efl.Ui.Zoom
43 Efl.Gfx.View.view_size { get; } 43 Efl.Gfx.View.view_size { get; }
44 Efl.Gfx.Image.image_size { get; } 44 Efl.Gfx.Image.image_size { get; }
45 Efl.Ui.Image.icon { set; get; } 45 Efl.Ui.Image.icon { set; get; }
46 Efl.Player.playable { get; } 46 Efl.Playable.playable { get; }
47 Efl.Player.play { get; set; } 47 Efl.Player.play { get; set; }
48 Efl.Ui.Zoom.zoom_animation { set; get; } 48 Efl.Ui.Zoom.zoom_animation { set; get; }
49 Efl.Ui.Zoom.zoom_level { set; get; } 49 Efl.Ui.Zoom.zoom_level { set; get; }
diff --git a/src/lib/elementary/efl_ui_video.c b/src/lib/elementary/efl_ui_video.c
index b04ec11..e29ce9a 100644
--- a/src/lib/elementary/efl_ui_video.c
+++ b/src/lib/elementary/efl_ui_video.c
@@ -498,13 +498,13 @@ elm_video_audio_mute_get(const Evas_Object *obj)
498EAPI double 498EAPI double
499elm_video_play_length_get(const Evas_Object *obj) 499elm_video_play_length_get(const Evas_Object *obj)
500{ 500{
501 return efl_player_length_get(obj); 501 return efl_playable_length_get(obj);
502} 502}
503 503
504EAPI Eina_Bool 504EAPI Eina_Bool
505elm_video_is_seekable_get(const Evas_Object *obj) 505elm_video_is_seekable_get(const Evas_Object *obj)
506{ 506{
507 return efl_player_seekable_get(obj); 507 return efl_playable_seekable_get(obj);
508} 508}
509 509
510EAPI void 510EAPI void
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);
diff --git a/src/lib/evas/canvas/efl_canvas_animation_player.c b/src/lib/evas/canvas/efl_canvas_animation_player.c
index aa89c36..2dc7d55 100644
--- a/src/lib/evas/canvas/efl_canvas_animation_player.c
+++ b/src/lib/evas/canvas/efl_canvas_animation_player.c
@@ -83,7 +83,7 @@ _animator_cb(void *data)
83 EFL_ANIMATION_PLAYER_ANIMATION_GET(eo_obj, anim); 83 EFL_ANIMATION_PLAYER_ANIMATION_GET(eo_obj, anim);
84 double duration, elapsed_time, vector; 84 double duration, elapsed_time, vector;
85 85
86 if (efl_player_seekable_get(eo_obj)) 86 if (efl_playable_seekable_get(eo_obj))
87 { 87 {
88 pd->time.current = ecore_loop_time_get(); 88 pd->time.current = ecore_loop_time_get();
89 89
@@ -195,7 +195,7 @@ _efl_canvas_animation_player_efl_player_start(Eo *eo_obj,
195 double start_delay; 195 double start_delay;
196 EFL_ANIMATION_PLAYER_ANIMATION_GET(eo_obj, anim); 196 EFL_ANIMATION_PLAYER_ANIMATION_GET(eo_obj, anim);
197 197
198 if (!efl_player_playable_get(eo_obj)) return; 198 if (!efl_playable_get(eo_obj)) return;
199 pd->is_play = EINA_TRUE; 199 pd->is_play = EINA_TRUE;
200 //TODO: check this case is correct 200 //TODO: check this case is correct
201 if (pd->start_delay_timer) return; 201 if (pd->start_delay_timer) return;
@@ -317,7 +317,7 @@ _efl_canvas_animation_player_efl_player_play_get(const Eo *eo_obj EINA_UNUSED,
317} 317}
318 318
319EOLIAN static Eina_Bool 319EOLIAN static Eina_Bool
320_efl_canvas_animation_player_efl_player_playable_get(const Eo *eo_obj, 320_efl_canvas_animation_player_efl_playable_playable_get(const Eo *eo_obj,
321 Efl_Canvas_Animation_Player_Data *pd EINA_UNUSED) 321 Efl_Canvas_Animation_Player_Data *pd EINA_UNUSED)
322{ 322{
323 Efl_Canvas_Animation *anim = efl_animation_player_animation_get(eo_obj); 323 Efl_Canvas_Animation *anim = efl_animation_player_animation_get(eo_obj);
@@ -342,7 +342,7 @@ _efl_canvas_animation_player_efl_player_pos_set(Eo *eo_obj,
342 double sec) 342 double sec)
343{ 343{
344 //TODO: this is not correct 344 //TODO: this is not correct
345 if (!efl_player_seekable_get(eo_obj)) 345 if (!efl_playable_seekable_get(eo_obj))
346 return; 346 return;
347 347
348 EFL_ANIMATION_PLAYER_ANIMATION_GET(eo_obj, anim); 348 EFL_ANIMATION_PLAYER_ANIMATION_GET(eo_obj, anim);
@@ -382,7 +382,7 @@ _efl_canvas_animation_player_efl_player_play_speed_get(const Eo *eo_obj EINA_UNU
382} 382}
383 383
384EOLIAN static double 384EOLIAN static double
385_efl_canvas_animation_player_efl_player_length_get(const Eo *eo_obj, 385_efl_canvas_animation_player_efl_playable_length_get(const Eo *eo_obj,
386 Efl_Canvas_Animation_Player_Data *pd EINA_UNUSED) 386 Efl_Canvas_Animation_Player_Data *pd EINA_UNUSED)
387{ 387{
388 EFL_ANIMATION_PLAYER_ANIMATION_GET(eo_obj, anim); 388 EFL_ANIMATION_PLAYER_ANIMATION_GET(eo_obj, anim);
@@ -390,7 +390,7 @@ _efl_canvas_animation_player_efl_player_length_get(const Eo *eo_obj,
390} 390}
391 391
392EOLIAN static Eina_Bool 392EOLIAN static Eina_Bool
393_efl_canvas_animation_player_efl_player_seekable_get(const Eo *eo_obj EINA_UNUSED, 393_efl_canvas_animation_player_efl_playable_seekable_get(const Eo *eo_obj EINA_UNUSED,
394 Efl_Canvas_Animation_Player_Data *pd EINA_UNUSED) 394 Efl_Canvas_Animation_Player_Data *pd EINA_UNUSED)
395{ 395{
396 EFL_ANIMATION_PLAYER_ANIMATION_GET(eo_obj, anim); 396 EFL_ANIMATION_PLAYER_ANIMATION_GET(eo_obj, anim);
diff --git a/src/lib/evas/canvas/efl_canvas_animation_player.eo b/src/lib/evas/canvas/efl_canvas_animation_player.eo
index 8d33cc7..ffec283 100644
--- a/src/lib/evas/canvas/efl_canvas_animation_player.eo
+++ b/src/lib/evas/canvas/efl_canvas_animation_player.eo
@@ -1,4 +1,4 @@
1class @beta Efl.Canvas.Animation_Player extends Efl.Object implements Efl.Player 1class @beta Efl.Canvas.Animation_Player extends Efl.Object implements Efl.Player, Efl.Playable
2{ 2{
3 [[Efl animation object class]] 3 [[Efl animation object class]]
4 c_prefix: efl_animation_player; 4 c_prefix: efl_animation_player;
@@ -38,14 +38,14 @@ class @beta Efl.Canvas.Animation_Player extends Efl.Object implements Efl.Player
38 Efl.Player.start; 38 Efl.Player.start;
39 Efl.Player.stop; 39 Efl.Player.stop;
40 Efl.Player.play { get; set; } 40 Efl.Player.play { get; set; }
41 Efl.Player.playable { get; } 41 Efl.Playable.playable { get; }
42 Efl.Player.pos { get; set; } 42 Efl.Player.pos { 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; }
46 //Efl.Player.mute { get; set; } 46 //Efl.Player.mute { get; set; }
47 Efl.Player.length { get; } 47 Efl.Playable.length { get; }
48 Efl.Player.seekable { get; } 48 Efl.Playable.seekable { get; }
49 } 49 }
50 events { 50 events {
51 /* FIXME: This event is similar to Efl.Canvas.Object.anim_started but with different type, might be confusing. */ 51 /* FIXME: This event is similar to Efl.Canvas.Object.anim_started but with different type, might be confusing. */