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
devs/stefan/testsuite-emotion
Stefan Schmidt 2 years ago
parent 91a5312f70
commit 628268a102
  1. 18
      src/edje_external/emotion/emotion.c
  2. 10
      src/lib/emotion/Emotion.h
  3. 50
      src/lib/emotion/emotion_modules.c

@ -51,25 +51,15 @@ static int _log_dom = -1;
#define DBG(...) EINA_LOG_DOM_DBG(_log_dom, __VA_ARGS__)
static const char *_external_emotion_engines[] = {
#ifdef EMOTION_BUILD_XINE
"xine",
#endif
#ifdef EMOTION_BUILD_GSTREAMER
"gstreamer",
#endif
#ifdef EMOTION_BUILD_GENERIC
"generic",
#if EMOTION_BUILD_GSTREAMER1
"gstreamer1",
#endif
NULL,
};
static const char _external_emotion_engine_def[] =
#if defined(EMOTION_BUILD_XINE)
"xine";
#elif defined(EMOTION_BUILD_GSTREAMER)
"gstreamer";
#elif defined(EMOTION_BUILD_GENERIC)
"generic";
#if defined(EMOTION_BUILD_GSTREAMER1)
"gstreamer1";
#else
"impossible";
#endif

@ -26,8 +26,7 @@
*
* A media object library for Evas and Ecore.
*
* Emotion is a library that allows playing audio and video files, using one of
* its backends (gstreamer, xine or generic shm player).
* Emotion is a library that allows playing audio and video files.
*
* It is integrated into Ecore through its mainloop, and is transparent to the
* user of the library how the decoding of audio and video is being done. Once
@ -135,12 +134,6 @@ extern "C" {
* play, seek, change volume, etc.
*/
enum _Emotion_Module
{
EMOTION_MODULE_XINE,
EMOTION_MODULE_GSTREAMER
};
enum _Emotion_Event
{
EMOTION_EVENT_MENU1, // Escape Menu
@ -265,7 +258,6 @@ enum _Emotion_Aspect
EMOTION_ASPECT_CUSTOM, /**< use custom borders/crop for the video */
};
typedef enum _Emotion_Module Emotion_Module;
typedef enum _Emotion_Event Emotion_Event;
typedef enum _Emotion_Meta_Info Emotion_Meta_Info; /**< Meta info type to be retrieved. */
typedef enum _Emotion_Vis Emotion_Vis; /**< Type of visualization. */

@ -11,22 +11,10 @@
#include "../../static_libs/buildsystem/buildsystem.h"
#include <unistd.h>
#ifdef EMOTION_STATIC_BUILD_XINE
Eina_Bool xine_module_init(void);
void xine_module_shutdown(void);
#endif
#if defined(EMOTION_STATIC_BUILD_GSTREAMER) || defined(EMOTION_STATIC_BUILD_GSTREAMER1)
#if defined(EMOTION_STATIC_BUILD_GSTREAMER1)
Eina_Bool gstreamer_module_init(void);
void gstreamer_module_shutdown(void);
#endif
#ifdef EMOTION_STATIC_BUILD_LIBVLC
Eina_Bool libvlc_module_init(void);
void libvlc_module_shutdown(void);
#endif
#ifdef EMOTION_STATIC_BUILD_GENERIC
Eina_Bool generic_module_init(void);
void generic_module_shutdown(void);
#endif
typedef struct _Emotion_Engine_Registry_Entry
{
@ -81,15 +69,7 @@ _emotion_modules_load(void)
if (stat(buf, &st) == 0)
{
const char *built_modules[] = {
#ifdef EMOTION_BUILD_GSTREAMER1
"gstreamer1",
#endif
#ifdef EMOTION_BUILD_XINE
"xine",
#endif
#ifdef EMOTION_BUILD_LIBVLC
"libvlc",
#endif
NULL
};
const char **itr;
@ -128,18 +108,9 @@ _emotion_modules_load(void)
Eina_Bool
emotion_modules_init(void)
{
#ifdef EMOTION_STATIC_BUILD_XINE
xine_module_init();
#endif
#if defined(EMOTION_STATIC_BUILD_GSTREAMER) || defined(EMOTION_STATIC_BUILD_GSTREAMER1)
#if defined(EMOTION_STATIC_BUILD_GSTREAMER1)
gstreamer_module_init();
#endif
#ifdef EMOTION_STATIC_BUILD_LIBVLC
libvlc_module_init();
#endif
#ifdef EMOTION_STATIC_BUILD_GENERIC
generic_module_init();
#endif
return EINA_TRUE;
}
@ -149,18 +120,9 @@ emotion_modules_shutdown(void)
{
Emotion_Engine_Registry_Entry *re;
#ifdef EMOTION_STATIC_BUILD_XINE
xine_module_shutdown();
#endif
#if defined(EMOTION_STATIC_BUILD_GSTREAMER) || defined(EMOTION_STATIC_BUILD_GSTREAMER1)
#if defined(EMOTION_STATIC_BUILD_GSTREAMER1)
gstreamer_module_shutdown();
#endif
#ifdef EMOTION_STATIC_BUILD_LIBVLC
libvlc_module_shutdown();
#endif
#ifdef EMOTION_STATIC_BUILD_GENERIC
generic_module_shutdown();
#endif
if (_emotion_modules)
{
@ -403,11 +365,7 @@ emotion_engine_instance_new(const char *name, Evas_Object *obj, Emotion_Module_O
if (!_emotion_engine_registry)
{
m = _find_mod("generic");
if (!m) m = _find_mod("xine");
if (!m) m = _find_mod("gstreamer");
if (!m) m = _find_mod("gstreamer1");
if (!m) m = _find_mod("libvlc");
m = _find_mod("gstreamer1");
if (!eina_module_load(m))
ERR("Cannot load module %s", eina_module_file_get(m));
}

Loading…
Cancel
Save