summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@samsung.com>2019-03-05 17:00:37 -0500
committerCedric BAIL <cedric.bail@free.fr>2019-03-07 14:16:03 -0800
commitd3be7698e379cdda44c44f00539036c97a45aa51 (patch)
treec0bcb6acea5aafd5f749cacc90437655c9d5a0ce /src
parentf536d1030e02f06b75b27590db765ab3133571bb (diff)
elm_player: remove all legacy usage from eo files
this takes the current generated output from eolian for legacy code in efl and adds it to the tree, then removes legacy references from the corresponding eo files. in the case where the entire eo file was for a legacy object, that eo file has been removed from the tree ref T7724 Reviewed-by: Cedric BAIL <cedric.bail@free.fr> Differential Revision: https://phab.enlightenment.org/D8191
Diffstat (limited to 'src')
-rw-r--r--src/Makefile_Elementary.am4
-rw-r--r--src/lib/elementary/elc_player.c2
-rw-r--r--src/lib/elementary/elm_player.eo28
-rw-r--r--src/lib/elementary/elm_player_eo.c73
-rw-r--r--src/lib/elementary/elm_player_eo.h112
-rw-r--r--src/lib/elementary/elm_player_eo.legacy.h17
-rw-r--r--src/lib/elementary/elm_widget_player.h2
-rw-r--r--src/lib/elementary/meson.build3
8 files changed, 209 insertions, 32 deletions
diff --git a/src/Makefile_Elementary.am b/src/Makefile_Elementary.am
index 401454c..7a35107 100644
--- a/src/Makefile_Elementary.am
+++ b/src/Makefile_Elementary.am
@@ -183,7 +183,6 @@ elm_private_eolian_files = \
183# Legacy classes - not part of public EO API 183# Legacy classes - not part of public EO API
184elm_legacy_eolian_files = \ 184elm_legacy_eolian_files = \
185 lib/elementary/efl_ui_clock_legacy.eo \ 185 lib/elementary/efl_ui_clock_legacy.eo \
186 lib/elementary/elm_player.eo \
187 lib/elementary/elm_plug.eo \ 186 lib/elementary/elm_plug.eo \
188 lib/elementary/elm_popup.eo \ 187 lib/elementary/elm_popup.eo \
189 lib/elementary/elm_route.eo \ 188 lib/elementary/elm_route.eo \
@@ -377,6 +376,7 @@ lib/elementary/elm_panel_eo.legacy.c \
377lib/elementary/elm_pan_eo.c \ 376lib/elementary/elm_pan_eo.c \
378lib/elementary/elm_pan_eo.legacy.c \ 377lib/elementary/elm_pan_eo.legacy.c \
379lib/elementary/elm_photo_eo.c \ 378lib/elementary/elm_photo_eo.c \
379lib/elementary/elm_player_eo.c \
380$(NULL) 380$(NULL)
381 381
382elm_legacy_eo_headers = \ 382elm_legacy_eo_headers = \
@@ -538,6 +538,8 @@ lib/elementary/elm_pan_eo.h \
538lib/elementary/elm_pan_eo.legacy.h \ 538lib/elementary/elm_pan_eo.legacy.h \
539lib/elementary/elm_photo_eo.h \ 539lib/elementary/elm_photo_eo.h \
540lib/elementary/elm_photo_eo.legacy.h \ 540lib/elementary/elm_photo_eo.legacy.h \
541lib/elementary/elm_player_eo.h \
542lib/elementary/elm_player_eo.legacy.h \
541$(NULL) 543$(NULL)
542 544
543 545
diff --git a/src/lib/elementary/elc_player.c b/src/lib/elementary/elc_player.c
index 4b41566..8a386fc 100644
--- a/src/lib/elementary/elc_player.c
+++ b/src/lib/elementary/elc_player.c
@@ -711,4 +711,4 @@ ELM_PART_CONTENT_DEFAULT_GET(elm_player, "video")
711 ELM_LAYOUT_SIZING_EVAL_OPS(elm_player), \ 711 ELM_LAYOUT_SIZING_EVAL_OPS(elm_player), \
712 EFL_CANVAS_GROUP_ADD_DEL_OPS(elm_player) 712 EFL_CANVAS_GROUP_ADD_DEL_OPS(elm_player)
713 713
714#include "elm_player.eo.c" 714#include "elm_player_eo.c"
diff --git a/src/lib/elementary/elm_player.eo b/src/lib/elementary/elm_player.eo
deleted file mode 100644
index 12e3b23..0000000
--- a/src/lib/elementary/elm_player.eo
+++ /dev/null
@@ -1,28 +0,0 @@
1class Elm.Player extends Efl.Ui.Layout_Base implements Efl.Access.Widget.Action, Efl.Ui.Legacy
2{
3 [[Elementary player class]]
4 legacy_prefix: elm_player;
5 eo_prefix: elm_obj_player;
6 event_prefix: elm_player;
7 implements {
8 class.constructor;
9 Efl.Object.constructor;
10 Efl.Ui.Widget.theme_apply;
11 Efl.Ui.Widget.widget_input_event_handler;
12 Efl.Access.Widget.Action.elm_actions { get; }
13 Efl.Part.part_get;
14 }
15 events {
16 forward,clicked: void; [[Called when forward was clicked]]
17 info,clicked: void; [[Called when info was clicked]]
18 next,clicked: void; [[Called when next was clicked]]
19 pause,clicked: void; [[Called when pause was clicked]]
20 play,clicked: void; [[Called when play was clicked]]
21 prev,clicked: void; [[Called when previous was clicked]]
22 rewind,clicked: void; [[Called when rewind was clicked]]
23 quality,clicked: void; [[Called when quality was clicked]]
24 eject,clicked: void; [[Called when eject was clicked]]
25 volume,clicked: void; [[Called when volume was clicked]]
26 mute,clicked: void; [[Called when mute was clicked]]
27 }
28}
diff --git a/src/lib/elementary/elm_player_eo.c b/src/lib/elementary/elm_player_eo.c
new file mode 100644
index 0000000..067926f
--- /dev/null
+++ b/src/lib/elementary/elm_player_eo.c
@@ -0,0 +1,73 @@
1EWAPI const Efl_Event_Description _ELM_PLAYER_EVENT_FORWARD_CLICKED =
2 EFL_EVENT_DESCRIPTION("forward,clicked");
3EWAPI const Efl_Event_Description _ELM_PLAYER_EVENT_INFO_CLICKED =
4 EFL_EVENT_DESCRIPTION("info,clicked");
5EWAPI const Efl_Event_Description _ELM_PLAYER_EVENT_NEXT_CLICKED =
6 EFL_EVENT_DESCRIPTION("next,clicked");
7EWAPI const Efl_Event_Description _ELM_PLAYER_EVENT_PAUSE_CLICKED =
8 EFL_EVENT_DESCRIPTION("pause,clicked");
9EWAPI const Efl_Event_Description _ELM_PLAYER_EVENT_PLAY_CLICKED =
10 EFL_EVENT_DESCRIPTION("play,clicked");
11EWAPI const Efl_Event_Description _ELM_PLAYER_EVENT_PREV_CLICKED =
12 EFL_EVENT_DESCRIPTION("prev,clicked");
13EWAPI const Efl_Event_Description _ELM_PLAYER_EVENT_REWIND_CLICKED =
14 EFL_EVENT_DESCRIPTION("rewind,clicked");
15EWAPI const Efl_Event_Description _ELM_PLAYER_EVENT_QUALITY_CLICKED =
16 EFL_EVENT_DESCRIPTION("quality,clicked");
17EWAPI const Efl_Event_Description _ELM_PLAYER_EVENT_EJECT_CLICKED =
18 EFL_EVENT_DESCRIPTION("eject,clicked");
19EWAPI const Efl_Event_Description _ELM_PLAYER_EVENT_VOLUME_CLICKED =
20 EFL_EVENT_DESCRIPTION("volume,clicked");
21EWAPI const Efl_Event_Description _ELM_PLAYER_EVENT_MUTE_CLICKED =
22 EFL_EVENT_DESCRIPTION("mute,clicked");
23
24Efl_Object *_elm_player_efl_object_constructor(Eo *obj, Elm_Player_Data *pd);
25
26
27Eina_Error _elm_player_efl_ui_widget_theme_apply(Eo *obj, Elm_Player_Data *pd);
28
29
30Eina_Bool _elm_player_efl_ui_widget_widget_input_event_handler(Eo *obj, Elm_Player_Data *pd, const Efl_Event *eo_event, Efl_Canvas_Object *source);
31
32
33const Efl_Access_Action_Data *_elm_player_efl_access_widget_action_elm_actions_get(const Eo *obj, Elm_Player_Data *pd);
34
35
36Efl_Object *_elm_player_efl_part_part_get(const Eo *obj, Elm_Player_Data *pd, const char *name);
37
38
39static Eina_Bool
40_elm_player_class_initializer(Efl_Class *klass)
41{
42 const Efl_Object_Ops *opsp = NULL;
43
44 const Efl_Object_Property_Reflection_Ops *ropsp = NULL;
45
46#ifndef ELM_PLAYER_EXTRA_OPS
47#define ELM_PLAYER_EXTRA_OPS
48#endif
49
50 EFL_OPS_DEFINE(ops,
51 EFL_OBJECT_OP_FUNC(efl_constructor, _elm_player_efl_object_constructor),
52 EFL_OBJECT_OP_FUNC(efl_ui_widget_theme_apply, _elm_player_efl_ui_widget_theme_apply),
53 EFL_OBJECT_OP_FUNC(efl_ui_widget_input_event_handler, _elm_player_efl_ui_widget_widget_input_event_handler),
54 EFL_OBJECT_OP_FUNC(efl_access_widget_action_elm_actions_get, _elm_player_efl_access_widget_action_elm_actions_get),
55 EFL_OBJECT_OP_FUNC(efl_part_get, _elm_player_efl_part_part_get),
56 ELM_PLAYER_EXTRA_OPS
57 );
58 opsp = &ops;
59
60 return efl_class_functions_set(klass, opsp, ropsp);
61}
62
63static const Efl_Class_Description _elm_player_class_desc = {
64 EO_VERSION,
65 "Elm.Player",
66 EFL_CLASS_TYPE_REGULAR,
67 sizeof(Elm_Player_Data),
68 _elm_player_class_initializer,
69 _elm_player_class_constructor,
70 NULL
71};
72
73EFL_DEFINE_CLASS(elm_player_class_get, &_elm_player_class_desc, EFL_UI_LAYOUT_BASE_CLASS, EFL_ACCESS_WIDGET_ACTION_MIXIN, EFL_UI_LEGACY_INTERFACE, NULL);
diff --git a/src/lib/elementary/elm_player_eo.h b/src/lib/elementary/elm_player_eo.h
new file mode 100644
index 0000000..8efee21
--- /dev/null
+++ b/src/lib/elementary/elm_player_eo.h
@@ -0,0 +1,112 @@
1#ifndef _ELM_PLAYER_EO_H_
2#define _ELM_PLAYER_EO_H_
3
4#ifndef _ELM_PLAYER_EO_CLASS_TYPE
5#define _ELM_PLAYER_EO_CLASS_TYPE
6
7typedef Eo Elm_Player;
8
9#endif
10
11#ifndef _ELM_PLAYER_EO_TYPES
12#define _ELM_PLAYER_EO_TYPES
13
14
15#endif
16/** Elementary player class
17 *
18 * @ingroup Elm_Player
19 */
20#define ELM_PLAYER_CLASS elm_player_class_get()
21
22EWAPI const Efl_Class *elm_player_class_get(void);
23
24EWAPI extern const Efl_Event_Description _ELM_PLAYER_EVENT_FORWARD_CLICKED;
25
26/** Called when forward was clicked
27 *
28 * @ingroup Elm_Player
29 */
30#define ELM_PLAYER_EVENT_FORWARD_CLICKED (&(_ELM_PLAYER_EVENT_FORWARD_CLICKED))
31
32EWAPI extern const Efl_Event_Description _ELM_PLAYER_EVENT_INFO_CLICKED;
33
34/** Called when info was clicked
35 *
36 * @ingroup Elm_Player
37 */
38#define ELM_PLAYER_EVENT_INFO_CLICKED (&(_ELM_PLAYER_EVENT_INFO_CLICKED))
39
40EWAPI extern const Efl_Event_Description _ELM_PLAYER_EVENT_NEXT_CLICKED;
41
42/** Called when next was clicked
43 *
44 * @ingroup Elm_Player
45 */
46#define ELM_PLAYER_EVENT_NEXT_CLICKED (&(_ELM_PLAYER_EVENT_NEXT_CLICKED))
47
48EWAPI extern const Efl_Event_Description _ELM_PLAYER_EVENT_PAUSE_CLICKED;
49
50/** Called when pause was clicked
51 *
52 * @ingroup Elm_Player
53 */
54#define ELM_PLAYER_EVENT_PAUSE_CLICKED (&(_ELM_PLAYER_EVENT_PAUSE_CLICKED))
55
56EWAPI extern const Efl_Event_Description _ELM_PLAYER_EVENT_PLAY_CLICKED;
57
58/** Called when play was clicked
59 *
60 * @ingroup Elm_Player
61 */
62#define ELM_PLAYER_EVENT_PLAY_CLICKED (&(_ELM_PLAYER_EVENT_PLAY_CLICKED))
63
64EWAPI extern const Efl_Event_Description _ELM_PLAYER_EVENT_PREV_CLICKED;
65
66/** Called when previous was clicked
67 *
68 * @ingroup Elm_Player
69 */
70#define ELM_PLAYER_EVENT_PREV_CLICKED (&(_ELM_PLAYER_EVENT_PREV_CLICKED))
71
72EWAPI extern const Efl_Event_Description _ELM_PLAYER_EVENT_REWIND_CLICKED;
73
74/** Called when rewind was clicked
75 *
76 * @ingroup Elm_Player
77 */
78#define ELM_PLAYER_EVENT_REWIND_CLICKED (&(_ELM_PLAYER_EVENT_REWIND_CLICKED))
79
80EWAPI extern const Efl_Event_Description _ELM_PLAYER_EVENT_QUALITY_CLICKED;
81
82/** Called when quality was clicked
83 *
84 * @ingroup Elm_Player
85 */
86#define ELM_PLAYER_EVENT_QUALITY_CLICKED (&(_ELM_PLAYER_EVENT_QUALITY_CLICKED))
87
88EWAPI extern const Efl_Event_Description _ELM_PLAYER_EVENT_EJECT_CLICKED;
89
90/** Called when eject was clicked
91 *
92 * @ingroup Elm_Player
93 */
94#define ELM_PLAYER_EVENT_EJECT_CLICKED (&(_ELM_PLAYER_EVENT_EJECT_CLICKED))
95
96EWAPI extern const Efl_Event_Description _ELM_PLAYER_EVENT_VOLUME_CLICKED;
97
98/** Called when volume was clicked
99 *
100 * @ingroup Elm_Player
101 */
102#define ELM_PLAYER_EVENT_VOLUME_CLICKED (&(_ELM_PLAYER_EVENT_VOLUME_CLICKED))
103
104EWAPI extern const Efl_Event_Description _ELM_PLAYER_EVENT_MUTE_CLICKED;
105
106/** Called when mute was clicked
107 *
108 * @ingroup Elm_Player
109 */
110#define ELM_PLAYER_EVENT_MUTE_CLICKED (&(_ELM_PLAYER_EVENT_MUTE_CLICKED))
111
112#endif
diff --git a/src/lib/elementary/elm_player_eo.legacy.h b/src/lib/elementary/elm_player_eo.legacy.h
new file mode 100644
index 0000000..dfbd115
--- /dev/null
+++ b/src/lib/elementary/elm_player_eo.legacy.h
@@ -0,0 +1,17 @@
1#ifndef _ELM_PLAYER_EO_LEGACY_H_
2#define _ELM_PLAYER_EO_LEGACY_H_
3
4#ifndef _ELM_PLAYER_EO_CLASS_TYPE
5#define _ELM_PLAYER_EO_CLASS_TYPE
6
7typedef Eo Elm_Player;
8
9#endif
10
11#ifndef _ELM_PLAYER_EO_TYPES
12#define _ELM_PLAYER_EO_TYPES
13
14
15#endif
16
17#endif
diff --git a/src/lib/elementary/elm_widget_player.h b/src/lib/elementary/elm_widget_player.h
index 3bc4f20..ace9128 100644
--- a/src/lib/elementary/elm_widget_player.h
+++ b/src/lib/elementary/elm_widget_player.h
@@ -3,7 +3,7 @@
3 3
4#include "Elementary.h" 4#include "Elementary.h"
5 5
6#include "elm_player.eo.h" 6#include "elm_player_eo.h"
7 7
8/* DO NOT USE THIS HEADER UNLESS YOU ARE PREPARED FOR BREAKING OF YOUR 8/* DO NOT USE THIS HEADER UNLESS YOU ARE PREPARED FOR BREAKING OF YOUR
9 * CODE. THIS IS ELEMENTARY'S INTERNAL WIDGET API (for now) AND IS NOT 9 * CODE. THIS IS ELEMENTARY'S INTERNAL WIDGET API (for now) AND IS NOT
diff --git a/src/lib/elementary/meson.build b/src/lib/elementary/meson.build
index ac8c7ce..3dab571 100644
--- a/src/lib/elementary/meson.build
+++ b/src/lib/elementary/meson.build
@@ -1,6 +1,5 @@
1pub_legacy_eo_files = [ 1pub_legacy_eo_files = [
2 'efl_ui_clock_legacy.eo', 2 'efl_ui_clock_legacy.eo',
3 'elm_player.eo',
4 'elm_plug.eo', 3 'elm_plug.eo',
5 'elm_popup.eo', 4 'elm_popup.eo',
6 'elm_route.eo', 5 'elm_route.eo',
@@ -781,6 +780,8 @@ elementary_pub_headers = [
781 'elm_pan_eo.legacy.h', 780 'elm_pan_eo.legacy.h',
782 'elm_photo_eo.h', 781 'elm_photo_eo.h',
783 'elm_photo_eo.legacy.h', 782 'elm_photo_eo.legacy.h',
783 'elm_player_eo.h',
784 'elm_player_eo.legacy.h',
784] 785]
785 786
786elementary_header_src = [ 787elementary_header_src = [