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

AUTHORS

@@ -242,3 +242,18 @@ EPhysics
 Bruno Dilly <bdilly@profusion.mobi>
 Leandro Dorileo <dorileo@profusion.mobi>
 Ricardo de Almeida Gonzaga <ricardo@profusion.mobi>
+
+
+Emotion
+-------
+Carsten Haitzler <raster@rasterman.com>
+Vincent Torri <torri@maths.univ-evry.fr>
+Nicolas Aguirre <aguirre.nicolas@gmail.com>
+Sebastian Dransfeld <sd@tango.flipp.net>
+Cedric Bail <cedric.bail@free.fr>
+Rafael Antognolli <antognolli@profusion.mobi>
+Jérôme Pinot <ngc891@gmail.com>
+Pierre Le Magourou <pierre.lemagourou@openwide.fr>
+Hugo Camboulive <hugo.camboulive@zodiacaerospace.com>
+Sohyun Kim <anna1014.kim@samsung.com>
+Leandro Dorileo <dorileo@profusion.mobi>

Makefile.am

@@ -60,6 +60,7 @@ old/ChangeLog.efreet \
 old/ChangeLog.eina \
 old/ChangeLog.eio \
 old/ChangeLog.embryo \
+old/ChangeLog.emotion \
 old/ChangeLog.escape \
 old/ChangeLog.evas \
 old/ChangeLog.evil \
@@ -72,6 +73,7 @@ old/NEWS.efreet \
 old/NEWS.eina \
 old/NEWS.eio \
 old/NEWS.embryo \
+old/NEWS.emotion \
 old/NEWS.escape \
 old/NEWS.evas \
 old/NEWS.evil \
@@ -84,6 +86,7 @@ old/README.efreet \
 old/README.eina \
 old/README.eio \
 old/README.embryo \
+old/README.emotion \
 old/README.ephysics \
 old/README.escape \
 old/README.evas \
@@ -121,7 +124,8 @@ pc/edbus2.pc \
 pc/efreet.pc \
 pc/efreet-mime.pc \
 pc/efreet-trash.pc \
-pc/edje.pc
+pc/edje.pc \
+pc/emotion.pc
 
 if BUILD_ENGINE_SOFTWARE_X11
 pkgconfig_DATA += pc/evas-software-x11.pc

configure.ac

@@ -3090,6 +3090,8 @@ EFL_ADD_LIBS([EIO], [-lm])
 ### Checks for library functions
 
 EFL_LIB_END([Eio])
+dnl TODO: remove these ifdefs from code!
+AC_DEFINE([HAVE_EIO], [1], [Have eio library])
 #### End of Eio
 
 
@@ -3368,6 +3370,88 @@ AC_SUBST([want_physics])
 EFL_LIB_END([Edje])
 #### End of Edje
 
+#### Emotion
+EFL_LIB_START([Emotion])
+
+### Default values
+if test "${efl_func_shm_open}" = "yes"; then
+   want_emotion_generic="static"
+else
+   want_emotion_generic="no"
+fi
+
+### Additional options to configure
+AC_ARG_ENABLE([xine],
+   [AC_HELP_STRING([--enable-xine],
+                   [enable xine support. @<:@default=disabled@:>@])],
+   [
+    if test "x${withval}" = "xyes" ; then
+       want_xine="yes"
+    else
+       want_xine="no"
+    fi
+   ],
+   [want_xine="no"])
+
+AC_ARG_ENABLE([v4l2],
+   [AC_HELP_STRING([--enable-v4l2], [enable v4l2 support.])],
+   [
+    if test "x${withval}" = "xyes" ; then
+       want_v4l2="yes"
+    else
+       want_v4l2="no"
+    fi
+   ],
+   [want_v4l2="${efl_lib_optional_eeze}"])
+
+### Checks for programs
+
+### Checks for libraries
+EFL_INTERNAL_DEPEND_PKG([EMOTION], [eina])
+EFL_INTERNAL_DEPEND_PKG([EMOTION], [eo])
+EFL_INTERNAL_DEPEND_PKG([EMOTION], [ecore])
+EFL_INTERNAL_DEPEND_PKG([EMOTION], [eet])
+EFL_INTERNAL_DEPEND_PKG([EMOTION], [evas])
+EFL_INTERNAL_DEPEND_PKG([EMOTION], [eio])
+
+EFL_OPTIONAL_INTERNAL_DEPEND_PKG([EMOTION], [${want_v4l2}], [eeze])
+AM_CONDITIONAL([EMOTION_HAVE_V4L2], [test "${want_v4l2}" = "yes"])
+
+## modules
+
+have_gst_xoverlay="no"
+
+EMOTION_MODULE([xine], [${want_xine}])
+EMOTION_MODULE([gstreamer], [${want_gstreamer}])
+EMOTION_MODULE([generic], [${want_emotion_generic}])
+
+EFL_EVAL_PKGS([EMOTION])
+
+### Checks for header files
+
+### Checks for types
+
+### Checks for structures
+
+### Checks for compiler characteristics
+
+### Checks for linker characteristics
+
+### Checks for library functions
+
+if test "${want_v4l2}" = "yes"; then
+   AC_CHECK_DECL([V4L2_CAP_VIDEO_CAPTURE],
+      [AC_DEFINE([HAVE_V4L2], [1], [Define to 1 if you have Video4Linux 2 available])],
+      [AC_MSG_ERROR([Video4Linux 2 desired but not found. See --disable-v4l2.])],
+      [#include <linux/videodev2.h>])
+fi
+
+### Check availability
+
+EFL_LIB_END([Emotion])
+#### End of Emotion
+
+
 AC_ARG_ENABLE([always-build-examples],
    [AC_HELP_STRING([--enable-always-build-examples],
        [always build examples. @<:@default=disabled@:>@])],
@@ -3401,6 +3485,7 @@ src/examples/eio/Makefile
 src/examples/edbus/Makefile
 src/examples/ephysics/Makefile
 src/examples/edje/Makefile
+src/examples/emotion/Makefile
 src/lib/eina/eina_config.h
 src/lib/ecore_x/ecore_x_version.h
 spec/efl.spec
@@ -3449,6 +3534,7 @@ pc/efreet-trash.pc
 pc/eeze.pc
 pc/ephysics.pc
 pc/edje.pc
+pc/emotion.pc
 dbus-services/org.enlightenment.Efreet.service
 $po_makefile_in
 ])
@@ -3655,6 +3741,7 @@ echo
 echo "Eeze...................: ${efl_lib_optional_eeze} (tizen: ${want_tizen})"
 echo "EPhysics...............: ${efl_lib_optional_ephysics}"
 echo "Edje...................: yes (physics=${efl_lib_optional_ephysics}, multisense=${want_multisense})"
+echo "Emotion................: yes (gstreamer=${have_emotion_module_gstreamer} (xoverlay=${have_gst_xoverlay}), xine=${have_emotion_module_xine}, generic=${have_emotion_module_generic}, v4l2=${want_v4l2})"
 echo "Tests..................: ${build_tests}"
 
 echo "Examples...............: make examples"

doc/Doxyfile.in

@@ -604,7 +604,8 @@ INPUT                  = @top_srcdir@/src/lib \
                          @srcdir@/edbus_examples.dox \
                          @srcdir@/ephysics_examples.dox \
                          @srcdir@/edje_examples.dox \
-                         @top_srcdir@/src/bin/edje/edje_cc_handlers.c
+                         @top_srcdir@/src/bin/edje/edje_cc_handlers.c \
+                         @srcdir@/emotion_examples.dox
 
 # This tag can be used to specify the character encoding of the source files
 # that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is
@@ -813,7 +814,8 @@ edbus_ _edbus_ EDBus_ _EDBus_ EDBUS_ _EDBUS_ \
 efreet_ _efreet_ Efreet_ _Efreet_ EFREET_ _EFREET_ \
 eeze_ _eeze_ Eeze_ _Eeze_ EEZE_ _EEZE_ \
 ephysics_ _ephysics_ EPhysics_ _EPhysics_ EPHYSICS_ _EPHYSICS_ \
-edje_ _edje_ Edje_ _Edje_ EDJE_ _EDJE_
+edje_ _edje_ Edje_ _Edje_ EDJE_ _EDJE_ \
+emotion_ _emotion_ Emotion_ _Emotion_ EMOTION_ _EMOTION_
 
 
 #---------------------------------------------------------------------------

doc/Makefile.am

@@ -44,6 +44,7 @@ edje_examples.dox \
 eet_examples.dox \
 eina_examples.dox \
 eio_examples.dox \
+emotion_examples.dox \
 eo_tutorial.dox \
 ephysics_examples.dox \
 evas_examples.dox \

doc/emotion_examples.dox

@@ -1,5 +1,5 @@
 /**
- * @page Examples Examples
+ * @page emotion_examples Emotion Examples
  *
  * Here is a page with some Emotion examples explained:
  *

doc/main.dox

@@ -21,6 +21,7 @@
  * @li @ref eeze_main hardware device manipulation and notification.
  * @li @ref ephysics_main physics simulation integration and visual effects.
  * @li @ref edje_main layout and theme library with super powers.
+ * @li @ref emotion_main to play music and videos.
  *
  */
 
@@ -42,7 +43,7 @@
  * @author Brian Mattern <rephorm@@rephorm.com>
  * @author Bruno Dilly <bdilly@@profusion.mobi>
  * @author Burra <burra@@colorado.edu>
- * @author Carsten Haitzler <raster@@@rasterman.com>
+ * @author Carsten Haitzler <raster@@rasterman.com>
  * @author Cedric BAIL <cedric.bail@@free.fr>
  * @author Chidambar Zinnoury <illogict@@online.fr>
  * @author Chris Ross <chris@@darkrock.co.uk>
@@ -70,6 +71,7 @@
  * @author Haifeng Deng <haifeng.deng@@samsung.com>
  * @author Hisham 'CodeWarrior' Mardam Bey <hisham@@hisham.cc>
  * @author Howell Tam <pigeon@@pigeond.net>
+ * @author Hugo Camboulive <hugo.camboulive@@zodiacaerospace.com>
  * @author Hyoyoung Chang <hyoyoung@@gmail.com>
  * @author Ibukun Olumuyiwa <ibukun@@computer.org>
  * @author Iván Briano <ivan@@profusion.mobi>
@@ -103,6 +105,7 @@
  * @author Nicholas Curran <quasar@@bigblue.net.au>
  * @author Nicolas Aguirre <aguirre.nicolas@@gmail.com>
  * @author Peter Wehrfritz <peter.wehrfritz@@web.de>
+ * @author Pierre Le Magourou <pierre.lemagourou@@openwide.fr>
  * @author PnB <Poor.NewBie@@gmail.com>
  * @author Prince Kumar Dubey <prince.dubey@@samsung.com> <prince.dubey@@gmail.com>
  * @author Rafael Antognolli <antognolli@@profusion.mobi>
@@ -119,6 +122,7 @@
  * @author Seungsoo Woo <om101.woo@@samsung.com>
  * @author Shilpa Singh <shilpa.singh@@samsung.com> <shilpasingh.o@@gmail.com>
  * @author Simon Poole <simon.armlinux@@themalago.net>
+ * @author Sohyun Kim <anna1014.kim@@samsung.com>
  * @author Steve Ireland <sireland@@pobox.com>
  * @author Sung W. Park <sungwoo@@gmail.com>
  * @author Term <term@@twistedpath.org>
@@ -222,3 +226,9 @@
  *
  * @brief Layout and theme library with super-powers.
  */
+
+/**
+ * @defgroup Emotion
+ *
+ * @brief Plays music and videos.
+ */

m4/emotion_module.m4

@@ -0,0 +1,96 @@
+dnl use: EMOTION_MODULE_DEP_CHECK_XINE(want_engine)
+dnl where want_engine = yes or static
+AC_DEFUN([EMOTION_MODULE_DEP_CHECK_XINE],
+[dnl
+   requirements="libxine >= 1.1.1"
+   if test "$1" = "static"; then
+      EFL_DEPEND_PKG([EMOTION], [EMOTION_MODULE_XINE], [${requirements}])
+   else
+      PKG_CHECK_MODULES([EMOTION_MODULE_XINE], [${requirements}])
+   fi
+])
+
+dnl use: EMOTION_MODULE_DEP_CHECK_GSTREAMER(want_static)
+dnl where want_engine = yes or static
+AC_DEFUN([EMOTION_MODULE_DEP_CHECK_GSTREAMER],
+[dnl
+   GST_VER=0.10.2
+   requirements="gstreamer-0.10 >= ${GST_VER} gstreamer-plugins-base-0.10 >= ${GST_VER} gstreamer-video-0.10 >= ${GST_VER} gstreamer-interfaces-0.10 >= ${GST_VER}"
+   have_gst_xoverlay="no"
+   if test "$1" = "static"; then
+      EFL_DEPEND_PKG([EMOTION], [EMOTION_MODULE_GSTREAMER], [${requirements}])
+   else
+      PKG_CHECK_MODULES([EMOTION_MODULE_GSTREAMER], [${requirements}])
+   fi
+
+   if test "${want_x11_any}" = "yes"; then
+      if test "$1" = "static"; then # we need gstreamer cflags and libs to test xoverlay support
+         PKG_CHECK_MODULES([EMOTION_MODULE_GSTREAMER], [${requirements}])
+      fi
+      CFLAGS_save="${CFLAGS}"
+      CFLAGS="${CFLAGS} ${EMOTION_MODULE_GSTREAMER_CFLAGS}"
+      AC_CHECK_HEADER([gst/interfaces/xoverlay.h],
+         [have_gst_xoverlay="old" # will check for "new" later with AC_CHECK_LIB()
+          AC_DEFINE(HAVE_XOVERLAY_H, 1, [Build with Gstreamer Xoverlay support])],
+         [AC_MSG_WARN([Building Gstreamer with X11 but no gst/interfaces/xoverlay.h found])],
+         [#include <gst/gst.h>])
+      CFLAGS="${CFLAGS_save}"
+
+      LDFLAGS_save=${LDFLAGS}
+      LDFLAGS="${LDFLAGS} ${EMOTION_MODULE_GSTREAMER_LIBS}"
+      AC_CHECK_LIB([gstinterfaces-0.10], [gst_x_overlay_set_window_handle],
+         [have_gst_xoverlay="new"
+          AC_DEFINE([HAVE_X_OVERLAY_SET], [1], [Use gst_x_overlay_set_window_handle instead of old deprecated gst_x_overlay_set_xwindow_id])])
+      LDFLAGS="${LDFLAGS_save}"
+   fi
+])
+
+dnl use: EMOTION_MODULE_DEP_CHECK_GENERIC(want_static)
+dnl where want_engine = yes or static
+AC_DEFUN([EMOTION_MODULE_DEP_CHECK_GENERIC], [])
+
+dnl use: EMOTION_MODULE(name, want_engine)
+dnl
+dnl defines EMOTION_BUILD_NAME if it should be built
+dnl defines EMOTION_STATIC_BUILD_NAME if should be built statically
+dnl
+AC_DEFUN([EMOTION_MODULE],
+[
+m4_pushdef([UP], m4_translit([$1], [-a-z], [_A-Z]))dnl
+m4_pushdef([DOWN], m4_translit([$1], [-A-Z], [_a-z]))dnl
+
+want_engine="$2"
+want_static_engine="no"
+have_engine="no"
+have_emotion_module_[]DOWN="no"
+
+EMOTION_MODULE_[]m4_defn([UP])[]_CFLAGS=""
+EMOTION_MODULE_[]m4_defn([UP])[]_LIBS=""
+
+if test "x${want_engine}" = "xyes" -o "x${want_engine}" = "xstatic"; then
+
+   m4_default([EMOTION_MODULE_DEP_CHECK_]m4_defn([UP]))([${want_engine}])
+
+   have_engine="yes"
+   if test "x${want_engine}" = "xstatic" ; then
+      have_emotion_module_[]DOWN="static"
+      want_static_engine="yes"
+   else
+      have_emotion_module_[]DOWN="yes"
+   fi
+fi
+
+AC_DEFINE_IF(EMOTION_BUILD_[]UP, [test "${have_engine}" = "yes"],
+  [1], [Build $1 Evas engine])
+AM_CONDITIONAL(EMOTION_BUILD_[]UP, [test "${have_engine}" = "yes"])
+
+AC_DEFINE_IF(EMOTION_STATIC_BUILD_[]UP, [test "${want_static_engine}" = "yes"],
+  [1], [Build $1 Evas engine inside libevas])
+AM_CONDITIONAL(EMOTION_STATIC_BUILD_[]UP, [test "${want_static_engine}" = "yes"])
+
+AC_SUBST([EMOTION_MODULE_]m4_defn([UP])[_CFLAGS])
+AC_SUBST([EMOTION_MODULE_]m4_defn([UP])[_LIBS])
+
+m4_popdef([UP])
+m4_popdef([DOWN])
+])

pc/emotion.pc.in

@@ -5,7 +5,7 @@ includedir=@includedir@
 
 Name: emotion
 Description: Emotion evas based multimedia library
-@pkgconfig_requires_private@: @requirement_emotion@
 Version: @VERSION@
+Requires.private: @requirements_pc_emotion@
 Libs: -L${libdir} -lemotion
 Cflags: -I${includedir}/emotion-@VMAJ@

src/Makefile.am

@@ -42,6 +42,7 @@ include Makefile_Efreet.am
 include Makefile_Eeze.am
 include Makefile_EPhysics.am
 include Makefile_Edje.am
+include Makefile_Emotion.am
 
 .PHONY: benchmark examples
 
@@ -80,6 +81,7 @@ clean-local:
 	rm -rf lib/eeze/*.gcno
 	rm -rf lib/ephysics/*.gcno
 	rm -rf lib/edje/*.gcno
+	rm -rf lib/emotion/*.gcno
 	rm -rf modules/eina/mp/pass_through/*.gcno
 	rm -rf modules/eina/mp/one_big/*.gcno
 	rm -rf modules/eina/mp/chained_pool/*.gcno
@@ -119,5 +121,8 @@ clean-local:
 	rm -rf modules/edje/alsa_snd_player/*.gcno
 	rm -rf modules/edje/eet_snd_reader/*.gcno
 	rm -rf modules/edje/multisense_factory/*.gcno
+	rm -rf modules/emotion/xine/*.gcno
+	rm -rf modules/emotion/gstreamer/*.gcno
+	rm -rf modules/emotion/generic/*.gcno
 	rm -rf static_libs/liblinebreak/*.gcno
 	rm -rf static_libs/lz4/*.gcno

src/Makefile_Edje.am

@@ -257,3 +257,13 @@ $(EDJE_COMMON_USER_LDADD) \
 @CHECK_LIBS@
 
 endif
+
+# Useful to other modules that generate EDJ
+EDJE_CC = EFL_RUN_IN_TREE=1 $(top_builddir)/src/bin/edje/edje_cc
+EDJE_CC_FLAGS_VERBOSE_0 =
+EDJE_CC_FLAGS_VERBOSE_1 = -v
+EDJE_CC_FLAGS = $(EDJE_CC_FLAGS_VERBOSE_$(V)) -id $(srcdir) -fd $(srcdir)
+
+AM_V_EDJ = $(am__v_EDJ_$(V))
+am__v_EDJ_ = $(am__v_EDJ_$(AM_DEFAULT_VERBOSITY))
+am__v_EDJ_0 = @echo "  EDJ   " $@;

src/Makefile_Emotion.am

@@ -0,0 +1,235 @@
+### Library
+
+lib_LTLIBRARIES += \
+lib/emotion/libemotion.la
+
+EMOTION_COMMON_CPPFLAGS = \
+-I$(top_srcdir)/src/lib/eina \
+-I$(top_builddir)/src/lib/eina \
+-I$(top_srcdir)/src/lib/eo \
+-I$(top_builddir)/src/lib/eo \
+-I$(top_srcdir)/src/lib/ecore \
+-I$(top_builddir)/src/lib/ecore \
+-I$(top_srcdir)/src/lib/ecore_x \
+-I$(top_builddir)/src/lib/ecore_x \
+-I$(top_srcdir)/src/lib/ecore_input \
+-I$(top_builddir)/src/lib/ecore_input \
+-I$(top_srcdir)/src/lib/ecore_evas \
+-I$(top_builddir)/src/lib/ecore_evas \
+-I$(top_srcdir)/src/lib/eet \
+-I$(top_builddir)/src/lib/eet \
+-I$(top_srcdir)/src/lib/evas \
+-I$(top_builddir)/src/lib/evas \
+-I$(top_srcdir)/src/lib/eio \
+-I$(top_builddir)/src/lib/eio \
+-I$(top_srcdir)/src/lib/eeze \
+-I$(top_builddir)/src/lib/eeze \
+-I$(top_srcdir)/src/lib/emotion \
+-I$(top_builddir)/src/lib/emotion \
+@EFL_COV_CFLAGS@ \
+@EMOTION_CFLAGS@
+
+EMOTION_COMMON_LDADD = \
+lib/eina/libeina.la \
+lib/eo/libeo.la \
+lib/ecore/libecore.la \
+lib/eet/libeet.la \
+lib/evas/libevas.la \
+lib/eio/libeio.la \
+@EFL_COV_LIBS@
+
+if EMOTION_HAVE_V4L2
+EMOTION_COMMON_LDADD += lib/eeze/libeeze.la
+endif
+
+installed_emotionmainheadersdir = $(includedir)/emotion-@VMAJ@
+dist_installed_emotionmainheaders_DATA = lib/emotion/Emotion.h
+
+# libemotion.la
+lib_emotion_libemotion_la_SOURCES = \
+lib/emotion/emotion_private.h \
+lib/emotion/emotion_smart.c \
+lib/emotion/emotion_main.c
+
+EMOTION_COMMON_LIBADD = $(EMOTION_COMMON_LDADD) @EMOTION_LIBS@
+EMOTION_COMMON_LDADD  += @EMOTION_LDFLAGS@
+EMOTION_COMMON_USER_LIBADD = $(EMOTION_COMMON_LIBADD) lib/emotion/libemotion.la
+EMOTION_COMMON_USER_LDADD  = $(EMOTION_COMMON_LDADD) lib/emotion/libemotion.la
+
+lib_emotion_libemotion_la_CPPFLAGS = \
+$(EMOTION_COMMON_CPPFLAGS) \
+-DPACKAGE_BIN_DIR=\"$(bindir)\" \
+-DPACKAGE_LIB_DIR=\"$(libdir)\" \
+-DPACKAGE_DATA_DIR=\"$(datadir)/emotion\" \
+-DPACKAGE_BUILD_DIR=\"`pwd`/$(top_builddir)\" \
+-DEFL_EMOTION_BUILD
+
+lib_emotion_libemotion_la_LIBADD = $(EMOTION_COMMON_LIBADD)
+lib_emotion_libemotion_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
+
+## Modules
+
+# Xine
+EMOTION_XINE_SOURCES = \
+modules/emotion/xine/emotion_xine.h \
+modules/emotion/xine/emotion_xine.c \
+modules/emotion/xine/emotion_xine_vo_out.c
+
+if EMOTION_STATIC_BUILD_XINE
+lib_emotion_libemotion_la_SOURCES += $(EMOTION_XINE_SOURCES)
+else
+if EMOTION_BUILD_XINE
+emotionmodulexinedir = $(libdir)/emotion/modules/xine/$(MODULE_ARCH)
+emotionmodulexine_LTLIBRARIES = modules/emotion/xine/module.la
+modules_emotion_xine_module_la_SOURCES = $(EMOTION_XINE_SOURCES)
+modules_emotion_xine_module_la_CPPFLAGS = \
+$(EMOTION_COMMON_CPPFLAGS) \
+@EMOTION_MODULE_XINE_CFLAGS@
+modules_emotion_xine_module_la_LIBADD = \
+$(EMOTION_COMMON_USER_LIBADD) \
+@EMOTION_MODULE_XINE_LIBS@
+modules_emotion_xine_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
+modules_emotion_xine_module_la_LIBTOOLFLAGS = --tag=disable-static
+endif
+endif
+
+# Gstreamer
+EMOTION_GSTREAMER_SOURCES = \
+modules/emotion/gstreamer/emotion_gstreamer.h \
+modules/emotion/gstreamer/emotion_gstreamer.c \
+modules/emotion/gstreamer/emotion_alloc.c \
+modules/emotion/gstreamer/emotion_convert.c \
+modules/emotion/gstreamer/emotion_fakeeos.c \
+modules/emotion/gstreamer/emotion_sink.c
+
+if EMOTION_STATIC_BUILD_GSTREAMER
+lib_emotion_libemotion_la_SOURCES += $(EMOTION_GSTREAMER_SOURCES)
+if HAVE_ECORE_X
+EMOTION_COMMON_LDADD += \
+lib/ecore_evas/libecore_evas.la \
+lib/ecore_x/libecore_x.la
+endif
+else
+if EMOTION_BUILD_GSTREAMER
+emotionmodulegstreamerdir = $(libdir)/emotion/modules/gstreamer/$(MODULE_ARCH)
+emotionmodulegstreamer_LTLIBRARIES = modules/emotion/gstreamer/module.la
+modules_emotion_gstreamer_module_la_SOURCES = $(EMOTION_GSTREAMER_SOURCES)
+modules_emotion_gstreamer_module_la_CPPFLAGS = \
+$(EMOTION_COMMON_CPPFLAGS) \
+@EMOTION_MODULE_GSTREAMER_CFLAGS@
+modules_emotion_gstreamer_module_la_LIBADD = \
+$(EMOTION_COMMON_USER_LIBADD) \
+@EMOTION_MODULE_GSTREAMER_LIBS@
+modules_emotion_gstreamer_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
+modules_emotion_gstreamer_module_la_LIBTOOLFLAGS = --tag=disable-static
+if HAVE_ECORE_X
+modules_emotion_gstreamer_module_la_LIBADD += \
+lib/ecore_evas/libecore_evas.la \
+lib/ecore_x/libecore_x.la
+endif
+endif
+endif
+
+# Generic
+EMOTION_GENERIC_SOURCES = \
+modules/emotion/generic/emotion_generic.h \
+modules/emotion/generic/emotion_generic.c
+
+if EMOTION_STATIC_BUILD_GENERIC
+lib_emotion_libemotion_la_SOURCES += $(EMOTION_GENERIC_SOURCES)
+else
+if EMOTION_BUILD_GENERIC
+emotionmodulegenericdir = $(libdir)/emotion/modules/generic/$(MODULE_ARCH)
+emotionmodulegeneric_LTLIBRARIES = modules/emotion/generic/module.la
+modules_emotion_generic_module_la_SOURCES = $(EMOTION_GENERIC_SOURCES)
+modules_emotion_generic_module_la_CPPFLAGS = \
+$(EMOTION_COMMON_CPPFLAGS)
+modules_emotion_generic_module_la_LIBADD = \
+$(EMOTION_COMMON_USER_LIBADD)
+modules_emotion_generic_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
+modules_emotion_generic_module_la_LIBTOOLFLAGS = --tag=disable-static
+endif
+endif
+
+if EMOTION_BUILD_GENERIC
+dist_installed_emotionmainheaders_DATA += \
+modules/emotion/generic/Emotion_Generic_Plugin.h
+endif
+
+
+# Edje_External
+emotionedjeexternaldir = $(libdir)/edje/modules/emotion/$(MODULE_ARCH)
+emotionedjeexternal_LTLIBRARIES = edje_external/emotion/module.la
+
+edje_external_emotion_module_la_SOURCES = \
+edje_external/emotion/emotion.c
+edje_external_emotion_module_la_CPPFLAGS = \
+$(EMOTION_COMMON_CPPFLAGS) \
+$(EDJE_COMMON_CPPFLAGS)
+edje_external_emotion_module_la_LIBADD = \
+$(EMOTION_COMMON_USER_LIBADD) \
+$(EDJE_COMMON_USER_LIBADD)
+edje_external_emotion_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
+edje_external_emotion_module_la_LIBTOOLFLAGS = --tag=disable-static
+
+### Binary
+
+### Unit tests
+
+if EFL_ENABLE_TESTS
+
+bin_PROGRAMS += tests/emotion/emotion_test
+
+tests_emotion_emotion_test_SOURCES = \
+tests/emotion/emotion_test_main.c
+
+tests_emotion_emotion_test_CPPFLAGS = \
+$(EMOTION_COMMON_CPPFLAGS) \
+-I$(top_srcdir)/src/lib/edje \
+-I$(top_builddir)/src/lib/edje \
+-DPACKAGE_BIN_DIR=\"$(bindir)\" \
+-DPACKAGE_LIB_DIR=\"$(libdir)\" \
+-DPACKAGE_DATA_DIR=\"$(datadir)/emotion\" \
+-DPACKAGE_BUILD_DIR=\"`pwd`/$(top_builddir)\"
+
+tests_emotion_emotion_test_LDADD = \
+$(EMOTION_COMMON_USER_LDADD) \
+lib/edje/libedje.la
+
+tests/emotion/data/theme.edj: tests/emotion/data/theme.edc
+	$(AM_V_EDJ)$(EDJE_CC) $(EDJE_CC_FLAGS) -id $(srcdir)/tests/emotion/data $< $@
+
+EMOTION_DATA_FILES = \
+tests/emotion/data/bpause.png \
+tests/emotion/data/bplay.png \
+tests/emotion/data/bstop.png \
+tests/emotion/data/e_logo.png \
+tests/emotion/data/fr1.png \
+tests/emotion/data/fr2.png \
+tests/emotion/data/fr3.png \
+tests/emotion/data/fr4.png \
+tests/emotion/data/fr5.png \
+tests/emotion/data/fr6.png \
+tests/emotion/data/fr7.png \
+tests/emotion/data/h_slider.png \
+tests/emotion/data/icon.edc \
+tests/emotion/data/knob.png \
+tests/emotion/data/orb.png \
+tests/emotion/data/pnl.png \
+tests/emotion/data/sl.png \
+tests/emotion/data/theme.edc \
+tests/emotion/data/tiles.png \
+tests/emotion/data/video_frame_bottom.png \
+tests/emotion/data/video_frame_left.png \
+tests/emotion/data/video_frame_right.png \
+tests/emotion/data/video_frame_top.png \
+tests/emotion/data/whb.png \
+tests/emotion/data/window_inner_shadow.png
+
+emotiondatafilesdir = $(datadir)/emotion/data
+emotiondatafiles_DATA = tests/emotion/data/theme.edj
+endif
+
+EXTRA_DIST += \
+$(EMOTION_DATA_FILES) \
+modules/emotion/generic/README

src/edje_external/emotion/emotion.c

@@ -75,14 +75,14 @@ static const char _external_emotion_engine_def[] =
 #endif
 
 static void
-_external_emotion_signal_proxy_free_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
+_external_emotion_signal_proxy_free_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
 {
    External_Emotion_Signals_Proxy_Context *ctxt = data;
    free(ctxt);
 }
 
 static void
-_external_emotion_signal_proxy_cb(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
+_external_emotion_signal_proxy_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
 {
    External_Emotion_Signals_Proxy_Context *ctxt = data;
    // TODO: Is it worth to check Evas_Smart_Cb_Description and do something
@@ -91,7 +91,7 @@ _external_emotion_signal_proxy_cb(void *data, Evas_Object *obj __UNUSED__, void
 }
 
 static Evas_Object *
-_external_emotion_add(void *data __UNUSED__, Evas *evas, Evas_Object *edje __UNUSED__, const Eina_List *params, const char *part_name)
+_external_emotion_add(void *data EINA_UNUSED, Evas *evas, Evas_Object *edje EINA_UNUSED, const Eina_List *params, const char *part_name)
 {
    const Evas_Smart_Cb_Description **cls_descs, **inst_descs;
    unsigned int cls_count, inst_count, total;
@@ -145,13 +145,13 @@ _external_emotion_add(void *data __UNUSED__, Evas *evas, Evas_Object *edje __UNU
 }
 
 static void
-_external_emotion_signal(void *data __UNUSED__, Evas_Object *obj __UNUSED__, const char *signal, const char *source)
+_external_emotion_signal(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, const char *signal, const char *source)
 {
    DBG("External Signal received: '%s' '%s'", signal, source);
 }
 
 static void
-_external_emotion_state_set(void *data __UNUSED__, Evas_Object *obj, const void *from_params, const void *to_params, float pos __UNUSED__)
+_external_emotion_state_set(void *data EINA_UNUSED, Evas_Object *obj, const void *from_params, const void *to_params, float pos EINA_UNUSED)
 {
    const External_Emotion_Params *p;
 
@@ -187,7 +187,7 @@ _external_emotion_state_set(void *data __UNUSED__, Evas_Object *obj, const void
 }
 
 static Eina_Bool
-_external_emotion_param_set(void *data __UNUSED__, Evas_Object *obj, const Edje_External_Param *param)
+_external_emotion_param_set(void *data EINA_UNUSED, Evas_Object *obj, const Edje_External_Param *param)
 {
    if (!strcmp(param->name, "engine"))
      {
@@ -265,7 +265,7 @@ _external_emotion_param_set(void *data __UNUSED__, Evas_Object *obj, const Edje_
 }
 
 static Eina_Bool
-_external_emotion_param_get(void *data __UNUSED__, const Evas_Object *obj, Edje_External_Param *param)
+_external_emotion_param_get(void *data EINA_UNUSED, const Evas_Object *obj, Edje_External_Param *param)
 {
 #define _STR(M)						\
    else if (!strcmp(param->name, #M))				\
@@ -332,7 +332,7 @@ _external_emotion_param_get(void *data __UNUSED__, const Evas_Object *obj, Edje_
 }
 
 static void *
-_external_emotion_params_parse(void *data __UNUSED__, Evas_Object *obj __UNUSED__, const Eina_List *params)
+_external_emotion_params_parse(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, const Eina_List *params)
 {
    const Edje_External_Param *param;
    const Eina_List *l;
@@ -418,13 +418,13 @@ _external_emotion_params_free(void *params)
 }
 
 static const char *
-_external_emotion_label_get(void *data __UNUSED__)
+_external_emotion_label_get(void *data EINA_UNUSED)
 {
     return "Emotion";
 }
 
 static Evas_Object *
-_external_emotion_icon_add(void *data __UNUSED__, Evas *e)
+_external_emotion_icon_add(void *data EINA_UNUSED, Evas *e)
 {
    Evas_Object *ic;
    int w = 0, h = 0;
@@ -441,7 +441,7 @@ _external_emotion_icon_add(void *data __UNUSED__, Evas *e)
 }
 
 static const char *
-_external_emotion_translate(void *data __UNUSED__, const char *orig)
+_external_emotion_translate(void *data EINA_UNUSED, const char *orig)
 {
    // in future, mark all params as translatable and use dgettext()
    // with "emotion" text domain here.

src/examples/Makefile.am

@@ -1,6 +1,6 @@
 MAINTAINERCLEANFILES = Makefile.in
 
-SUBDIRS = eina eo eet evas ecore eio edbus ephysics edje
+SUBDIRS = eina eo eet evas ecore eio edbus ephysics edje emotion
 
 .PHONY: examples install-examples
 

src/examples/emotion/Makefile.am

@@ -0,0 +1,57 @@
+MAINTAINERCLEANFILES = Makefile.in
+
+AM_CPPFLAGS = \
+-I$(top_srcdir)/src/lib/eina \
+-I$(top_srcdir)/src/lib/eo \
+-I$(top_srcdir)/src/lib/evas \
+-I$(top_srcdir)/src/lib/ecore \
+-I$(top_srcdir)/src/lib/ecore_evas \
+-I$(top_srcdir)/src/lib/emotion \
+-I$(top_builddir)/src/lib/eina \
+-I$(top_builddir)/src/lib/eo \
+-I$(top_builddir)/src/lib/evas \
+-I$(top_builddir)/src/lib/ecore \
+-I$(top_builddir)/src/lib/ecore_evas \
+-I$(top_builddir)/src/lib/emotion \
+@EMOTION_CFLAGS@
+
+LDADD = \
+$(top_builddir)/src/lib/eina/libeina.la \
+$(top_builddir)/src/lib/eo/libeo.la \
+$(top_builddir)/src/lib/evas/libevas.la \
+$(top_builddir)/src/lib/ecore/libecore.la \
+$(top_builddir)/src/lib/ecore_evas/libecore_evas.la \
+$(top_builddir)/src/lib/emotion/libemotion.la \
+@EMOTION_LDFLAGS@
+
+EXTRA_PROGRAMS = \
+emotion_basic_example \
+emotion_generic_example \
+emotion_generic_subtitle_example \
+emotion_border_example \
+emotion_signals_example
+
+SRCS = \
+emotion_basic_example.c \
+emotion_generic_example.c \
+emotion_generic_subtitle_example.c \
+emotion_border_example.c \
+emotion_signals_example.c
+
+examples: $(EXTRA_PROGRAMS)
+
+clean-local:
+	rm -f $(EXTRA_PROGRAMS)
+
+install-examples:
+	mkdir -p $(datadir)/emotion/examples
+	$(install_sh_DATA) -c $(SRCS) $(datadir)/emotion/examples
+
+uninstall-local:
+	for f in $(SRCS); do \
+	  rm -f $(datadir)/emotion/examples/$$f ; \
+	done
+
+if ALWAYS_BUILD_EXAMPLES
+noinst_PROGRAMS = $(EXTRA_PROGRAMS)
+endif

src/lib/emotion/Emotion.h

@@ -10,17 +10,24 @@
 
 /**
  *
- * @mainpage Emotion Library Documentation
+ * @page emotion_main Emotion
  *
- * @version 1.7.0
- * @date 2003-2012
+ * @date 2003 (created)
  *
- * @section intro What is Emotion?
+ * @section toc Table of Contents
+ *
+ * @li @ref emotion_main_intro
+ * @li @ref emotion_main_work
+ * @li @ref emotion_main_compiling
+ * @li @ref emotion_main_next_steps
+ * @li @ref emotion_main_intro_example
+ *
+ * @section emotion_main_intro Introduction
  *
  * 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 or xine).
+ * its backends (gstreamer, xine or generic shm player).
  *
  * 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
@@ -32,7 +39,7 @@
  * default Evas object functions. Callbacks can be added to the signals emitted
  * by this object with evas_object_smart_callback_add().
  *
- * @section work How does Emotion work?
+ * @section emotion_main_work How does Emotion work?
  *
  * The Emotion library uses Evas smart objects to allow you to manipulate the
  * created object as any other Evas object, and to connect to its signals,
@@ -40,40 +47,48 @@
  * inside Edje themes, and expect it to behave as a normal image or rectangle
  * when regarding to its dimensions.
  *
- * To instantiate an Emotion object, the simple code below is enough:
+ * @section emotion_main_compiling How to compile
  *
- * @code
- * em = emotion_object_add(e);
- * emotion_object_init(em, NULL);
+ * Emotion is a library your application links to. The procedure for this is
+ * very simple. You simply have to compile your application with the
+ * appropriate compiler flags that the @c pkg-config script outputs. For
+ * example:
  *
- * emotion_object_file_set(em, file_path);
+ * Compiling C or C++ files into object files:
  *
- * evas_object_move(em, 0, 0);
- * evas_object_resize(em, WIDTH, HEIGHT);
- * evas_object_show(em);
+ * @verbatim
+   gcc -c -o main.o main.c `pkg-config --cflags emotion`
+   @endverbatim
  *
- * emotion_object_play_set(em, EINA_TRUE);
- * @endcode
+ * Linking object files into a binary executable:
  *
- * See the @ref Emotion_API for a better reference.
+ * @verbatim
+   gcc -o my_application main.o `pkg-config --libs emotion`
+   @endverbatim
  *
- * Please see the @ref authors page for contact details.
+ * See @ref pkgconfig
  *
- */
-
-/**
+ * @section emotion_main_next_steps Next Steps
  *
- * @page authors Authors
+ * After you understood what Emotion is and installed it in your
+ * system you should proceed understanding the programming
+ * interface. We'd recommend you to take a while to learn @ref Ecore and
+ * @ref Evas to get started.
  *
- * @author Carsten Haitzler <raster@rasterman.com>
- * @author Vincent Torri <torri@maths.univ-evry.fr>
- * @author Nicolas Aguirre <aguirre.nicolas@gmail.com>
- * @author Sebastian Dransfeld <sd@tango.flipp.net>
- * @author Cedric Bail <cedric.bail@free.fr>
+ * Recommended reading:
  *
- * Please contact <enlightenment-devel@lists.sourceforge.net> to get in
- * contact with the developers and maintainers.
+ * @li @ref Emotion_Init to initialize the library.
+ * @li @ref Emotion_Video to control video parameters.
+ * @li @ref Emotion_Audio to control audio parameters.
+ * @li @ref Emotion_Play to control playback.
+ * @li @ref Emotion_Webcam to show cameras.
+ * @li @ref Emotion_API for general programming interface.
  *
+ * @section emotion_main_intro_example Introductory Example
+ *
+ * @include emotion_basic_example.c
+ *
+ * More examples can be found at @ref emotion_examples.
  */
 
 #include <Evas.h>
@@ -266,6 +281,7 @@ extern "C" {
  * @brief How to create, initialize, manipulate and connect to signals of an
  * Emotion object.
  * @defgroup Emotion_API API available for manipulating Emotion object.
+ * @ingroup Emotion
  *
  * @{
  *
@@ -604,6 +620,7 @@ EAPI Eina_Bool    emotion_object_file_set              (Evas_Object *obj, const
 EAPI const char  *emotion_object_file_get              (const Evas_Object *obj);
 /**
  * @defgroup Emotion_Play Play control functions
+ * @ingroup Emotion
  *
  * @{
  */
@@ -1265,6 +1282,7 @@ EAPI Evas_Object *emotion_object_image_get(const Evas_Object *obj);
 
 /**
  * @defgroup Emotion_Webcam API available for accessing webcam
+ * @ingroup Emotion
  */
 
 typedef struct _Emotion_Webcam Emotion_Webcam; /**< Webcam description */

src/lib/emotion/emotion_main.c

@@ -10,32 +10,15 @@
 #  include <stdlib.h>
 # endif
 #endif
-#ifdef HAVE_ALLOCA_H
-# include <alloca.h>
-#elif !defined alloca
-# ifdef __GNUC__
-#  define alloca __builtin_alloca
-# elif defined _AIX
-#  define alloca __alloca
-# elif defined _MSC_VER
-#  include <malloc.h>
-#  define alloca _alloca
-# elif !defined HAVE_ALLOCA
-#  ifdef  __cplusplus
-extern "C"
-#  endif
-void *alloca (size_t);
-# endif
-#endif
 
 #include <stdio.h>
 
-#ifdef EMOTION_HAVE_EEZE
+#ifdef HAVE_EEZE
 # include <sys/types.h>
 # include <sys/stat.h>
 # include <fcntl.h>
-# include <sys/ioctl.h>
 # ifdef HAVE_V4L2
+#  include <sys/ioctl.h>
 #  include <linux/videodev2.h>
 # endif
 # include <Eeze.h>
@@ -114,7 +97,7 @@ static const struct ext_match_s matchs[] =
 };
 
 Eina_Bool
-_emotion_object_extension_can_play_generic_get(const void *data __UNUSED__, const char *file)
+_emotion_object_extension_can_play_generic_get(const void *data EINA_UNUSED, const char *file)
 {
    unsigned int length;
    unsigned int i;
@@ -213,7 +196,7 @@ emotion_webcam_destroy(Emotion_Webcam *ew)
    free(ew);
 }
 
-#ifdef EMOTION_HAVE_EEZE
+#ifdef HAVE_EEZE
 static Eeze_Udev_Watch *eeze_watcher = NULL;
 
 static void
@@ -307,8 +290,8 @@ _emotion_enumerate_all_webcams(void)
 static void
 _emotion_eeze_events(const char *syspath,
                      Eeze_Udev_Event ev,
-                     void *data __UNUSED__,
-                     Eeze_Udev_Watch *watcher __UNUSED__)
+                     void *data EINA_UNUSED,
+                     Eeze_Udev_Watch *watcher EINA_UNUSED)
 {
    if (ev == EEZE_UDEV_EVENT_REMOVE)
      {
@@ -365,7 +348,7 @@ emotion_init(void)
         if (!_emotion_webcams) return EINA_FALSE;
      }
 
-#ifdef EMOTION_HAVE_EEZE
+#ifdef HAVE_EEZE
    EMOTION_WEBCAM_UPDATE = ecore_event_type_new();
 
    eeze_init();
@@ -409,7 +392,7 @@ emotion_shutdown(void)
         _emotion_webcams_file = NULL;
      }
 
-#ifdef EMOTION_HAVE_EEZE
+#ifdef HAVE_EEZE
    eeze_udev_watch_del(eeze_watcher);
    eeze_watcher = NULL;
 

src/lib/emotion/emotion_smart.c

@@ -1389,7 +1389,7 @@ _eio_load_xattr_done(void *data, Eio_File *handler, double xattr_double)
 }
 
 static void
-_eio_load_xattr_error(void *data, Eio_File *handler, int err __UNUSED__)
+_eio_load_xattr_error(void *data, Eio_File *handler, int err EINA_UNUSED)
 {
    Smart_Data *sd = data;
 
@@ -1460,7 +1460,7 @@ _eio_save_xattr_done(void *data, Eio_File *handler)
 }
 
 static void
-_eio_save_xattr_error(void *data, Eio_File *handler, int err __UNUSED__)
+_eio_save_xattr_error(void *data, Eio_File *handler, int err EINA_UNUSED)
 {
    Smart_Data *sd = data;
 
@@ -1792,7 +1792,7 @@ _emotion_frame_refill(Evas_Object *obj, double w, double h)
 /****************************/
 
 static void
-_mouse_move(void *data, Evas *ev __UNUSED__, Evas_Object *obj, void *event_info)
+_mouse_move(void *data, Evas *ev EINA_UNUSED, Evas_Object *obj, void *event_info)
 {
    Evas_Event_Mouse_Move *e;
    Smart_Data *sd;
@@ -1812,7 +1812,7 @@ _mouse_move(void *data, Evas *ev __UNUSED__, Evas_Object *obj, void *event_info)
 }
 
 static void
-_mouse_down(void *data, Evas *ev __UNUSED__, Evas_Object *obj, void *event_info)
+_mouse_down(void *data, Evas *ev EINA_UNUSED, Evas_Object *obj, void *event_info)
 {
    Evas_Event_Mouse_Down *e;
    Smart_Data *sd;

src/modules/emotion/generic/emotion_generic.c

@@ -862,7 +862,7 @@ _player_cmd_handler_cb(void *data, Ecore_Fd_Handler *fd_handler)
 }
 
 static Eina_Bool
-_player_data_cb(void *data, int type __UNUSED__, void *event)
+_player_data_cb(void *data, int type EINA_UNUSED, void *event)
 {
    Ecore_Exe_Event_Data *ev = event;
    Emotion_Generic_Video *evideo = data;
@@ -881,7 +881,7 @@ _player_data_cb(void *data, int type __UNUSED__, void *event)
 }
 
 static Eina_Bool
-_player_add_cb(void *data, int type __UNUSED__, void *event)
+_player_add_cb(void *data, int type EINA_UNUSED, void *event)
 {
    Ecore_Exe_Event_Add *event_add = event;
    Ecore_Exe *player = event_add->exe;
@@ -900,7 +900,7 @@ _player_add_cb(void *data, int type __UNUSED__, void *event)
 }
 
 static Eina_Bool
-_player_del_cb(void *data, int type __UNUSED__, void *event __UNUSED__)
+_player_del_cb(void *data, int type EINA_UNUSED, void *event EINA_UNUSED)
 {
    Ecore_Exe_Event_Del *event_del = event;
    Ecore_Exe *player = event_del->exe;
@@ -1090,7 +1090,7 @@ em_shutdown(void *data)
 }
 
 static unsigned char
-em_file_open(const char *file, Evas_Object *obj __UNUSED__, void *data)
+em_file_open(const char *file, Evas_Object *obj EINA_UNUSED, void *data)
 {
    Emotion_Generic_Video *ev = data;
    INF("file set: %s", file);
@@ -1145,7 +1145,7 @@ em_file_close(void *data)
 }
 
 static Emotion_Format
-em_format_get(void *ef __UNUSED__)
+em_format_get(void *ef EINA_UNUSED)
 {
    return EMOTION_FORMAT_BGRA;
 }
@@ -1239,7 +1239,7 @@ em_len_get(void *data)
 }
 
 static double
-em_buffer_size_get(void *data __UNUSED__)
+em_buffer_size_get(void *data EINA_UNUSED)
 {
    return 1.0;
 }
@@ -1252,7 +1252,7 @@ em_fps_num_get(void *data)
 }
 
 static int
-em_fps_den_get(void *ef __UNUSED__)
+em_fps_den_get(void *ef EINA_UNUSED)
 {
    return 1000;
 }
@@ -1272,7 +1272,7 @@ em_pos_get(void *data)
 }
 
 static void
-em_vis_set(void *ef __UNUSED__, Emotion_Vis vis __UNUSED__)
+em_vis_set(void *ef EINA_UNUSED, Emotion_Vis vis EINA_UNUSED)
 {
 }
 
@@ -1284,7 +1284,7 @@ em_vis_get(void *data)
 }
 
 static Eina_Bool
-em_vis_supported(void *ef __UNUSED__, Emotion_Vis vis __UNUSED__)
+em_vis_supported(void *ef EINA_UNUSED, Emotion_Vis vis EINA_UNUSED)
 {
    return EINA_FALSE;
 }
@@ -1296,13 +1296,13 @@ em_ratio_get(void *data)
    return ev->ratio;
 }
 
-static int em_video_handled(void *ef __UNUSED__)
+static int em_video_handled(void *ef EINA_UNUSED)
 {
    DBG("video handled!");
    return 1;
 }
 
-static int em_audio_handled(void *ef __UNUSED__)
+static int em_audio_handled(void *ef EINA_UNUSED)
 {
    DBG("audio handled!");
    return 1;
@@ -1314,12 +1314,12 @@ static int em_seekable(void *data)
    return ev->seekable;
 }
 
-static void em_frame_done(void *ef __UNUSED__)
+static void em_frame_done(void *ef EINA_UNUSED)
 {
 }
 
 static int
-em_yuv_rows_get(void *data __UNUSED__, int w __UNUSED__, int h __UNUSED__, unsigned char **yrows __UNUSED__, unsigned char **urows __UNUSED__, unsigned char **vrows __UNUSED__)
+em_yuv_rows_get(void *data EINA_UNUSED, int w EINA_UNUSED, int h EINA_UNUSED, unsigned char **yrows EINA_UNUSED, unsigned char **urows EINA_UNUSED, unsigned char **vrows EINA_UNUSED)
 {
    return 0;
 }
@@ -1356,17 +1356,17 @@ em_bgra_data_get(void *data, unsigned char **bgra_data)
 }
 
 static void
-em_event_feed(void *ef __UNUSED__, int event __UNUSED__)
+em_event_feed(void *ef EINA_UNUSED, int event EINA_UNUSED)
 {
 }
 
 static void
-em_event_mouse_button_feed(void *ef __UNUSED__, int button __UNUSED__, int x __UNUSED__, int y __UNUSED__)
+em_event_mouse_button_feed(void *ef EINA_UNUSED, int button EINA_UNUSED, int x EINA_UNUSED, int y EINA_UNUSED)
 {
 }
 
 static void
-em_event_mouse_move_feed(void *ef __UNUSED__, int x __UNUSED__, int y __UNUSED__)
+em_event_mouse_move_feed(void *ef EINA_UNUSED, int x EINA_UNUSED, int y EINA_UNUSED)
 {
 }
 
@@ -1604,26 +1604,26 @@ em_spu_channel_mute_get(void *data)
 }
 
 static int
-em_chapter_count(void *ef __UNUSED__)
+em_chapter_count(void *ef EINA_UNUSED)
 {
    int num = 0;
    return num;
 }
 
 static void
-em_chapter_set(void *ef __UNUSED__, int chapter __UNUSED__)
+em_chapter_set(void *ef EINA_UNUSED, int chapter EINA_UNUSED)
 {
 }
 
 static int
-em_chapter_get(void *ef __UNUSED__)
+em_chapter_get(void *ef EINA_UNUSED)
 {
    int num = 0;
    return num;
 }
 
 static const char *
-em_chapter_name_get(void *ef __UNUSED__, int chapter __UNUSED__)
+em_chapter_name_get(void *ef EINA_UNUSED, int chapter EINA_UNUSED)
 {
    return NULL;
 }
@@ -1650,7 +1650,7 @@ em_speed_get(void *data)
 }
 
 static int
-em_eject(void *ef __UNUSED__)
+em_eject(void *ef EINA_UNUSED)
 {
    return 1;
 }
@@ -1778,7 +1778,7 @@ module_open(Evas_Object *obj, const Emotion_Video_Module **module, void **video,
    return EINA_TRUE;
 }
 
-static void module_close(Emotion_Video_Module *module __UNUSED__, void *video)
+static void module_close(Emotion_Video_Module *module EINA_UNUSED, void *video)
 {
 	em_module.shutdown(video);
 }

src/modules/emotion/gstreamer/emotion_alloc.c

@@ -13,7 +13,6 @@
 
 #ifdef HAVE_ECORE_X
 # include <Ecore_X.h>
-# include <Ecore_Evas.h>
 # ifdef HAVE_XOVERLAY_H
 #  include <gst/interfaces/xoverlay.h>
 # endif

src/modules/emotion/gstreamer/emotion_convert.c

@@ -12,7 +12,6 @@
 
 #ifdef HAVE_ECORE_X
 # include <Ecore_X.h>
-# include <Ecore_Evas.h>
 # ifdef HAVE_XOVERLAY_H
 #  include <gst/interfaces/xoverlay.h>
 # endif
@@ -23,7 +22,7 @@
 
 static inline void
 _evas_video_bgrx_step(unsigned char *evas_data, const unsigned char *gst_data,
-                      unsigned int w, unsigned int h __UNUSED__, unsigned int output_height, unsigned int step)
+                      unsigned int w, unsigned int h EINA_UNUSED, unsigned int output_height, unsigned int step)
 {
    unsigned int x;
    unsigned int y;
@@ -55,7 +54,7 @@ _evas_video_bgrx(unsigned char *evas_data, const unsigned char *gst_data, unsign
 }
 
 static void
-_evas_video_bgra(unsigned char *evas_data, const unsigned char *gst_data, unsigned int w, unsigned int h __UNUSED__, unsigned int output_height)
+_evas_video_bgra(unsigned char *evas_data, const unsigned char *gst_data, unsigned int w, unsigned int h EINA_UNUSED, unsigned int output_height)
 {
    unsigned int x;
    unsigned int y;
@@ -132,7 +131,7 @@ _evas_video_yv12(unsigned char *evas_data, const unsigned char *gst_data, unsign
 }
 
 static void
-_evas_video_yuy2(unsigned char *evas_data, const unsigned char *gst_data, unsigned int w, unsigned int h __UNUSED__, unsigned int output_height)
+_evas_video_yuy2(unsigned char *evas_data, const unsigned char *gst_data, unsigned int w, unsigned int h EINA_UNUSED, unsigned int output_height)
 {
    const unsigned char **rows;
    unsigned int i;
@@ -147,7 +146,7 @@ _evas_video_yuy2(unsigned char *evas_data, const unsigned char *gst_data, unsign
 }
 
 static void
-_evas_video_nv12(unsigned char *evas_data, const unsigned char *gst_data, unsigned int w, unsigned int h __UNUSED__, unsigned int output_height)
+_evas_video_nv12(unsigned char *evas_data, const unsigned char *gst_data, unsigned int w, unsigned int h EINA_UNUSED, unsigned int output_height)
 {
    const unsigned char **rows;
    unsigned int i, j;
@@ -165,7 +164,7 @@ _evas_video_nv12(unsigned char *evas_data, const unsigned char *gst_data, unsign
 }
 
 static void
-_evas_video_mt12(unsigned char *evas_data, const unsigned char *gst_data, unsigned int w, unsigned int h, unsigned int output_height __UNUSED__)
+_evas_video_mt12(unsigned char *evas_data, const unsigned char *gst_data, unsigned int w, unsigned int h, unsigned int output_height EINA_UNUSED)
 {
    const unsigned char **rows;
    unsigned int i;
@@ -187,7 +186,7 @@ _evas_video_mt12(unsigned char *evas_data, const unsigned char *gst_data, unsign
 }
 
 void
-_evas_video_st12_multiplane(unsigned char *evas_data, const unsigned char *gst_data, unsigned int w, unsigned int h, unsigned int output_height __UNUSED__)
+_evas_video_st12_multiplane(unsigned char *evas_data, const unsigned char *gst_data, unsigned int w, unsigned int h, unsigned int output_height EINA_UNUSED)
 {
    const GstMultiPlaneImageBuffer *mp_buf = (const GstMultiPlaneImageBuffer *) gst_data;
    const unsigned char **rows;
@@ -213,7 +212,7 @@ _evas_video_st12_multiplane(unsigned char *evas_data, const unsigned char *gst_d
 }
 
 void
-_evas_video_st12(unsigned char *evas_data, const unsigned char *gst_data, unsigned int w __UNUSED__, unsigned int h, unsigned int output_height __UNUSED__)
+_evas_video_st12(unsigned char *evas_data, const unsigned char *gst_data, unsigned int w EINA_UNUSED, unsigned int h, unsigned int output_height EINA_UNUSED)
 {
    const SCMN_IMGB *imgb = (const SCMN_IMGB *) gst_data;
    const unsigned char **rows;

src/modules/emotion/gstreamer/emotion_fakeeos.c

@@ -12,7 +12,6 @@
 
 #ifdef HAVE_ECORE_X
 # include <Ecore_X.h>
-# include <Ecore_Evas.h>
 # ifdef HAVE_XOVERLAY_H
 #  include <gst/interfaces/xoverlay.h>
 # endif
@@ -51,7 +50,7 @@ fakeeos_bin_handle_message(GstBin * bin, GstMessage * message)
 }
 
 static void
-fakeeos_bin_base_init(gpointer g_class __UNUSED__)
+fakeeos_bin_base_init(gpointer g_class EINA_UNUSED)
 {
 }
 
@@ -65,7 +64,7 @@ fakeeos_bin_class_init(FakeEOSBinClass * klass)
 }
 
 static void
-fakeeos_bin_init(FakeEOSBin *src __UNUSED__,
-                 FakeEOSBinClass *klass __UNUSED__)
+fakeeos_bin_init(FakeEOSBin *src EINA_UNUSED,
+                 FakeEOSBinClass *klass EINA_UNUSED)
 {
 }

src/modules/emotion/gstreamer/emotion_gstreamer.c

@@ -21,7 +21,6 @@
 
 #ifdef HAVE_ECORE_X
 # include <Ecore_X.h>
-# include <Ecore_Evas.h>
 # ifdef HAVE_XOVERLAY_H
 #  include <gst/interfaces/xoverlay.h>
 # endif
@@ -350,7 +349,7 @@ emotion_visualization_element_name_get(Emotion_Vis visualisation)
 static unsigned char
 em_init(Evas_Object            *obj,
         void                  **emotion_video,
-        Emotion_Module_Options *opt __UNUSED__)
+        Emotion_Module_Options *opt EINA_UNUSED)
 {
    Emotion_Gstreamer_Video *ev;
    GError                  *error;
@@ -584,7 +583,7 @@ em_file_close(void *video)
 
 static void
 em_play(void   *video,
-        double  pos __UNUSED__)
+        double  pos EINA_UNUSED)
 {
    Emotion_Gstreamer_Video *ev;
 
@@ -836,7 +835,7 @@ em_vis_get(void *video)
 }
 
 static Eina_Bool
-em_vis_supported(void *ef __UNUSED__, Emotion_Vis vis)
+em_vis_supported(void *ef EINA_UNUSED, Emotion_Vis vis)
 {
    const char *name;
    GstElementFactory *factory;
@@ -897,13 +896,13 @@ em_audio_handled(void *video)
 }
 
 static int
-em_seekable(void *video __UNUSED__)
+em_seekable(void *video EINA_UNUSED)
 {
    return 1;
 }
 
 static void
-em_frame_done(void *video __UNUSED__)
+em_frame_done(void *video EINA_UNUSED)
 {
 }
 
@@ -965,34 +964,34 @@ em_video_data_size_get(void *video, int *w, int *h)
 }
 
 static int
-em_yuv_rows_get(void           *video __UNUSED__,
-                int             w __UNUSED__,
-                int             h __UNUSED__,
-                unsigned char **yrows __UNUSED__,
-                unsigned char **urows __UNUSED__,
-                unsigned char **vrows __UNUSED__)
+em_yuv_rows_get(void           *video EINA_UNUSED,
+                int             w EINA_UNUSED,
+                int             h EINA_UNUSED,
+                unsigned char **yrows EINA_UNUSED,
+                unsigned char **urows EINA_UNUSED,
+                unsigned char **vrows EINA_UNUSED)
 {
    return 0;
 }
 
 static int
-em_bgra_data_get(void *video __UNUSED__, unsigned char **bgra_data __UNUSED__)
+em_bgra_data_get(void *video EINA_UNUSED, unsigned char **bgra_data EINA_UNUSED)
 {
    return 0;
 }
 
 static void
-em_event_feed(void *video __UNUSED__, int event __UNUSED__)
+em_event_feed(void *video EINA_UNUSED, int event EINA_UNUSED)
 {
 }
 
 static void
-em_event_mouse_button_feed(void *video __UNUSED__, int button __UNUSED__, int x __UNUSED__, int y __UNUSED__)
+em_event_mouse_button_feed(void *video EINA_UNUSED, int button EINA_UNUSED, int x EINA_UNUSED, int y EINA_UNUSED)
 {
 }
 
 static void
-em_event_mouse_move_feed(void *video __UNUSED__, int x __UNUSED__, int y __UNUSED__)
+em_event_mouse_move_feed(void *video EINA_UNUSED, int x EINA_UNUSED, int y EINA_UNUSED)
 {
 }
 
@@ -1010,8 +1009,8 @@ em_video_channel_count(void *video)
 }
 
 static void
-em_video_channel_set(void *video __UNUSED__,
-                     int   channel __UNUSED__)
+em_video_channel_set(void *video EINA_UNUSED,
+                     int   channel EINA_UNUSED)
 {
 #if 0
    Emotion_Gstreamer_Video *ev;
@@ -1036,22 +1035,22 @@ em_video_channel_get(void *video)
 }
 
 static void
-em_video_subtitle_file_set(void *video __UNUSED__,
-                           const char *filepath __UNUSED__)
+em_video_subtitle_file_set(void *video EINA_UNUSED,
+                           const char *filepath EINA_UNUSED)
 {
    DBG("video_subtitle_file_set not implemented for gstreamer yet.");
 }
 
 static const char *
-em_video_subtitle_file_get(void *video __UNUSED__)
+em_video_subtitle_file_get(void *video EINA_UNUSED)
 {
    DBG("video_subtitle_file_get not implemented for gstreamer yet.");
    return NULL;
 }
 
 static const char *
-em_video_channel_name_get(void *video __UNUSED__,
-                          int   channel __UNUSED__)
+em_video_channel_name_get(void *video EINA_UNUSED,
+                          int   channel EINA_UNUSED)
 {
    return NULL;
 }
@@ -1092,8 +1091,8 @@ em_audio_channel_count(void *video)
 }
 
 static void
-em_audio_channel_set(void *video __UNUSED__,
-                     int   channel __UNUSED__)
+em_audio_channel_set(void *video EINA_UNUSED,
+                     int   channel EINA_UNUSED)
 {
 #if 0
    Emotion_Gstreamer_Video *ev;
@@ -1118,8 +1117,8 @@ em_audio_channel_get(void *video)
 }
 
 static const char *
-em_audio_channel_name_get(void *video __UNUSED__,
-                          int   channel __UNUSED__)
+em_audio_channel_name_get(void *video EINA_UNUSED,
+                          int   channel EINA_UNUSED)
 {
    return NULL;
 }
@@ -1187,75 +1186,75 @@ em_audio_channel_volume_get(void *video)
 /* spu stuff */
 
 static int
-em_spu_channel_count(void *video __UNUSED__)
+em_spu_channel_count(void *video EINA_UNUSED)
 {
    return 0;
 }
 
 static void
-em_spu_channel_set(void *video __UNUSED__, int channel __UNUSED__)
+em_spu_channel_set(void *video EINA_UNUSED, int channel EINA_UNUSED)
 {
 }
 
 static int
-em_spu_channel_get(void *video __UNUSED__)
+em_spu_channel_get(void *video EINA_UNUSED)
 {
    return 1;
 }
 
 static const char *
-em_spu_channel_name_get(void *video __UNUSED__, int channel __UNUSED__)
+em_spu_channel_name_get(void *video EINA_UNUSED, int channel EINA_UNUSED)
 {
    return NULL;
 }
 
 static void
-em_spu_channel_mute_set(void *video __UNUSED__, int mute __UNUSED__)
+em_spu_channel_mute_set(void *video EINA_UNUSED, int mute EINA_UNUSED)
 {
 }
 
 static int
-em_spu_channel_mute_get(void *video __UNUSED__)
+em_spu_channel_mute_get(void *video EINA_UNUSED)
 {
    return 0;
 }
 
 static int
-em_chapter_count(void *video __UNUSED__)
+em_chapter_count(void *video EINA_UNUSED)
 {
    return 0;
 }
 
 static void
-em_chapter_set(void *video __UNUSED__, int chapter __UNUSED__)
+em_chapter_set(void *video EINA_UNUSED, int chapter EINA_UNUSED)
 {
 }
 
 static int
-em_chapter_get(void *video __UNUSED__)
+em_chapter_get(void *video EINA_UNUSED)
 {
    return 0;
 }
 
 static const char *
-em_chapter_name_get(void *video __UNUSED__, int chapter __UNUSED__)
+em_chapter_name_get(void *video EINA_UNUSED, int chapter EINA_UNUSED)
 {
    return NULL;
 }
 
 static void
-em_speed_set(void *video __UNUSED__, double speed __UNUSED__)
+em_speed_set(void *video EINA_UNUSED, double speed EINA_UNUSED)
 {
 }
 
 static double
-em_speed_get(void *video __UNUSED__)
+em_speed_get(void *video EINA_UNUSED)
 {
    return 1.0;
 }
 
 static int
-em_eject(void *video __UNUSED__)
+em_eject(void *video EINA_UNUSED)
 {
    return 1;
 }
@@ -1333,7 +1332,7 @@ em_priority_get(void *video)
 
 #ifdef HAVE_ECORE_X
 static Eina_Bool
-_ecore_event_x_destroy(void *data __UNUSED__, int type __UNUSED__, void *event __UNUSED__)
+_ecore_event_x_destroy(void *data EINA_UNUSED, int type EINA_UNUSED, void *event EINA_UNUSED)
 {
    Ecore_X_Event_Window_Destroy *ev = event;
 
@@ -1439,7 +1438,7 @@ module_open(Evas_Object           *obj,
 }
 
 static void
-module_close(Emotion_Video_Module *module __UNUSED__,
+module_close(Emotion_Video_Module *module EINA_UNUSED,
              void                 *video)
 {
    em_module.shutdown(video);
@@ -1790,7 +1789,7 @@ _eos_main_fct(void *data)
 }
 
 static GstBusSyncReply
-_eos_sync_fct(GstBus *bus __UNUSED__, GstMessage *msg, gpointer data)
+_eos_sync_fct(GstBus *bus EINA_UNUSED, GstMessage *msg, gpointer data)
 {
    Emotion_Gstreamer_Video *ev = data;
    Emotion_Gstreamer_Message *send;

src/modules/emotion/gstreamer/emotion_gstreamer.h

@@ -324,7 +324,7 @@ struct _SCMN_IMGB
    int      data[16];
 };
 
-void _evas_video_st12_multiplane(unsigned char *evas_data, const unsigned char *gst_data, unsigned int w, unsigned int h, unsigned int output_height __UNUSED__);
-void _evas_video_st12(unsigned char *evas_data, const unsigned char *gst_data, unsigned int w __UNUSED__, unsigned int h, unsigned int output_height __UNUSED__);
+void _evas_video_st12_multiplane(unsigned char *evas_data, const unsigned char *gst_data, unsigned int w, unsigned int h, unsigned int output_height EINA_UNUSED);
+void _evas_video_st12(unsigned char *evas_data, const unsigned char *gst_data, unsigned int w EINA_UNUSED, unsigned int h, unsigned int output_height EINA_UNUSED);
 
 #endif /* __EMOTION_GSTREAMER_H__ */

src/modules/emotion/gstreamer/emotion_sink.c

@@ -80,7 +80,7 @@ evas_video_sink_base_init(gpointer g_class)
 }
 
 static void
-evas_video_sink_init(EvasVideoSink* sink, EvasVideoSinkClass* klass __UNUSED__)
+evas_video_sink_init(EvasVideoSink* sink, EvasVideoSinkClass* klass EINA_UNUSED)
 {
    EvasVideoSinkPrivate* priv;
 
@@ -99,7 +99,7 @@ evas_video_sink_init(EvasVideoSink* sink, EvasVideoSinkClass* klass __UNUSED__)
 
 /**** Object methods ****/
 static void
-_cleanup_priv(void *data, Evas *e __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__)
+_cleanup_priv(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED)
 {
    EvasVideoSinkPrivate* priv;
 
@@ -735,9 +735,9 @@ unlock_buffer_mutex(EvasVideoSinkPrivate* priv)
 }
 
 static void
-marshal_VOID__MINIOBJECT(GClosure * closure, GValue * return_value __UNUSED__,
+marshal_VOID__MINIOBJECT(GClosure * closure, GValue * return_value EINA_UNUSED,
                          guint n_param_values, const GValue * param_values,
-                         gpointer invocation_hint __UNUSED__, gpointer marshal_data)
+                         gpointer invocation_hint EINA_UNUSED, gpointer marshal_data)
 {
    typedef void (*marshalfunc_VOID__MINIOBJECT) (gpointer obj, gpointer arg1, gpointer data2);
    marshalfunc_VOID__MINIOBJECT callback;
@@ -874,7 +874,7 @@ _emotion_gstreamer_end(void *data, Ecore_Thread *thread)
 }
 
 static void
-_video_resize(void *data, Evas_Object *obj __UNUSED__, const Evas_Video_Surface *surface __UNUSED__,
+_video_resize(void *data, Evas_Object *obj EINA_UNUSED, const Evas_Video_Surface *surface EINA_UNUSED,
               Evas_Coord w, Evas_Coord h)
 {
 #ifdef HAVE_ECORE_X
@@ -886,7 +886,7 @@ _video_resize(void *data, Evas_Object *obj __UNUSED__, const Evas_Video_Surface
 }
 
 static void
-_video_move(void *data, Evas_Object *obj __UNUSED__, const Evas_Video_Surface *surface __UNUSED__,
+_video_move(void *data, Evas_Object *obj EINA_UNUSED, const Evas_Video_Surface *surface EINA_UNUSED,
             Evas_Coord x, Evas_Coord y)
 {
 #ifdef HAVE_ECORE_X
@@ -934,7 +934,7 @@ _block_pad_link_cb(GstPad *pad, gboolean blocked, gpointer user_data)
 #endif
 
 static void
-_video_show(void *data, Evas_Object *obj __UNUSED__, const Evas_Video_Surface *surface __UNUSED__)
+_video_show(void *data, Evas_Object *obj EINA_UNUSED, const Evas_Video_Surface *surface EINA_UNUSED)
 {
 #ifdef HAVE_ECORE_X
    Emotion_Gstreamer_Video *ev = data;
@@ -946,7 +946,7 @@ _video_show(void *data, Evas_Object *obj __UNUSED__, const Evas_Video_Surface *s
 }
 
 static void
-_video_hide(void *data, Evas_Object *obj __UNUSED__, const Evas_Video_Surface *surface __UNUSED__)
+_video_hide(void *data, Evas_Object *obj EINA_UNUSED, const Evas_Video_Surface *surface EINA_UNUSED)
 {
 #ifdef HAVE_ECORE_X
    Emotion_Gstreamer_Video *ev = data;
@@ -958,7 +958,7 @@ _video_hide(void *data, Evas_Object *obj __UNUSED__, const Evas_Video_Surface *s
 }
 
 static void
-_video_update_pixels(void *data, Evas_Object *obj __UNUSED__, const Evas_Video_Surface *surface __UNUSED__)
+_video_update_pixels(void *data, Evas_Object *obj EINA_UNUSED, const Evas_Video_Surface *surface EINA_UNUSED)
 {
    Emotion_Gstreamer_Video *ev = data;
    Emotion_Gstreamer_Buffer *send;
@@ -978,7 +978,7 @@ _video_update_pixels(void *data, Evas_Object *obj __UNUSED__, const Evas_Video_S
 }
 
 static void
-_image_resize(void *data, Evas *e __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__)
+_image_resize(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED)
 {
    Emotion_Gstreamer_Video *ev = data;
    Evas_Coord width, height;

src/modules/emotion/xine/emotion_xine.c

@@ -459,7 +459,7 @@ em_shutdown(void *ef)
 }
 
 static unsigned char
-em_file_open(const char *file, Evas_Object *obj __UNUSED__, void *ef)
+em_file_open(const char *file, Evas_Object *obj EINA_UNUSED, void *ef)
 {
    Emotion_Xine_Video *ev;
 
@@ -554,7 +554,7 @@ em_fps_num_get(void *ef)
 }
 
 static int
-em_fps_den_get(void *ef __UNUSED__)
+em_fps_den_get(void *ef EINA_UNUSED)
 {
    return 10000;
 }
@@ -599,7 +599,7 @@ em_vis_get(void *ef)
 }
 
 static Eina_Bool
-em_vis_supported(void *ef __UNUSED__, Emotion_Vis vis __UNUSED__)
+em_vis_supported(void *ef EINA_UNUSED, Emotion_Vis vis EINA_UNUSED)
 {
    return EINA_FALSE;
 }
@@ -691,7 +691,7 @@ em_video_data_size_get(void *ef, int *w, int *h)
 }
 
 static int
-em_yuv_rows_get(void *ef, int w __UNUSED__, int h, unsigned char **yrows, unsigned char **urows, unsigned char **vrows)
+em_yuv_rows_get(void *ef, int w EINA_UNUSED, int h, unsigned char **yrows, unsigned char **urows, unsigned char **vrows)
 {
    Emotion_Xine_Video *ev;
    volatile Emotion_Xine_Video_Frame *fr;
@@ -834,7 +834,7 @@ em_event_feed(void *ef, int event)
 }
 
 static void
-em_event_mouse_button_feed(void *ef, int button __UNUSED__, int x, int y)
+em_event_mouse_button_feed(void *ef, int button EINA_UNUSED, int x, int y)
 {
    Emotion_Xine_Video *ev;
    xine_event_t xine_event;
@@ -909,7 +909,7 @@ em_video_channel_get(void *ef)
 }
 
 static const char *
-em_video_channel_name_get(void *ef __UNUSED__, int channel __UNUSED__)
+em_video_channel_name_get(void *ef EINA_UNUSED, int channel EINA_UNUSED)
 {
    return NULL;
 }
@@ -1095,29 +1095,29 @@ em_chapter_count(void *ef)
 }
 
 static void
-em_chapter_set(void *ef __UNUSED__, int chapter __UNUSED__)
+em_chapter_set(void *ef EINA_UNUSED, int chapter EINA_UNUSED)
 {
 }
 
 static int
-em_chapter_get(void *ef __UNUSED__)
+em_chapter_get(void *ef EINA_UNUSED)
 {
    return 0;
 }
 
 static const char *
-em_chapter_name_get(void *ef __UNUSED__, int chapter __UNUSED__)
+em_chapter_name_get(void *ef EINA_UNUSED, int chapter EINA_UNUSED)
 {
    return NULL;
 }
 
 static void
-em_speed_set(void *ef __UNUSED__, double speed __UNUSED__)
+em_speed_set(void *ef EINA_UNUSED, double speed EINA_UNUSED)
 {
 }
 
 static double
-em_speed_get(void *ef __UNUSED__)
+em_speed_get(void *ef EINA_UNUSED)
 {
    return 1.0;
 }
@@ -1259,7 +1259,7 @@ _em_audio_only_poller(void *data)
 }
 
 static Eina_Bool
-_em_fd_ev_active(void *data __UNUSED__, Ecore_Fd_Handler *fdh)
+_em_fd_ev_active(void *data EINA_UNUSED, Ecore_Fd_Handler *fdh)
 {
    int fd, len;
    void *buf[2];
@@ -1611,7 +1611,7 @@ module_open(Evas_Object *obj, const Emotion_Video_Module **module, void **video,
 }
 
 static void
-module_close(Emotion_Video_Module *module __UNUSED__, void *video)
+module_close(Emotion_Video_Module *module EINA_UNUSED, void *video)
 {
    em_module.shutdown(video);
 }

src/modules/emotion/xine/emotion_xine_vo_out.c

@@ -123,7 +123,7 @@ plugin_info_t emotion_xine_plugin_info[] =
 
 /***************************************************************************/
 static void *
-_emotion_class_init(xine_t *xine, void *visual __UNUSED__)
+_emotion_class_init(xine_t *xine, void *visual EINA_UNUSED)
 {
    Emotion_Class *cl;
    
@@ -155,13 +155,13 @@ _emotion_class_dispose(video_driver_class_t *driver_class)
 }
 
 static char *
-_emotion_class_identifier_get(video_driver_class_t *driver_class __UNUSED__)
+_emotion_class_identifier_get(video_driver_class_t *driver_class EINA_UNUSED)
 {
    return "emotion";
 }
 
 static char *
-_emotion_class_description_get(video_driver_class_t *driver_class __UNUSED__)
+_emotion_class_description_get(video_driver_class_t *driver_class EINA_UNUSED)
 {
    return "Emotion xine video output plugin";
 }
@@ -214,7 +214,7 @@ _emotion_dispose(vo_driver_t *vo_driver)
 
 /***************************************************************************/
 static int
-_emotion_redraw(vo_driver_t *vo_driver __UNUSED__)
+_emotion_redraw(vo_driver_t *vo_driver EINA_UNUSED)
 {
 //   DBG("");
    return 0;
@@ -222,7 +222,7 @@ _emotion_redraw(vo_driver_t *vo_driver __UNUSED__)
 
 /***************************************************************************/
 static uint32_t
-_emotion_capabilities_get(vo_driver_t *vo_driver __UNUSED__)
+_emotion_capabilities_get(vo_driver_t *vo_driver EINA_UNUSED)
 {
 //   DBG("");
    return VO_CAP_YV12 | VO_CAP_YUY2;
@@ -230,7 +230,7 @@ _emotion_capabilities_get(vo_driver_t *vo_driver __UNUSED__)
 
 /***************************************************************************/
 static int
-_emotion_gui_data_exchange(vo_driver_t *vo_driver __UNUSED__, int data_type, void *data __UNUSED__)
+_emotion_gui_data_exchange(vo_driver_t *vo_driver EINA_UNUSED, int data_type, void *data EINA_UNUSED)
 {
 //   DBG("");
    switch (data_type)
@@ -294,7 +294,7 @@ _emotion_property_get(vo_driver_t *vo_driver, int property)
 }
 
 static void
-_emotion_property_min_max_get(vo_driver_t *vo_driver __UNUSED__, int property __UNUSED__, int *min, int *max)
+_emotion_property_min_max_get(vo_driver_t *vo_driver EINA_UNUSED, int property EINA_UNUSED, int *min, int *max)
 {
 //   DBG("");
    *min = 0;
@@ -303,7 +303,7 @@ _emotion_property_min_max_get(vo_driver_t *vo_driver __UNUSED__, int property __
 
 /***************************************************************************/
 static vo_frame_t *
-_emotion_frame_alloc(vo_driver_t *vo_driver __UNUSED__)
+_emotion_frame_alloc(vo_driver_t *vo_driver EINA_UNUSED)
 {
    Emotion_Frame *fr;
    
@@ -336,7 +336,7 @@ _emotion_frame_dispose(vo_frame_t *vo_frame)
 }
 
 static void
-_emotion_frame_format_update(vo_driver_t *vo_driver, vo_frame_t *vo_frame, uint32_t width, uint32_t height, double ratio, int format, int flags __UNUSED__)
+_emotion_frame_format_update(vo_driver_t *vo_driver, vo_frame_t *vo_frame, uint32_t width, uint32_t height, double ratio, int format, int flags EINA_UNUSED)
 {
    Emotion_Driver *dv;
    Emotion_Frame *fr;
@@ -463,7 +463,7 @@ _emotion_frame_display(vo_driver_t *vo_driver, vo_frame_t *vo_frame)
 }
 
 static void
-_emotion_frame_field(vo_frame_t *vo_frame __UNUSED__, int which_field __UNUSED__)
+_emotion_frame_field(vo_frame_t *vo_frame EINA_UNUSED, int which_field EINA_UNUSED)
 {
 //   DBG("");
 }
@@ -502,19 +502,19 @@ _emotion_frame_data_unlock(Emotion_Frame *fr)
 
 /***************************************************************************/
 static void
-_emotion_overlay_begin(vo_driver_t *vo_driver __UNUSED__, vo_frame_t *vo_frame __UNUSED__, int changed __UNUSED__)
+_emotion_overlay_begin(vo_driver_t *vo_driver EINA_UNUSED, vo_frame_t *vo_frame EINA_UNUSED, int changed EINA_UNUSED)
 {
 //   DBG("");
 }
 
 static void
-_emotion_overlay_end(vo_driver_t *vo_driver __UNUSED__, vo_frame_t *vo_frame __UNUSED__)
+_emotion_overlay_end(vo_driver_t *vo_driver EINA_UNUSED, vo_frame_t *vo_frame EINA_UNUSED)
 {
 //   DBG("");
 }
 
 static void
-_emotion_overlay_blend(vo_driver_t *vo_driver __UNUSED__, vo_frame_t *vo_frame, vo_overlay_t *vo_overlay __UNUSED__)
+_emotion_overlay_blend(vo_driver_t *vo_driver EINA_UNUSED, vo_frame_t *vo_frame, vo_overlay_t *vo_overlay EINA_UNUSED)
 {
    Emotion_Frame *fr;
    

src/tests/emotion/emotion_test_main.c

@@ -80,7 +80,7 @@ main_resize(Ecore_Evas *ee)
 }
 
 static Eina_Bool
-main_signal_exit(void *data __UNUSED__, int ev_type __UNUSED__, void *ev __UNUSED__)
+main_signal_exit(void *data EINA_UNUSED, int ev_type EINA_UNUSED, void *ev EINA_UNUSED)
 {
    Evas_Object *o;
 
@@ -94,7 +94,7 @@ main_signal_exit(void *data __UNUSED__, int ev_type __UNUSED__, void *ev __UNUSE
 }
 
 static void
-main_delete_request(Ecore_Evas *ee __UNUSED__)
+main_delete_request(Ecore_Evas *ee EINA_UNUSED)
 {
    ecore_main_loop_quit();
 }
@@ -132,7 +132,7 @@ broadcast_event(Emotion_Event ev)
 }
 
 static void
-bg_key_down(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info)
+bg_key_down(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info)
 {
    Evas_Event_Key_Down *ev = event_info;
    Eina_List *l;
@@ -321,7 +321,7 @@ video_obj_time_changed(Evas_Object *obj, Evas_Object *edje)
 }
 
 static void
-video_obj_frame_decode_cb(void *data, Evas_Object *obj, void *event_info __UNUSED__)
+video_obj_frame_decode_cb(void *data, Evas_Object *obj, void *event_info EINA_UNUSED)
 {
    video_obj_time_changed(obj, data);
 
@@ -336,7 +336,7 @@ video_obj_frame_decode_cb(void *data, Evas_Object *obj, void *event_info __UNUSE
 }
 
 static void
-video_obj_frame_resize_cb(void *data, Evas_Object *obj, void *event_info __UNUSED__)
+video_obj_frame_resize_cb(void *data, Evas_Object *obj, void *event_info EINA_UNUSED)
 {
    Evas_Object *oe;
    int iw, ih;
@@ -357,19 +357,19 @@ video_obj_frame_resize_cb(void *data, Evas_Object *obj, void *event_info __UNUSE
 }
 
 static void
-video_obj_length_change_cb(void *data, Evas_Object *obj, void *event_info __UNUSED__)
+video_obj_length_change_cb(void *data, Evas_Object *obj, void *event_info EINA_UNUSED)
 {
    video_obj_time_changed(obj, data);
 }
 
 static void
-video_obj_position_update_cb(void *data, Evas_Object *obj, void *event_info __UNUSED__)
+video_obj_position_update_cb(void *data, Evas_Object *obj, void *event_info EINA_UNUSED)
 {
    video_obj_time_changed(obj, data);
 }
 
 static void
-video_obj_stopped_cb(void *data __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__)
+video_obj_stopped_cb(void *data EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED)
 {
    printf("video stopped!\n");
    emotion_object_position_set(obj, 0.0);
@@ -377,7 +377,7 @@ video_obj_stopped_cb(void *data __UNUSED__, Evas_Object *obj, void *event_info _
 }
 
 static void
-video_obj_channels_cb(void *data __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__)
+video_obj_channels_cb(void *data EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED)
 {
    printf("channels changed: [AUD %i][VID %i][SPU %i]\n",
 	  emotion_object_audio_channel_count(obj),
@@ -386,13 +386,13 @@ video_obj_channels_cb(void *data __UNUSED__, Evas_Object *obj, void *event_info
 }
 
 static void
-video_obj_title_cb(void *data __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__)
+video_obj_title_cb(void *data EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED)
 {
    printf("video title to: \"%s\"\n", emotion_object_title_get(obj));
 }
 
 static void
-video_obj_progress_cb(void *data __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__)
+video_obj_progress_cb(void *data EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED)
 {
    printf("progress: \"%s\" %3.3f\n",
 	  emotion_object_progress_info_get(obj),
@@ -400,7 +400,7 @@ video_obj_progress_cb(void *data __UNUSED__, Evas_Object *obj, void *event_info
 }
 
 static void
-video_obj_ref_cb(void *data __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__)
+video_obj_ref_cb(void *data EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED)
 {
    printf("video ref to: \"%s\" %i\n",
 	  emotion_object_ref_file_get(obj),
@@ -408,14 +408,14 @@ video_obj_ref_cb(void *data __UNUSED__, Evas_Object *obj, void *event_info __UNU
 }
 
 static void
-video_obj_button_num_cb(void *data __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__)
+video_obj_button_num_cb(void *data EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED)
 {
    printf("video spu buttons to: %i\n",
 	  emotion_object_spu_button_count_get(obj));
 }
 
 static void
-video_obj_button_cb(void *data __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__)
+video_obj_button_cb(void *data EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED)
 {
    printf("video selected spu button: %i\n",
 	  emotion_object_spu_button_get(obj));
@@ -424,7 +424,7 @@ video_obj_button_cb(void *data __UNUSED__, Evas_Object *obj, void *event_info __
 
 
 static void
-video_obj_signal_play_cb(void *data, Evas_Object *o, const char *emission __UNUSED__, const char *source __UNUSED__)
+video_obj_signal_play_cb(void *data, Evas_Object *o, const char *emission EINA_UNUSED, const char *source EINA_UNUSED)
 {
    Evas_Object *ov = data;
    emotion_object_play_set(ov, 1);
@@ -432,7 +432,7 @@ video_obj_signal_play_cb(void *data, Evas_Object *o, const char *emission __UNUS
 }
 
 static void
-video_obj_signal_pause_cb(void *data, Evas_Object *o, const char *emission __UNUSED__, const char *source __UNUSED__)
+video_obj_signal_pause_cb(void *data, Evas_Object *o, const char *emission EINA_UNUSED, const char *source EINA_UNUSED)
 {
    Evas_Object *ov = data;
    emotion_object_play_set(ov, 0);
@@ -440,7 +440,7 @@ video_obj_signal_pause_cb(void *data, Evas_Object *o, const char *emission __UNU
 }
 
 static void
-video_obj_signal_stop_cb(void *data, Evas_Object *o, const char *emission __UNUSED__, const char *source __UNUSED__)
+video_obj_signal_stop_cb(void *data, Evas_Object *o, const char *emission EINA_UNUSED, const char *source EINA_UNUSED)
 {
    Evas_Object *ov = data;
    emotion_object_play_set(ov, 0);
@@ -449,7 +449,7 @@ video_obj_signal_stop_cb(void *data, Evas_Object *o, const char *emission __UNUS
 }
 
 static void
-video_obj_signal_jump_cb(void *data, Evas_Object *o, const char *emission __UNUSED__, const char *source __UNUSED__)
+video_obj_signal_jump_cb(void *data, Evas_Object *o, const char *emission EINA_UNUSED, const char *source EINA_UNUSED)
 {
    Evas_Object *ov = data;
    double len;
@@ -461,7 +461,7 @@ video_obj_signal_jump_cb(void *data, Evas_Object *o, const char *emission __UNUS
 }
 
 static void
-video_obj_signal_speed_cb(void *data, Evas_Object *o, const char *emission __UNUSED__, const char *source __UNUSED__)
+video_obj_signal_speed_cb(void *data, Evas_Object *o, const char *emission EINA_UNUSED, const char *source EINA_UNUSED)
 {
    Evas_Object *ov = data;
    double spd;
@@ -476,7 +476,7 @@ video_obj_signal_speed_cb(void *data, Evas_Object *o, const char *emission __UNU
 }
 
 static void
-video_obj_signal_frame_move_start_cb(void *data __UNUSED__, Evas_Object *o, const char *emission __UNUSED__, const char *source __UNUSED__)
+video_obj_signal_frame_move_start_cb(void *data EINA_UNUSED, Evas_Object *o, const char *emission EINA_UNUSED, const char *source EINA_UNUSED)
 {
    Frame_Data *fd;
    Evas_Coord x, y;
@@ -490,7 +490,7 @@ video_obj_signal_frame_move_start_cb(void *data __UNUSED__, Evas_Object *o, cons
 }
 
 static void
-video_obj_signal_frame_move_stop_cb(void *data __UNUSED__, Evas_Object *o, const char *emission __UNUSED__, const char *source __UNUSED__)
+video_obj_signal_frame_move_stop_cb(void *data EINA_UNUSED, Evas_Object *o, const char *emission EINA_UNUSED, const char *source EINA_UNUSED)
 {
    Frame_Data *fd;
 
@@ -499,7 +499,7 @@ video_obj_signal_frame_move_stop_cb(void *data __UNUSED__, Evas_Object *o, const
 }
 
 static void
-video_obj_signal_frame_resize_start_cb(void *data __UNUSED__, Evas_Object *o, const char *emission __UNUSED__, const char *source __UNUSED__)
+video_obj_signal_frame_resize_start_cb(void *data EINA_UNUSED, Evas_Object *o, const char *emission EINA_UNUSED, const char *source EINA_UNUSED)
 {
    Frame_Data *fd;
    Evas_Coord x, y;
@@ -513,7 +513,7 @@ video_obj_signal_frame_resize_start_cb(void *data __UNUSED__, Evas_Object *o, co
 }
 
 static void
-video_obj_signal_frame_resize_stop_cb(void *data __UNUSED__, Evas_Object *o, const char *emission __UNUSED__, const char *source __UNUSED__)
+video_obj_signal_frame_resize_stop_cb(void *data EINA_UNUSED, Evas_Object *o, const char *emission EINA_UNUSED, const char *source EINA_UNUSED)
 {
    Frame_Data *fd;
 
@@ -522,7 +522,7 @@ video_obj_signal_frame_resize_stop_cb(void *data __UNUSED__, Evas_Object *o, con
 }
 
 static void
-video_obj_signal_frame_move_cb(void *data __UNUSED__, Evas_Object *o, const char *emission __UNUSED__, const char *source __UNUSED__)
+video_obj_signal_frame_move_cb(void *data EINA_UNUSED, Evas_Object *o, const char *emission EINA_UNUSED, const char *source EINA_UNUSED)
 {
    Frame_Data *fd;
 
@@ -633,7 +633,7 @@ init_video_object(const char *module_filename, const char *filename)
 }
 
 static Eina_Bool
-check_positions(void *data __UNUSED__)
+check_positions(void *data EINA_UNUSED)
 {
    const Eina_List *lst;
    Evas_Object *o;