diff options
author | Gustavo Sverzut Barbieri <barbieri@gmail.com> | 2013-01-10 03:43:32 +0000 |
---|---|---|
committer | Gustavo Sverzut Barbieri <barbieri@gmail.com> | 2013-01-10 03:43:32 +0000 |
commit | dfb84c1657bfb14a5236b881193b81f4c0b8a69b (patch) | |
tree | b51b210fc88a21eec8e5907b8bbfe12ebc669f90 /legacy/emotion/src/lib/emotion_smart.c | |
parent | 532284dbbe4259a9f2291f44d3eff376849e8031 (diff) |
efl: merge emotion.
this one was quite a huge work, but hopefully it's correct.
NOTES:
* removed vlc generic module, it should go into a separate package.
* gstreamer is enabled by default (see --disable-gstreamer)
* xine is disabled by default (see --enable-gstreamer)
* generic is always built statically if supported
* gstreamer and xine can't be configured as static (just lacks command line options, build system supports it)
* v4l2 is enabled by default on linux if eeze is built (see --disable-v4l2)
* emotion_test moved to src/tests/emotion and depends on EFL_ENABLE_TESTS (--with-tests), but is still installed if enabled.
TODO (need your help!):
* fix warnings with gstreamer and xine engine
* call engine shutdown functions if building as static
* remove direct usage of PACKAGE_*_DIR and use eina_prefix
* add eina_prefix checkme file as evas and others
* add support for $EFL_RUN_IN_TREE
* create separate package for emotion_generic_modules
* check docs hierarchy (doxygen is segv'in here)
SVN revision: 82501
Diffstat (limited to '')
-rw-r--r-- | src/lib/emotion/emotion_smart.c (renamed from legacy/emotion/src/lib/emotion_smart.c) | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/legacy/emotion/src/lib/emotion_smart.c b/src/lib/emotion/emotion_smart.c index 0546d02aae..709414459c 100644 --- a/legacy/emotion/src/lib/emotion_smart.c +++ b/src/lib/emotion/emotion_smart.c | |||
@@ -1389,7 +1389,7 @@ _eio_load_xattr_done(void *data, Eio_File *handler, double xattr_double) | |||
1389 | } | 1389 | } |
1390 | 1390 | ||
1391 | static void | 1391 | static void |
1392 | _eio_load_xattr_error(void *data, Eio_File *handler, int err __UNUSED__) | 1392 | _eio_load_xattr_error(void *data, Eio_File *handler, int err EINA_UNUSED) |
1393 | { | 1393 | { |
1394 | Smart_Data *sd = data; | 1394 | Smart_Data *sd = data; |
1395 | 1395 | ||
@@ -1460,7 +1460,7 @@ _eio_save_xattr_done(void *data, Eio_File *handler) | |||
1460 | } | 1460 | } |
1461 | 1461 | ||
1462 | static void | 1462 | static void |
1463 | _eio_save_xattr_error(void *data, Eio_File *handler, int err __UNUSED__) | 1463 | _eio_save_xattr_error(void *data, Eio_File *handler, int err EINA_UNUSED) |
1464 | { | 1464 | { |
1465 | Smart_Data *sd = data; | 1465 | Smart_Data *sd = data; |
1466 | 1466 | ||
@@ -1792,7 +1792,7 @@ _emotion_frame_refill(Evas_Object *obj, double w, double h) | |||
1792 | /****************************/ | 1792 | /****************************/ |
1793 | 1793 | ||
1794 | static void | 1794 | static void |
1795 | _mouse_move(void *data, Evas *ev __UNUSED__, Evas_Object *obj, void *event_info) | 1795 | _mouse_move(void *data, Evas *ev EINA_UNUSED, Evas_Object *obj, void *event_info) |
1796 | { | 1796 | { |
1797 | Evas_Event_Mouse_Move *e; | 1797 | Evas_Event_Mouse_Move *e; |
1798 | Smart_Data *sd; | 1798 | Smart_Data *sd; |
@@ -1812,7 +1812,7 @@ _mouse_move(void *data, Evas *ev __UNUSED__, Evas_Object *obj, void *event_info) | |||
1812 | } | 1812 | } |
1813 | 1813 | ||
1814 | static void | 1814 | static void |
1815 | _mouse_down(void *data, Evas *ev __UNUSED__, Evas_Object *obj, void *event_info) | 1815 | _mouse_down(void *data, Evas *ev EINA_UNUSED, Evas_Object *obj, void *event_info) |
1816 | { | 1816 | { |
1817 | Evas_Event_Mouse_Down *e; | 1817 | Evas_Event_Mouse_Down *e; |
1818 | Smart_Data *sd; | 1818 | Smart_Data *sd; |