summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Schmidt <s.schmidt@samsung.com>2020-04-24 09:35:31 +0200
committerStefan Schmidt <s.schmidt@samsung.com>2020-06-05 12:47:43 +0200
commit628268a102dde3b94b74f1652c6a5e56c2810cb6 (patch)
tree2092bb80142b616aeca68aaeb6309c6640c5b527
parent91a5312f70169da3c7d64cdfc8ebe12d04de5889 (diff)
emotion: remove all left overs from removed backends
We removed them in the last release. Make sure we cleanup all the references and dead code still belonging to it. Extra note on the Emotion_Module enum removal. While it was exposed in the public Emotion.h header it is never used anywhere in the code and has no purpose, thus it can safely be removed. Reviewed-by: Carsten Haitzler (Rasterman) <raster@rasterman.com> Differential Revision: https://phab.enlightenment.org/D11941
-rw-r--r--src/edje_external/emotion/emotion.c18
-rw-r--r--src/lib/emotion/Emotion.h10
-rw-r--r--src/lib/emotion/emotion_modules.c50
3 files changed, 9 insertions, 69 deletions
diff --git a/src/edje_external/emotion/emotion.c b/src/edje_external/emotion/emotion.c
index 77ed0a71ee..243e055302 100644
--- a/src/edje_external/emotion/emotion.c
+++ b/src/edje_external/emotion/emotion.c
@@ -51,25 +51,15 @@ static int _log_dom = -1;
51#define DBG(...) EINA_LOG_DOM_DBG(_log_dom, __VA_ARGS__) 51#define DBG(...) EINA_LOG_DOM_DBG(_log_dom, __VA_ARGS__)
52 52
53static const char *_external_emotion_engines[] = { 53static const char *_external_emotion_engines[] = {
54#ifdef EMOTION_BUILD_XINE 54#if EMOTION_BUILD_GSTREAMER1
55 "xine", 55 "gstreamer1",
56#endif
57#ifdef EMOTION_BUILD_GSTREAMER
58 "gstreamer",
59#endif
60#ifdef EMOTION_BUILD_GENERIC
61 "generic",
62#endif 56#endif
63 NULL, 57 NULL,
64}; 58};
65 59
66static const char _external_emotion_engine_def[] = 60static const char _external_emotion_engine_def[] =
67#if defined(EMOTION_BUILD_XINE) 61#if defined(EMOTION_BUILD_GSTREAMER1)
68 "xine"; 62 "gstreamer1";
69#elif defined(EMOTION_BUILD_GSTREAMER)
70 "gstreamer";
71#elif defined(EMOTION_BUILD_GENERIC)
72 "generic";
73#else 63#else
74 "impossible"; 64 "impossible";
75#endif 65#endif
diff --git a/src/lib/emotion/Emotion.h b/src/lib/emotion/Emotion.h
index d246491153..5f68c09fa7 100644
--- a/src/lib/emotion/Emotion.h
+++ b/src/lib/emotion/Emotion.h
@@ -26,8 +26,7 @@
26 * 26 *
27 * A media object library for Evas and Ecore. 27 * A media object library for Evas and Ecore.
28 * 28 *
29 * Emotion is a library that allows playing audio and video files, using one of 29 * Emotion is a library that allows playing audio and video files.
30 * its backends (gstreamer, xine or generic shm player).
31 * 30 *
32 * It is integrated into Ecore through its mainloop, and is transparent to the 31 * It is integrated into Ecore through its mainloop, and is transparent to the
33 * user of the library how the decoding of audio and video is being done. Once 32 * user of the library how the decoding of audio and video is being done. Once
@@ -135,12 +134,6 @@ extern "C" {
135 * play, seek, change volume, etc. 134 * play, seek, change volume, etc.
136 */ 135 */
137 136
138enum _Emotion_Module
139{
140 EMOTION_MODULE_XINE,
141 EMOTION_MODULE_GSTREAMER
142};
143
144enum _Emotion_Event 137enum _Emotion_Event
145{ 138{
146 EMOTION_EVENT_MENU1, // Escape Menu 139 EMOTION_EVENT_MENU1, // Escape Menu
@@ -265,7 +258,6 @@ enum _Emotion_Aspect
265 EMOTION_ASPECT_CUSTOM, /**< use custom borders/crop for the video */ 258 EMOTION_ASPECT_CUSTOM, /**< use custom borders/crop for the video */
266}; 259};
267 260
268typedef enum _Emotion_Module Emotion_Module;
269typedef enum _Emotion_Event Emotion_Event; 261typedef enum _Emotion_Event Emotion_Event;
270typedef enum _Emotion_Meta_Info Emotion_Meta_Info; /**< Meta info type to be retrieved. */ 262typedef enum _Emotion_Meta_Info Emotion_Meta_Info; /**< Meta info type to be retrieved. */
271typedef enum _Emotion_Vis Emotion_Vis; /**< Type of visualization. */ 263typedef enum _Emotion_Vis Emotion_Vis; /**< Type of visualization. */
diff --git a/src/lib/emotion/emotion_modules.c b/src/lib/emotion/emotion_modules.c
index c23d0bb69d..e3ee96c3a6 100644
--- a/src/lib/emotion/emotion_modules.c
+++ b/src/lib/emotion/emotion_modules.c
@@ -11,22 +11,10 @@
11#include "../../static_libs/buildsystem/buildsystem.h" 11#include "../../static_libs/buildsystem/buildsystem.h"
12#include <unistd.h> 12#include <unistd.h>
13 13
14#ifdef EMOTION_STATIC_BUILD_XINE 14#if defined(EMOTION_STATIC_BUILD_GSTREAMER1)
15Eina_Bool xine_module_init(void);
16void xine_module_shutdown(void);
17#endif
18#if defined(EMOTION_STATIC_BUILD_GSTREAMER) || defined(EMOTION_STATIC_BUILD_GSTREAMER1)
19Eina_Bool gstreamer_module_init(void); 15Eina_Bool gstreamer_module_init(void);
20void gstreamer_module_shutdown(void); 16void gstreamer_module_shutdown(void);
21#endif 17#endif
22#ifdef EMOTION_STATIC_BUILD_LIBVLC
23Eina_Bool libvlc_module_init(void);
24void libvlc_module_shutdown(void);
25#endif
26#ifdef EMOTION_STATIC_BUILD_GENERIC
27Eina_Bool generic_module_init(void);
28void generic_module_shutdown(void);
29#endif
30 18
31typedef struct _Emotion_Engine_Registry_Entry 19typedef struct _Emotion_Engine_Registry_Entry
32{ 20{
@@ -81,15 +69,7 @@ _emotion_modules_load(void)
81 if (stat(buf, &st) == 0) 69 if (stat(buf, &st) == 0)
82 { 70 {
83 const char *built_modules[] = { 71 const char *built_modules[] = {
84#ifdef EMOTION_BUILD_GSTREAMER1
85 "gstreamer1", 72 "gstreamer1",
86#endif
87#ifdef EMOTION_BUILD_XINE
88 "xine",
89#endif
90#ifdef EMOTION_BUILD_LIBVLC
91 "libvlc",
92#endif
93 NULL 73 NULL
94 }; 74 };
95 const char **itr; 75 const char **itr;
@@ -128,18 +108,9 @@ _emotion_modules_load(void)
128Eina_Bool 108Eina_Bool
129emotion_modules_init(void) 109emotion_modules_init(void)
130{ 110{
131#ifdef EMOTION_STATIC_BUILD_XINE 111#if defined(EMOTION_STATIC_BUILD_GSTREAMER1)
132 xine_module_init();
133#endif
134#if defined(EMOTION_STATIC_BUILD_GSTREAMER) || defined(EMOTION_STATIC_BUILD_GSTREAMER1)
135 gstreamer_module_init(); 112 gstreamer_module_init();
136#endif 113#endif
137#ifdef EMOTION_STATIC_BUILD_LIBVLC
138 libvlc_module_init();
139#endif
140#ifdef EMOTION_STATIC_BUILD_GENERIC
141 generic_module_init();
142#endif
143 114
144 return EINA_TRUE; 115 return EINA_TRUE;
145} 116}
@@ -149,18 +120,9 @@ emotion_modules_shutdown(void)
149{ 120{
150 Emotion_Engine_Registry_Entry *re; 121 Emotion_Engine_Registry_Entry *re;
151 122
152#ifdef EMOTION_STATIC_BUILD_XINE 123#if defined(EMOTION_STATIC_BUILD_GSTREAMER1)
153 xine_module_shutdown();
154#endif
155#if defined(EMOTION_STATIC_BUILD_GSTREAMER) || defined(EMOTION_STATIC_BUILD_GSTREAMER1)
156 gstreamer_module_shutdown(); 124 gstreamer_module_shutdown();
157#endif 125#endif
158#ifdef EMOTION_STATIC_BUILD_LIBVLC
159 libvlc_module_shutdown();
160#endif
161#ifdef EMOTION_STATIC_BUILD_GENERIC
162 generic_module_shutdown();
163#endif
164 126
165 if (_emotion_modules) 127 if (_emotion_modules)
166 { 128 {
@@ -403,11 +365,7 @@ emotion_engine_instance_new(const char *name, Evas_Object *obj, Emotion_Module_O
403 365
404 if (!_emotion_engine_registry) 366 if (!_emotion_engine_registry)
405 { 367 {
406 m = _find_mod("generic"); 368 m = _find_mod("gstreamer1");
407 if (!m) m = _find_mod("xine");
408 if (!m) m = _find_mod("gstreamer");
409 if (!m) m = _find_mod("gstreamer1");
410 if (!m) m = _find_mod("libvlc");
411 if (!eina_module_load(m)) 369 if (!eina_module_load(m))
412 ERR("Cannot load module %s", eina_module_file_get(m)); 370 ERR("Cannot load module %s", eina_module_file_get(m));
413 } 371 }