summaryrefslogtreecommitdiff
path: root/src/lib/emotion
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-06 13:02:34 -0800
commit971e4dd2a60b0dea8e6fa7e23aaa902e5363443c (patch)
tree6b2efa402570d364dd5d60c721a7181f4929170a /src/lib/emotion
parentf493e0e6762b3f491151ed319ff57eae53e7454b (diff)
emotion: remove all legacy usage from eo files
this takes the current generated output from eolian for legacy code in evas 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/D8118
Diffstat (limited to 'src/lib/emotion')
-rw-r--r--src/lib/emotion/Emotion_Legacy.h2
-rw-r--r--src/lib/emotion/efl_canvas_video.eo2
-rw-r--r--src/lib/emotion/efl_canvas_video_eo.legacy.c12
-rw-r--r--src/lib/emotion/efl_canvas_video_eo.legacy.h60
-rw-r--r--src/lib/emotion/emotion_smart.c1
-rw-r--r--src/lib/emotion/meson.build13
6 files changed, 76 insertions, 14 deletions
diff --git a/src/lib/emotion/Emotion_Legacy.h b/src/lib/emotion/Emotion_Legacy.h
index 6db3fe0..de4532a 100644
--- a/src/lib/emotion/Emotion_Legacy.h
+++ b/src/lib/emotion/Emotion_Legacy.h
@@ -1,3 +1,3 @@
1 1
2#include "efl_canvas_video.eo.legacy.h" 2#include "efl_canvas_video_eo.legacy.h"
3 3
diff --git a/src/lib/emotion/efl_canvas_video.eo b/src/lib/emotion/efl_canvas_video.eo
index 38a9894..3aa165f 100644
--- a/src/lib/emotion/efl_canvas_video.eo
+++ b/src/lib/emotion/efl_canvas_video.eo
@@ -12,7 +12,6 @@ class @beta Efl.Canvas.Video extends Efl.Canvas.Group implements Efl.File, Efl.P
12 Please don't use this function, consider using 12 Please don't use this function, consider using
13 @Efl.Player.mute instead. 13 @Efl.Player.mute instead.
14 ]] 14 ]]
15 legacy: emotion_object_module_option_set;
16 } 15 }
17 values { 16 values {
18 opt: string; [[The option that is being set. Currently 17 opt: string; [[The option that is being set. Currently
@@ -39,7 +38,6 @@ class @beta Efl.Canvas.Video extends Efl.Canvas.Group implements Efl.File, Efl.P
39 38
40 See also @Efl.File.file. 39 See also @Efl.File.file.
41 ]] 40 ]]
42 legacy: emotion_object_init;
43 return: bool; [[$true if the specified module was successfully 41 return: bool; [[$true if the specified module was successfully
44 initialized for this object, $false otherwise.]] 42 initialized for this object, $false otherwise.]]
45 } 43 }
diff --git a/src/lib/emotion/efl_canvas_video_eo.legacy.c b/src/lib/emotion/efl_canvas_video_eo.legacy.c
new file mode 100644
index 0000000..e7e0dce
--- /dev/null
+++ b/src/lib/emotion/efl_canvas_video_eo.legacy.c
@@ -0,0 +1,12 @@
1
2EAPI void
3emotion_object_module_option_set(Efl_Canvas_Video *obj, const char *opt, const char *val)
4{
5 efl_canvas_video_option_set(obj, opt, val);
6}
7
8EAPI Eina_Bool
9emotion_object_init(Efl_Canvas_Video *obj, const char *module_filename)
10{
11 return efl_canvas_video_engine_set(obj, module_filename);
12}
diff --git a/src/lib/emotion/efl_canvas_video_eo.legacy.h b/src/lib/emotion/efl_canvas_video_eo.legacy.h
new file mode 100644
index 0000000..205c305
--- /dev/null
+++ b/src/lib/emotion/efl_canvas_video_eo.legacy.h
@@ -0,0 +1,60 @@
1#ifndef _EFL_CANVAS_VIDEO_EO_LEGACY_H_
2#define _EFL_CANVAS_VIDEO_EO_LEGACY_H_
3
4#ifndef _EFL_CANVAS_VIDEO_EO_CLASS_TYPE
5#define _EFL_CANVAS_VIDEO_EO_CLASS_TYPE
6
7typedef Eo Efl_Canvas_Video;
8
9#endif
10
11#ifndef _EFL_CANVAS_VIDEO_EO_TYPES
12#define _EFL_CANVAS_VIDEO_EO_TYPES
13
14
15#endif
16
17/**
18 * @brief Set the specified option for the current module.
19 *
20 * This function allows one to mute the video or audio of the emotion object.
21 *
22 * Please don't use this function, consider using @ref Efl.Player.mute instead.
23 *
24 * @param[in] obj The object.
25 * @param[in] opt The option that is being set. Currently supported options:
26 * "video" and "audio".
27 * @param[in] val The value of the option. Currently only supports "off"
28 * (?!?!?!)
29 *
30 * @ingroup (null)_Group
31 */
32EAPI void emotion_object_module_option_set(Efl_Canvas_Video *obj, const char *opt, const char *val);
33
34/**
35 * @brief Initializes an emotion object with the specified module.
36 *
37 * This function is required after creating the emotion object, in order to
38 * specify which module will be used with this object. Different objects can
39 * use different modules to play a media file. The current supported modules
40 * are gstreamer and xine.
41 *
42 * To use any of them, you need to make sure that support for them was compiled
43 * correctly.
44 *
45 * It's possible to disable the build of a module with --disable-module_name.
46 *
47 * See also @ref Efl.File.file.
48 *
49 * @param[in] obj The object.
50 * @param[in] module_filename The name of the module to be used (gstreamer or
51 * xine).
52 *
53 * @return @c true if the specified module was successfully initialized for
54 * this object, @c false otherwise.
55 *
56 * @ingroup (null)_Group
57 */
58EAPI Eina_Bool emotion_object_init(Efl_Canvas_Video *obj, const char *module_filename);
59
60#endif
diff --git a/src/lib/emotion/emotion_smart.c b/src/lib/emotion/emotion_smart.c
index 568bc40..e2243c8 100644
--- a/src/lib/emotion/emotion_smart.c
+++ b/src/lib/emotion/emotion_smart.c
@@ -1978,3 +1978,4 @@ _efl_canvas_video_efl_gfx_entity_size_set(Evas_Object *obj, Efl_Canvas_Video_Dat
1978 1978
1979 1979
1980#include "efl_canvas_video.eo.c" 1980#include "efl_canvas_video.eo.c"
1981#include "efl_canvas_video_eo.legacy.c"
diff --git a/src/lib/emotion/meson.build b/src/lib/emotion/meson.build
index ad25dc6..9321882 100644
--- a/src/lib/emotion/meson.build
+++ b/src/lib/emotion/meson.build
@@ -17,16 +17,6 @@ foreach eo_file : pub_legacy_eo_files
17 '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'), 17 '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'),
18 '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'), 18 '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'),
19 '-gchd', '@INPUT@']) 19 '-gchd', '@INPUT@'])
20 pub_eo_file_target += custom_target('eolian_gen_legacy_' + eo_file,
21 input : eo_file,
22 output : [eo_file + '.legacy.h'],
23 depfile : eo_file + '.legacy.d',
24 install : true,
25 install_dir : dir_package_include,
26 command : eolian_gen + [ '-I', meson.current_source_dir(), eolian_include_directories,
27 '-o', 'l:' + join_paths(meson.current_build_dir(), eo_file + '.legacy.h'),
28 '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.legacy.d'),
29 '-gld', '@INPUT@'])
30endforeach 20endforeach
31 21
32eolian_include_directories += ['-I', meson.current_source_dir()] 22eolian_include_directories += ['-I', meson.current_source_dir()]
@@ -34,7 +24,8 @@ eolian_include_directories += ['-I', meson.current_source_dir()]
34emotion_header_src = [ 24emotion_header_src = [
35 'Emotion.h', 25 'Emotion.h',
36 'Emotion_Legacy.h', 26 'Emotion_Legacy.h',
37 'Emotion_Eo.h' 27 'Emotion_Eo.h',
28 'efl_canvas_video_eo.legacy.h',
38] 29]
39 30
40emotion_src = [ 31emotion_src = [