diff options
author | Gustavo Sverzut Barbieri <barbieri@gmail.com> | 2011-09-04 00:17:06 +0000 |
---|---|---|
committer | Gustavo Sverzut Barbieri <barbieri@gmail.com> | 2011-09-04 00:17:06 +0000 |
commit | e83e1ea1fcc871825dd1f5dcbce125674b9732fb (patch) | |
tree | e53eced47ec811a246d9ff18a5108f66d10b1e94 /legacy/emotion/src/lib/emotion_smart.c | |
parent | 999e3bf306e5aae2c1e5bbf5beb512e50e924265 (diff) |
generic module can now be built-in as static module.
also removed sole left-overs of previous disable of vlc engine.
SVN revision: 63141
Diffstat (limited to '')
-rw-r--r-- | legacy/emotion/src/lib/emotion_smart.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/legacy/emotion/src/lib/emotion_smart.c b/legacy/emotion/src/lib/emotion_smart.c index be68d0fe24..3fbcbea5f5 100644 --- a/legacy/emotion/src/lib/emotion_smart.c +++ b/legacy/emotion/src/lib/emotion_smart.c | |||
@@ -121,7 +121,6 @@ static int _log_domain = -1; | |||
121 | static const char *_backend_priority[] = { | 121 | static const char *_backend_priority[] = { |
122 | "gstreamer", | 122 | "gstreamer", |
123 | "xine", | 123 | "xine", |
124 | "vlc", | ||
125 | "generic" | 124 | "generic" |
126 | }; | 125 | }; |
127 | 126 | ||
@@ -1508,6 +1507,9 @@ Eina_Bool xine_module_init(void); | |||
1508 | #ifdef EMOTION_STATIC_BUILD_GSTREAMER | 1507 | #ifdef EMOTION_STATIC_BUILD_GSTREAMER |
1509 | Eina_Bool gstreamer_module_init(void); | 1508 | Eina_Bool gstreamer_module_init(void); |
1510 | #endif | 1509 | #endif |
1510 | #ifdef EMOTION_STATIC_BUILD_GENERIC | ||
1511 | Eina_Bool generic_module_init(void); | ||
1512 | #endif | ||
1511 | 1513 | ||
1512 | static void | 1514 | static void |
1513 | _smart_init(void) | 1515 | _smart_init(void) |
@@ -1557,6 +1559,9 @@ _smart_init(void) | |||
1557 | #ifdef EMOTION_STATIC_BUILD_GSTREAMER | 1559 | #ifdef EMOTION_STATIC_BUILD_GSTREAMER |
1558 | gstreamer_module_init(); | 1560 | gstreamer_module_init(); |
1559 | #endif | 1561 | #endif |
1562 | #ifdef EMOTION_STATIC_BUILD_GENERIC | ||
1563 | generic_module_init(); | ||
1564 | #endif | ||
1560 | 1565 | ||
1561 | static Evas_Smart_Class sc = | 1566 | static Evas_Smart_Class sc = |
1562 | EVAS_SMART_CLASS_INIT_NAME_VERSION(E_OBJ_NAME); | 1567 | EVAS_SMART_CLASS_INIT_NAME_VERSION(E_OBJ_NAME); |