summaryrefslogtreecommitdiff
path: root/legacy
diff options
context:
space:
mode:
authorVincent Torri <vincent.torri@gmail.com>2010-01-04 18:45:40 +0000
committerVincent Torri <vincent.torri@gmail.com>2010-01-04 18:45:40 +0000
commit2a1b159536aa73770a769ee32c06f47515a86b69 (patch)
tree42874be2b49b0294ef8751c61fedb7419f0ea308 /legacy
parenta4b0afb1e4b467a1ce7c605095b7da5cb01db275 (diff)
* enable static build of modules
* clean up autotools * remove some warnings issues: * vlc backend can not be built on my computer(API change in libvlc, it seems) * when i build xine *and* gstreamer as static, i get a multiple defined of __eina_module_init and __eina_module_shutdown SVN revision: 44884
Diffstat (limited to '')
-rw-r--r--legacy/emotion/configure.ac269
-rw-r--r--legacy/emotion/emotion.pc.in3
-rw-r--r--legacy/emotion/m4/ac_attribute.m446
-rw-r--r--legacy/emotion/m4/efl_doxygen.m494
-rw-r--r--legacy/emotion/m4/emotion_check.m4147
-rw-r--r--legacy/emotion/src/bin/Makefile.am17
-rw-r--r--legacy/emotion/src/bin/emotion_test_main.c25
-rw-r--r--legacy/emotion/src/lib/Makefile.am62
-rw-r--r--legacy/emotion/src/lib/emotion_private.h15
-rw-r--r--legacy/emotion/src/lib/emotion_smart.c6
-rw-r--r--legacy/emotion/src/modules/gstreamer/Makefile.am15
-rw-r--r--legacy/emotion/src/modules/gstreamer/emotion_gstreamer.c38
-rw-r--r--legacy/emotion/src/modules/gstreamer/emotion_gstreamer_pipeline.c6
-rw-r--r--legacy/emotion/src/modules/gstreamer/emotion_gstreamer_pipeline_dvd.c6
-rw-r--r--legacy/emotion/src/modules/vlc/Makefile.am15
-rw-r--r--legacy/emotion/src/modules/vlc/emotion_vlc.c7
-rw-r--r--legacy/emotion/src/modules/xine/Makefile.am15
-rw-r--r--legacy/emotion/src/modules/xine/emotion_xine.c18
-rw-r--r--legacy/emotion/src/modules/xine/emotion_xine_vo_out.c12
19 files changed, 578 insertions, 238 deletions
diff --git a/legacy/emotion/configure.ac b/legacy/emotion/configure.ac
index a872003e29..52854f181e 100644
--- a/legacy/emotion/configure.ac
+++ b/legacy/emotion/configure.ac
@@ -1,21 +1,17 @@
1dnl Process this file with autoconf to produce a configure script.
2
3# get rid of that stupid cache mechanism 1# get rid of that stupid cache mechanism
4rm -f config.cache 2rm -f config.cache
5 3
6AC_INIT(emotion, 0.1.0.042, enlightenment-devel@lists.sourceforge.net) 4AC_INIT([emotion], [0.1.0.042], [enlightenment-devel@lists.sourceforge.net])
7AC_PREREQ(2.52) 5AC_PREREQ([2.60])
8AC_CONFIG_SRCDIR(configure.ac) 6AC_CONFIG_SRCDIR([configure.ac])
9 7AC_CONFIG_MACRO_DIR([m4])
10AM_INIT_AUTOMAKE(1.6 dist-bzip2) 8AC_CANONICAL_BUILD
11AM_CONFIG_HEADER(config.h) 9AC_CANONICAL_HOST
12
13AC_C_BIGENDIAN
14AC_ISC_POSIX 10AC_ISC_POSIX
15AC_PROG_CC 11
16AM_PROG_CC_STDC 12AM_INIT_AUTOMAKE([1.6 dist-bzip2])
17AC_HEADER_STDC 13AM_CONFIG_HEADER([config.h])
18AC_C_CONST 14m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
19 15
20AC_LIBTOOL_WIN32_DLL 16AC_LIBTOOL_WIN32_DLL
21define([AC_LIBTOOL_LANG_CXX_CONFIG], [:])dnl 17define([AC_LIBTOOL_LANG_CXX_CONFIG], [:])dnl
@@ -29,13 +25,115 @@ SNAP=`echo $PACKAGE_VERSION | awk -F. '{printf("%s", $4);}'`
29version_info=`expr $VMAJ + $VMIN`":$VMIC:$VMIN" 25version_info=`expr $VMAJ + $VMIN`":$VMIC:$VMIN"
30AC_SUBST(version_info) 26AC_SUBST(version_info)
31 27
32EFL_EMOTION_BUILD="" 28
29### Needed information
30
33case "$host_os" in 31case "$host_os" in
34 mingw* | cegcc*) 32 mingw* | cegcc*)
33 want_xine="no"
34 want_gstreamer="yes"
35 want_vlc="no"
36 ;;
37 *)
38 want_xine="yes"
39 want_gstreamer="yes"
40 want_vlc="yes"
41 ;;
42esac
43
44requirement_emotion=""
45
46### Additional options to configure
47
48# edje_cc
49
50AC_ARG_WITH([edje-cc],
51 [AC_HELP_STRING([--with-edje-cc=PATH], [specify a specific path to edje_cc])],
52 [
53 v=$withval;
54 edje_cc=$v
55 echo " Enlightenment edje_cc explicitly set to "$edje_cc;
56 ],
57 [edje_cc=$(pkg-config --variable=prefix edje)/bin/edje_cc])
58AC_SUBST(edje_cc)
59
60
61### Checks for programs
62AC_PROG_CC
63
64# pkg-config
65PKG_PROG_PKG_CONFIG
66
67# Check whether pkg-config supports Requires.private
68if $PKG_CONFIG --atleast-pkgconfig-version 0.22; then
69 pkgconfig_requires_private="Requires.private"
70else
71 pkgconfig_requires_private="Requires"
72fi
73AC_SUBST(pkgconfig_requires_private)
74
75# doxygen program for documentation building
76
77EFL_CHECK_DOXYGEN([build_doc="yes"], [build_doc="no"])
78
79
80### Checks for libraries
81
82PKG_CHECK_MODULES(EMOTION, [eina-0 evas >= 0.9.9 ecore >= 0.9.9 ecore-job >= 0.9.9])
83requirement_emotion="ecore-job ecore evas eina-0"
84
85PKG_CHECK_MODULES(EMOTION_BIN, [evas >= 0.9.9 ecore >= 0.9.9 ecore-evas >= 0.9.9 edje >= 0.5.0])
86
87PKG_CHECK_MODULES(ECORE_X, [ecore-x >= 0.9.9], [have_ecore_x="yes"], [have_ecore_x="no"])
88
89PKG_CHECK_MODULES(ECORE_FB, [ecore-fb >= 0.9.9], [have_ecore_fb="yes"], [have_ecore_fb="no"])
90
91if test "x${have_ecore_x}" = "xyes" ; then
92 AC_DEFINE(EMOTION_HAVE_ECORE_X, 1, [Define to 1 if Ecore_X is enabled])
93fi
94
95if test "x${have_ecore_fb}" = "xyes" ; then
96 AC_DEFINE(EMOTION_HAVE_ECORE_FB, 1, [Define to 1 if Ecore_Fb is enabled])
97fi
98
99PKG_CHECK_EXISTS([evas-software-x11], [AC_DEFINE(HAVE_EVAS_SOFWARE_X11, 1, [Evas Software Xlib Engine Support])])
100
101PKG_CHECK_EXISTS([evas-xrender-x11], [AC_DEFINE(HAVE_EVAS_XRENDER_X11, 1, [Evas Software Xlib Engine Support])])
102
103PKG_CHECK_EXISTS([evas-opengl-x11], [AC_DEFINE(HAVE_EVAS_OPENGL_X11, 1, [Evas OpenGL Xlib Engine Support])])
104
105PKG_CHECK_EXISTS([evas-fb], [AC_DEFINE(HAVE_EVAS_FB, 1, [Evas Framebuffer Engine Support])])
106
107
108### Checks for header files
109AC_HEADER_STDC
110
111### Checks for types
112
113
114### Checks for structures
115
116
117### Checks for compiler characteristics
118AC_C_CONST
119AC_C_BIGENDIAN
120AM_PROG_CC_STDC
121AC_C___ATTRIBUTE__
122
123EFL_EMOTION_BUILD=""
124case "$host_os" in
125 mingw32ce* | cegcc*)
126 EMOTION_CPPFLAGS="-D_WIN32_WCE=0x0420"
127 EFL_EMOTION_BUILD="-DEFL_EMOTION_BUILD"
128 ;;
129 mingw*)
130 EMOTION_CPPFLAGS="-D_WIN32_WINNT=0x0501"
35 EFL_EMOTION_BUILD="-DEFL_EMOTION_BUILD" 131 EFL_EMOTION_BUILD="-DEFL_EMOTION_BUILD"
36 ;; 132 ;;
37esac 133esac
38AC_SUBST(EFL_EMOTION_BUILD) 134AC_SUBST(EFL_EMOTION_BUILD)
135AC_SUBST(EMOTION_CPPFLAGS)
136
39 137
40### Checks for linker characteristics 138### Checks for linker characteristics
41 139
@@ -49,117 +147,18 @@ case "$host_os" in
49esac 147esac
50AC_SUBST(lt_enable_auto_import) 148AC_SUBST(lt_enable_auto_import)
51 149
52PKG_CHECK_MODULES(EVAS, [evas >= 0.9.9])
53PKG_CHECK_MODULES(EDJE, [edje >= 0.5.0])
54PKG_CHECK_MODULES(ECORE, [ecore >= 0.9.9 ecore-evas >= 0.9.9 ecore-job >= 0.9.9])
55
56save_CPPFLAGS=$CPPFLAGS
57CPPFLAGS="$CPPFLAGS $ECORE_CFLAGS"
58AC_CHECK_HEADERS(Ecore_X.h Ecore_Fb.h)
59CPPFLAGS=$save_CPPFLAGS
60
61AC_ARG_ENABLE(vlc,
62 AC_HELP_STRING([--disable-vlc],[disable vlc support @<:@default=auto@:>@]),
63 [enable_vlc=$enableval],[enable_vlc=auto])
64HAVE_VLC="no"
65if test "$enable_vlc" != "no" ; then
66 PKG_CHECK_MODULES(VLC, [libvlc >= 0.9], [HAVE_VLC="yes"], [HAVE_VLC="no"])
67fi
68if test "$enable_vlc$HAVE_VLC" = "yesno" ; then
69 AC_MSG_RESULT(vlc not found)
70fi
71 150
72AC_ARG_ENABLE(xine, 151### Modules
73 AC_HELP_STRING([--disable-xine],[disable xine support @<:@default=auto@:>@]),
74 [enable_xine=$enableval],[enable_xine=auto])
75HAVE_XINE="no"
76if test "$enable_xine" != "no" ; then
77 PKG_CHECK_MODULES(XINE, [libxine >= 1.1.1], [HAVE_XINE="yes"])
78fi
79if test "$enable_xine$HAVE_XINE" = "yesno" ; then
80 AC_MSG_RESULT(xine not found)
81fi
82 152
83AC_ARG_ENABLE(gstreamer, 153EMOTION_CHECK_MODULE([Xine], [${want_xine}])
84 AC_HELP_STRING([--disable-gstreamer],[disable gstreamer support @<:@default=auto@:>@]), 154EMOTION_CHECK_MODULE([Gstreamer], [${want_gstreamer}])
85 [enable_gstreamer=$enableval],[enable_gstreamer=auto]) 155EMOTION_CHECK_MODULE([VLC], [${want_vlc}])
86HAVE_GSTREAMER="no"
87HAVE_GSTPLUG="no"
88if test "$enable_gstreamer" != "no" ; then
89
90 dnl Gstreamer version requirement
91 GST_REQS=0.10.2
92 GSTPLUG_REQS=0.10.1
93 GST_MAJORMINOR=0.10
94
95 PKG_CHECK_MODULES(GST, \
96 gstreamer-$GST_MAJORMINOR >= $GST_REQS,
97 HAVE_GSTREAMER="yes",
98 HAVE_GSTREAMER="no")
99
100 PKG_CHECK_MODULES(GSTPLUG, \
101 gstreamer-plugins-base-$GST_MAJORMINOR >= $GSTPLUG_REQS,
102 HAVE_GSTPLUG="yes",
103 HAVE_GSTPLUG="no")
104
105 AM_GST_ELEMENT_CHECK(
106 [ffmpeg],
107 [HAVE_GSTFFMPEG="yes"],
108 [HAVE_GSTFFMPEG="no"])
109
110 AM_GST_ELEMENT_CHECK(
111 [cdiocddasrc],
112 [HAVE_GSTCDIOCDDASRC="yes"],
113 [HAVE_GSTCDIOCDDASRC="no"])
114fi
115if test "$enable_gstreamer$HAVE_GSTREAMER" = "yesno" ; then
116 AC_MSG_RESULT(gstreamer not found)
117fi
118if test "$HAVE_GSTPLUG" = "no"; then
119 if test "$HAVE_GSTREAMER" = "no" ; then
120 GSTPLUG_MSG="no"
121 else
122 AC_MSG_WARN([You should install gstreamer plugins and gst-ffmpeg to properly decode your video and audio files])
123 GSTPLUG_MSG="no (you should install gst-plugins-base and gst-ffmpeg)"
124 fi
125else
126 if test "$HAVE_GSTFFMPEG" = "no"; then
127 if test "$HAVE_GSTREAMER" = "no" ; then
128 GSTPLUG_MSG="no"
129 else
130 AC_MSG_WARN([You should install gstreamer plugins and gst-ffmpeg to properly decode your video and audio files])
131 GSTPLUG_MSG="no (you should install gst-plugins-base and gst-ffmpeg)"
132 fi
133 GSTPLUG_MSG="yes"
134 else
135 GSTPLUG_MSG="yes"
136 fi
137 if test "$HAVE_GSTCDIOCDDASRC" = "no"; then
138 AC_MSG_WARN([You should install gstreamer-plugins-good and make sure that the cdiocddasrc element is installed])
139 GSTCDDA_MSG="no (you should install gst-plugins-good and the cdiocddasrc element)"
140 else
141 GSTCDDA_MSG="yes"
142 fi
143fi
144 156
145if test "$HAVE_XINE$HAVE_GSTREAMER" = "nono" ; then 157if test "x${enable_xine}" = "xno" && test "x${enable_gstreamer}" = "xno" && test "x${enable_vlc}" = "xno" ; then
146 AC_MSG_ERROR([Xine or Gstreamer must be installed to build emotion]) 158 AC_MSG_ERROR([Xine, Gstreamer or VLC backends must be selected to build Emotion])
147fi 159fi
148 160
149AM_CONDITIONAL([BUILD_VLC_MODULE], [test "$HAVE_VLC" = yes]) 161AC_SUBST(requirement_emotion)
150AM_CONDITIONAL([BUILD_XINE_MODULE], [test "$HAVE_XINE" = yes])
151AM_CONDITIONAL([BUILD_GSTREAMER_MODULE], [test "$HAVE_GSTREAMER" = yes])
152
153AC_ARG_WITH(edje-cc,
154[ --with-edje-cc=PATH specify a specific path to edje_cc],
155[
156 v=$withval;
157 edje_cc=$v
158 echo " Enlightenment edje_cc explicitly set to "$edje_cc;
159],[
160 edje_cc=$(pkg-config --variable=prefix edje)/bin/edje_cc
161])
162AC_SUBST(edje_cc)
163 162
164AC_OUTPUT([ 163AC_OUTPUT([
165Makefile 164Makefile
@@ -189,18 +188,26 @@ echo
189echo "Configuration Options Summary:" 188echo "Configuration Options Summary:"
190echo 189echo
191echo " Modules:" 190echo " Modules:"
192echo " Xine...............: $HAVE_XINE" 191echo " Xine...............: ${enable_xine}"
193echo " Vlc................: $HAVE_VLC" 192echo " Vlc................: ${enable_vlc}"
194echo " Gstreamer..........: $HAVE_GSTREAMER" 193echo " Gstreamer..........: ${enable_gstreamer}"
195echo " Gstreamer plugins..: $GSTPLUG_MSG" 194echo " Gstreamer FFmpeg...: ${have_gst_ffmpeg}"
196echo " Gstreamer FFmpeg...: $HAVE_GSTFFMPEG" 195echo " Gstreamer CDDA.....: ${have_gst_cdiocddasrc}"
197echo " Gstreamer CDDA.....: $GSTCDDA_MSG"
198echo 196echo
199echo " edje_cc..............: ${edje_cc}" 197echo " edje_cc..............: ${edje_cc}"
200echo 198echo
201echo " Compilation..........: make" 199echo "Compilation............: make (or gmake)"
200echo " CPPFLAGS.............: $CPPFLAGS"
201echo " CFLAGS...............: $CFLAGS"
202echo " LDFLAGS..............: $LDFLAGS"
202echo 203echo
203echo " Installation.........: make install" 204echo "Installation...........: make install (as root if needed, with 'su' or 'sudo')"
205echo " prefix...............: $prefix"
204echo 206echo
205echo " prefix.........: $prefix" 207if test "x${have_static_module}" = "xyes" ; then
208echo -e "\0033\01331;31mWarning\0033\01331;0m: You are trying to link statically one or more modules to Emotion."
209echo " You must know what you are doing, or else you will have a lot of problems."
210echo " And asparagus will disappear from the earth."
211echo " Think about that."
206echo 212echo
213fi
diff --git a/legacy/emotion/emotion.pc.in b/legacy/emotion/emotion.pc.in
index f62848944a..a0b1cfad04 100644
--- a/legacy/emotion/emotion.pc.in
+++ b/legacy/emotion/emotion.pc.in
@@ -5,8 +5,7 @@ includedir=@includedir@
5 5
6Name: emotion 6Name: emotion
7Description: Emotion evas based multimedia library 7Description: Emotion evas based multimedia library
8Requires: evas 8@pkgconfig_requires_private@: @requirement_emotion@
9Version: @VERSION@ 9Version: @VERSION@
10Libs: -L${libdir} -lemotion 10Libs: -L${libdir} -lemotion
11Libs.private: @EDJE_LIBS@ @ECORE_LIBS@ @XINE_LIBS@ @GST_LIBS@
12Cflags: -I${includedir} 11Cflags: -I${includedir}
diff --git a/legacy/emotion/m4/ac_attribute.m4 b/legacy/emotion/m4/ac_attribute.m4
new file mode 100644
index 0000000000..3926d23d56
--- /dev/null
+++ b/legacy/emotion/m4/ac_attribute.m4
@@ -0,0 +1,46 @@
1dnl Copyright (C) 2004-2008 Kim Woelders
2dnl Copyright (C) 2008 Vincent Torri <vtorri at univ-evry dot fr>
3dnl That code is public domain and can be freely used or copied.
4dnl Originally snatched from somewhere...
5
6dnl Macro for checking if the compiler supports __attribute__
7
8dnl Usage: AC_C___ATTRIBUTE__
9dnl call AC_DEFINE for HAVE___ATTRIBUTE__ and __UNUSED__
10dnl if the compiler supports __attribute__, HAVE___ATTRIBUTE__ is
11dnl defined to 1 and __UNUSED__ is defined to __attribute__((unused))
12dnl otherwise, HAVE___ATTRIBUTE__ is not defined and __UNUSED__ is
13dnl defined to nothing.
14
15AC_DEFUN([AC_C___ATTRIBUTE__],
16[
17
18AC_MSG_CHECKING([for __attribute__])
19
20AC_CACHE_VAL([ac_cv___attribute__],
21 [AC_TRY_COMPILE(
22 [
23#include <stdlib.h>
24
25int func(int x);
26int foo(int x __attribute__ ((unused)))
27{
28 exit(1);
29}
30 ],
31 [],
32 [ac_cv___attribute__="yes"],
33 [ac_cv___attribute__="no"]
34 )]
35)
36
37AC_MSG_RESULT($ac_cv___attribute__)
38
39if test "x${ac_cv___attribute__}" = "xyes" ; then
40 AC_DEFINE([HAVE___ATTRIBUTE__], [1], [Define to 1 if your compiler has __attribute__])
41 AC_DEFINE([__UNUSED__], [__attribute__((unused))], [Macro declaring a function argument to be unused])
42 else
43 AC_DEFINE([__UNUSED__], [], [Macro declaring a function argument to be unused])
44fi
45
46])
diff --git a/legacy/emotion/m4/efl_doxygen.m4 b/legacy/emotion/m4/efl_doxygen.m4
new file mode 100644
index 0000000000..7324af3e42
--- /dev/null
+++ b/legacy/emotion/m4/efl_doxygen.m4
@@ -0,0 +1,94 @@
1dnl Copyright (C) 2008 Vincent Torri <vtorri at univ-evry dot fr>
2dnl That code is public domain and can be freely used or copied.
3
4dnl Macro that check if doxygen is available or not.
5
6dnl EFL_CHECK_DOXYGEN([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
7dnl Test for the doxygen program
8dnl Defines efl_doxygen
9dnl Defines the automake conditionnal EFL_BUILD_DOC
10dnl
11AC_DEFUN([EFL_CHECK_DOXYGEN],
12[
13
14dnl
15dnl Disable the build of the documentation
16dnl
17AC_ARG_ENABLE([doc],
18 [AC_HELP_STRING(
19 [--disable-doc],
20 [Disable documentation build @<:@default=enabled@:>@])],
21 [
22 if test "x${enableval}" = "xyes" ; then
23 efl_enable_doc="yes"
24 else
25 efl_enable_doc="no"
26 fi
27 ],
28 [efl_enable_doc="yes"])
29
30AC_MSG_CHECKING([whether to build documentation])
31AC_MSG_RESULT([${efl_enable_doc}])
32
33if test "x${efl_enable_doc}" = "xyes" ; then
34
35dnl Specify the file name, without path
36
37 efl_doxygen="doxygen"
38
39 AC_ARG_WITH([doxygen],
40 [AC_HELP_STRING(
41 [--with-doxygen=FILE],
42 [doxygen program to use @<:@default=doxygen@:>@])],
43
44dnl Check the given doxygen program.
45
46 [efl_doxygen=${withval}
47 AC_CHECK_PROG([efl_have_doxygen],
48 [${efl_doxygen}],
49 [yes],
50 [no])
51 if test "x${efl_have_doxygen}" = "xno" ; then
52 echo "WARNING:"
53 echo "The doxygen program you specified:"
54 echo "${efl_doxygen}"
55 echo "was not found. Please check the path and make sure "
56 echo "the program exists and is executable."
57 AC_MSG_WARN([no doxygen detected. Documentation will not be built])
58 fi
59 ],
60 [AC_CHECK_PROG([efl_have_doxygen],
61 [${efl_doxygen}],
62 [yes],
63 [no])
64 if test "x${efl_have_doxygen}" = "xno" ; then
65 echo "WARNING:"
66 echo "The doxygen program was not found in your execute path."
67 echo "You may have doxygen installed somewhere not covered by your path."
68 echo ""
69 echo "If this is the case make sure you have the packages installed, AND"
70 echo "that the doxygen program is in your execute path (see your"
71 echo "shell manual page on setting the \$PATH environment variable), OR"
72 echo "alternatively, specify the program to use with --with-doxygen."
73 AC_MSG_WARN([no doxygen detected. Documentation will not be built])
74 fi
75 ])
76else
77 efl_have_doxygen="no"
78fi
79
80dnl
81dnl Substitution
82dnl
83AC_SUBST([efl_doxygen])
84
85if ! test "x${efl_have_doxygen}" = "xyes" ; then
86 efl_enable_doc="no"
87fi
88
89AM_CONDITIONAL(EFL_BUILD_DOC, test "x${efl_have_doxygen}" = "xyes")
90
91AS_IF([test "x$efl_have_doxygen" = "xyes"], [$1], [$2])
92])
93
94dnl End of efl_doxygen.m4
diff --git a/legacy/emotion/m4/emotion_check.m4 b/legacy/emotion/m4/emotion_check.m4
new file mode 100644
index 0000000000..7f0c07309c
--- /dev/null
+++ b/legacy/emotion/m4/emotion_check.m4
@@ -0,0 +1,147 @@
1
2dnl use: EMOTION_CHECK_DEP_XINE(want_static[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
3
4AC_DEFUN([EMOTION_CHECK_DEP_XINE],
5[
6
7requirement=""
8have_dep="no"
9
10PKG_CHECK_MODULES([XINE],
11 [libxine >= 1.1.1 evas >= 0.9.9],
12 [
13 have_dep="yes"
14 requirement="libxine"
15 ])
16
17if test "x$1" = "xstatic" ; then
18 requirement_emotion="${requirement} ${requirement_emotion}"
19fi
20
21AS_IF([test "x$have_dep" = "xyes"], [$2], [$3])
22
23])
24
25dnl use: EMOTION_CHECK_DEP_GSTREAMER(want_static[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
26
27AC_DEFUN([EMOTION_CHECK_DEP_GSTREAMER],
28[
29
30GST_REQS=0.10.2
31GSTPLUG_REQS=0.10.1
32GST_MAJORMINOR=0.10
33
34requirement=""
35have_dep="no"
36
37PKG_CHECK_MODULES([GSTREAMER],
38 [gstreamer-$GST_MAJORMINOR >= $GST_REQS gstreamer-plugins-base-$GST_MAJORMINOR >= $GSTPLUG_REQS evas >= 0.9.9],
39 [
40 have_dep="yes"
41 requirement="gstreamer-$GST_MAJORMINOR gstreamer-plugins-base-$GST_MAJORMINOR"
42 ])
43
44if test "x${have_dep}" = "xyes" ; then
45
46 AM_GST_ELEMENT_CHECK([ffmpeg], [have_gst_ffmpeg="yes"], [have_gst_ffmpeg="no"])
47
48 AM_GST_ELEMENT_CHECK([cdiocddasrc], [have_gst_cdiocddasrc="yes"], [have_gst_cdiocddasrc="no"])
49
50 if test "x${have_gst_ffmpeg}" = "xno" ; then
51 AC_MSG_WARN([You should install gst-ffmpeg to decode most of the video and uadio file formats])
52 fi
53
54 if test "x${have_gst_cdiocddasrc}" = "xno" ; then
55 AC_MSG_WARN([You should install gst-cdiocddasrc to decode CD Audio])
56 fi
57fi
58
59if test "x$1" = "xstatic" ; then
60 requirement_emotion="${requirement} ${requirement_emotion}"
61fi
62
63AS_IF([test "x$have_dep" = "xyes"], [$2], [$3])
64
65])
66
67dnl use: EMOTION_CHECK_DEP_VLC(want_static[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
68
69AC_DEFUN([EMOTION_CHECK_DEP_VLC],
70[
71
72requirement=""
73have_dep="no"
74
75PKG_CHECK_MODULES([VLC],
76 [libvlc >= 0.9 evas >= 0.9.9],
77 [
78 have_dep="yes"
79 requirement="libvlc"
80 ])
81
82if test "x$1" = "xstatic" ; then
83 requirement_emotion="${requirement} ${requirement_emotion}"
84fi
85
86AS_IF([test "x$have_dep" = "xyes"], [$2], [$3])
87
88])
89
90dnl use: EMOTION_CHECK_MODULE(description, want_module[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
91AC_DEFUN([EMOTION_CHECK_MODULE],
92[
93m4_pushdef([UP], m4_translit([$1], [-a-z], [_A-Z]))dnl
94m4_pushdef([DOWN], m4_translit([$1], [-A-Z], [_a-z]))dnl
95
96want_module="$2"
97
98AC_ARG_ENABLE([DOWN],
99 [AC_HELP_STRING([--enable-]DOWN, [enable build of $1 module @<:@default=yes@:>@])],
100 [
101 if test "x${enableval}" = "xyes" ; then
102 enable_module="yes"
103 else
104 if test "x${enableval}" = "xstatic" ; then
105 enable_module="static"
106 else
107 enable_module="no"
108 fi
109 fi
110 ],
111 [enable_module="yes"])
112
113if test "x${enable_module}" = "xyes" || test "x${enable_module}" = "xstatic" ; then
114 want_module="yes"
115fi
116
117have_module="no"
118if test "x${want_module}" = "xyes" && (test "x${enable_module}" = "xyes" || test "x${enable_module}" = "xstatic") ; then
119 m4_default([EMOTION_CHECK_DEP_]m4_defn([UP]))(${enable_module}, [have_module="yes"], [have_module="no"])
120fi
121
122AC_MSG_CHECKING([whether to enable $1 module built])
123AC_MSG_RESULT([${have_module}])
124
125static_module="no"
126if test "x${have_module}" = "xyes" && test "x${enable_module}" = "xstatic" ; then
127 static_module="yes"
128fi
129
130AM_CONDITIONAL(EMOTION_BUILD_[]UP, [test "x${have_module}" = "xyes"])
131AM_CONDITIONAL(EMOTION_STATIC_BUILD_[]UP, [test "x${static_module}" = "xyes"])
132
133if test "x${static_module}" = "xyes" ; then
134 AC_DEFINE(EMOTION_STATIC_BUILD_[]UP, 1, [Set to 1 if $1 is statically built])
135 have_static_module="yes"
136fi
137
138enable_[]DOWN="no"
139if test "x${have_module}" = "xyes" ; then
140 enable_[]DOWN=${enable_module}
141fi
142
143AS_IF([test "x$have_module" = "xyes"], [$3], [$4])
144
145m4_popdef([UP])
146m4_popdef([DOWN])
147])
diff --git a/legacy/emotion/src/bin/Makefile.am b/legacy/emotion/src/bin/Makefile.am
index a90d5987b3..bc016d3ff0 100644
--- a/legacy/emotion/src/bin/Makefile.am
+++ b/legacy/emotion/src/bin/Makefile.am
@@ -7,16 +7,13 @@ AM_CPPFLAGS = \
7-DPACKAGE_BIN_DIR=\"$(bindir)\" \ 7-DPACKAGE_BIN_DIR=\"$(bindir)\" \
8-DPACKAGE_LIB_DIR=\"$(libdir)\" \ 8-DPACKAGE_LIB_DIR=\"$(libdir)\" \
9-DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \ 9-DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \
10@EVAS_CFLAGS@ \ 10@EMOTION_CPPFLAGS@ \
11@ECORE_CFLAGS@ \ 11@EMOTION_BIN_CFLAGS@ \
12@EDJE_CFLAGS@ 12@ECORE_X_CFLAGS@ \
13@ECORE_FB_CFLAGS@
13 14
14bin_PROGRAMS = \ 15bin_PROGRAMS = emotion_test
15emotion_test
16 16
17emotion_test_SOURCES = \ 17emotion_test_SOURCES = emotion_test_main.c
18emotion_test_main.c
19 18
20emotion_test_LDADD = \ 19emotion_test_LDADD = @ECORE_X_CFLAGS@ @ECORE_FB_CFLAGS@ @EMOTION_BIN_LIBS@ $(top_builddir)/src/lib/libemotion.la
21@EVAS_LIBS@ @ECORE_LIBS@ @EDJE_LIBS@ \
22$(top_builddir)/src/lib/libemotion.la
diff --git a/legacy/emotion/src/bin/emotion_test_main.c b/legacy/emotion/src/bin/emotion_test_main.c
index edccfe6569..c824090e3b 100644
--- a/legacy/emotion/src/bin/emotion_test_main.c
+++ b/legacy/emotion/src/bin/emotion_test_main.c
@@ -3,14 +3,14 @@
3#include <stdio.h> 3#include <stdio.h>
4#include <string.h> 4#include <string.h>
5 5
6#if defined(HAVE_ECORE_X_H) || defined(HAVE_ECORE_FB_H) 6#if defined(EMOTION_HAVE_ECORE_X) || defined(EMOTION_HAVE_ECORE_FB)
7 7
8#include <Evas.h> 8#include <Evas.h>
9#include <Ecore.h> 9#include <Ecore.h>
10#ifndef FB_ONLY 10#ifdef EMOTION_HAVE_ECORE_X
11#include <Ecore_X.h> 11# include <Ecore_X.h>
12#else 12#else
13#include <Ecore_Fb.h> 13# include <Ecore_Fb.h>
14#endif 14#endif
15#include <Ecore_Evas.h> 15#include <Ecore_Evas.h>
16#include <Edje.h> 16#include <Edje.h>
@@ -64,7 +64,7 @@ main_start(int argc, char **argv)
64 edje_frametime_set(1.0 / 30.0); 64 edje_frametime_set(1.0 / 30.0);
65 65
66 if (!ecore_evas_init()) return -1; 66 if (!ecore_evas_init()) return -1;
67#ifndef FB_ONLY 67#ifdef EMOTION_HAVE_ECORE_X
68 { 68 {
69 int i; 69 int i;
70 70
@@ -112,20 +112,22 @@ main_start(int argc, char **argv)
112 } 112 }
113 if (mode == 4) 113 if (mode == 4)
114 ecore_evas = ecore_evas_new(NULL, 0, 0, startw, starth, NULL); 114 ecore_evas = ecore_evas_new(NULL, 0, 0, startw, starth, NULL);
115#if HAVE_ECORE_EVAS_X 115# if HAVE_EVAS_SOFWARE_X11
116 if (mode == 0) 116 if (mode == 0)
117 ecore_evas = ecore_evas_software_x11_new(NULL, 0, 0, 0, startw, starth); 117 ecore_evas = ecore_evas_software_x11_new(NULL, 0, 0, 0, startw, starth);
118#endif 118# endif
119#if HAVE_ECORE_EVAS_X11_GL 119# if HAVE_EVAS_OPENGL_X11
120 if (mode == 1) 120 if (mode == 1)
121 ecore_evas = ecore_evas_gl_x11_new(NULL, 0, 0, 0, startw, starth); 121 ecore_evas = ecore_evas_gl_x11_new(NULL, 0, 0, 0, startw, starth);
122#endif 122# endif
123#if HAVE_ECORE_EVAS_FB 123# if HAVE_EVAS_FB
124 if (mode == 2) 124 if (mode == 2)
125 ecore_evas = ecore_evas_fb_new(NULL, 0, startw, starth); 125 ecore_evas = ecore_evas_fb_new(NULL, 0, startw, starth);
126#endif 126# endif
127# if HAVE_EVAS_XRENDER_X11
127 if (mode == 3) 128 if (mode == 3)
128 ecore_evas = ecore_evas_xrender_x11_new(NULL, 0, 0, 0, startw, starth); 129 ecore_evas = ecore_evas_xrender_x11_new(NULL, 0, 0, 0, startw, starth);
130# endif
129 131
130#else 132#else
131 startw = 240; 133 startw = 240;
@@ -902,6 +904,7 @@ main(int argc, char **argv)
902} 904}
903 905
904#else 906#else
907# warning "EMOTION_HAVE_ECORE_X and EMOTION_HAVE_ECORE_FB not defined !"
905int main() 908int main()
906{ 909{
907 puts("Could not find Ecore_X.h or Ecore_Fb.h so test is disabled"); 910 puts("Could not find Ecore_X.h or Ecore_Fb.h so test is disabled");
diff --git a/legacy/emotion/src/lib/Makefile.am b/legacy/emotion/src/lib/Makefile.am
index d2bb4adc78..76e69ab52f 100644
--- a/legacy/emotion/src/lib/Makefile.am
+++ b/legacy/emotion/src/lib/Makefile.am
@@ -7,16 +7,62 @@ AM_CPPFLAGS = \
7-DPACKAGE_BIN_DIR=\"$(bindir)\" \ 7-DPACKAGE_BIN_DIR=\"$(bindir)\" \
8-DPACKAGE_LIB_DIR=\"$(libdir)\" \ 8-DPACKAGE_LIB_DIR=\"$(libdir)\" \
9-DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \ 9-DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \
10@EVAS_CFLAGS@ \ 10@EMOTION_CPPFLAGS@ \
11@ECORE_CFLAGS@ \ 11@EMOTION_CFLAGS@ \
12@EFL_EMOTION_BUILD@ 12@EFL_EMOTION_BUILD@
13 13
14if EMOTION_STATIC_BUILD_XINE
15AM_CPPFLAGS += @XINE_CFLAGS@
16endif
17
18if EMOTION_STATIC_BUILD_GSTREAMER
19AM_CPPFLAGS += @GSTREAMER_CFLAGS@
20endif
21
22if EMOTION_STATIC_BUILD_VLC
23AM_CPPFLAGS += @VLC_CFLAGS@
24endif
25
14lib_LTLIBRARIES = libemotion.la 26lib_LTLIBRARIES = libemotion.la
15include_HEADERS = Emotion.h 27include_HEADERS = Emotion.h
16libemotion_la_SOURCES = \ 28libemotion_la_SOURCES = emotion_smart.c
17emotion_smart.c \ 29
18emotion_private.h 30if EMOTION_STATIC_BUILD_XINE
31libemotion_la_SOURCES += \
32$(top_srcdir)/src/modules/xine/emotion_xine.c \
33$(top_srcdir)/src/modules/xine/emotion_xine_vo_out.c
34endif
35
36if EMOTION_STATIC_BUILD_GSTREAMER
37libemotion_la_SOURCES += \
38$(top_srcdir)/src/modules/gstreamer/emotion_gstreamer.c \
39$(top_srcdir)/src/modules/gstreamer/emotion_gstreamer_pipeline.c \
40$(top_srcdir)/src/modules/gstreamer/emotion_gstreamer_pipeline_cdda.c \
41$(top_srcdir)/src/modules/gstreamer/emotion_gstreamer_pipeline_dvd.c \
42$(top_srcdir)/src/modules/gstreamer/emotion_gstreamer_pipeline_file.c \
43$(top_srcdir)/src/modules/gstreamer/emotion_gstreamer_pipeline_uri.c \
44$(top_srcdir)/src/modules/gstreamer/emotion_gstreamer_pipeline_v4l.c
45endif
46
47if EMOTION_STATIC_BUILD_VLC
48libemotion_la_SOURCES += \
49$(top_srcdir)/src/modules/vlc/emotion_vlc.c
50endif
51
52libemotion_la_LIBADD = @EMOTION_LIBS@
53
54if EMOTION_STATIC_BUILD_XINE
55libemotion_la_LIBADD += @XINE_LIBS@
56endif
57
58if EMOTION_STATIC_BUILD_GSTREAMER
59libemotion_la_LIBADD += @GSTREAMER_LIBS@
60endif
61
62if EMOTION_STATIC_BUILD_VLC
63libemotion_la_LIBADD += @VLC_LIBS@
64endif
65
66libemotion_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -version-info @version_info@
19 67
20libemotion_la_LIBADD = @EVAS_LIBS@ @ECORE_LIBS@ 68EXTRA_DIST = emotion_private.h
21libemotion_la_DEPENDENCIES = $(top_builddir)/config.h
22libemotion_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -version-info @version_info@
diff --git a/legacy/emotion/src/lib/emotion_private.h b/legacy/emotion/src/lib/emotion_private.h
index 1fb6166391..adf1f255d2 100644
--- a/legacy/emotion/src/lib/emotion_private.h
+++ b/legacy/emotion/src/lib/emotion_private.h
@@ -1,18 +1,19 @@
1#ifndef EMOTION_PRIVATE_H 1#ifndef EMOTION_PRIVATE_H
2#define EMOTION_PRIVATE_H 2#define EMOTION_PRIVATE_H
3 3
4#include <Evas.h> 4#ifdef HAVE_CONFIG_H
5#include <Ecore.h> 5# include "config.h"
6#include <Ecore_Job.h> 6#endif
7#include <Ecore_Data.h>
8#include <Ecore_Str.h>
9#include <Emotion.h>
10 7
11#include <stdlib.h> 8#include <stdlib.h>
12#include <stdio.h> 9#include <stdio.h>
13#include <string.h> 10#include <string.h>
14 11
15#include "config.h" 12#include <Evas.h>
13#include <Ecore.h>
14#include <Ecore_Job.h>
15#include <Ecore_Str.h>
16#include <Emotion.h>
16 17
17#define META_TRACK_TITLE 1 18#define META_TRACK_TITLE 1
18#define META_TRACK_ARTIST 2 19#define META_TRACK_ARTIST 2
diff --git a/legacy/emotion/src/lib/emotion_smart.c b/legacy/emotion/src/lib/emotion_smart.c
index e3c54b417f..ba733f2fbb 100644
--- a/legacy/emotion/src/lib/emotion_smart.c
+++ b/legacy/emotion/src/lib/emotion_smart.c
@@ -119,7 +119,7 @@ _emotion_module_open(const char *name, Evas_Object *obj, Emotion_Video_Module **
119{ 119{
120 Eina_Emotion_Plugins *plugin; 120 Eina_Emotion_Plugins *plugin;
121 Smart_Data *sd; 121 Smart_Data *sd;
122 int index = 0; 122 unsigned int index = 0;
123 123
124 E_SMART_OBJ_GET_RETURN(sd, obj, E_OBJ_NAME, 0); 124 E_SMART_OBJ_GET_RETURN(sd, obj, E_OBJ_NAME, 0);
125 if (!_backends) 125 if (!_backends)
@@ -1028,7 +1028,7 @@ _emotion_spu_button_set(Evas_Object *obj, int button)
1028/****************************/ 1028/****************************/
1029 1029
1030static void 1030static void
1031_mouse_move(void *data, Evas *ev, Evas_Object *obj, void *event_info) 1031_mouse_move(void *data, Evas *ev __UNUSED__, Evas_Object *obj, void *event_info)
1032{ 1032{
1033 Evas_Event_Mouse_Move *e; 1033 Evas_Event_Mouse_Move *e;
1034 Smart_Data *sd; 1034 Smart_Data *sd;
@@ -1048,7 +1048,7 @@ _mouse_move(void *data, Evas *ev, Evas_Object *obj, void *event_info)
1048} 1048}
1049 1049
1050static void 1050static void
1051_mouse_down(void *data, Evas *ev, Evas_Object *obj, void *event_info) 1051_mouse_down(void *data, Evas *ev __UNUSED__, Evas_Object *obj, void *event_info)
1052{ 1052{
1053 Evas_Event_Mouse_Down *e; 1053 Evas_Event_Mouse_Down *e;
1054 Smart_Data *sd; 1054 Smart_Data *sd;
diff --git a/legacy/emotion/src/modules/gstreamer/Makefile.am b/legacy/emotion/src/modules/gstreamer/Makefile.am
index 533ab0c35c..2056ea33af 100644
--- a/legacy/emotion/src/modules/gstreamer/Makefile.am
+++ b/legacy/emotion/src/modules/gstreamer/Makefile.am
@@ -1,4 +1,3 @@
1
2MAINTAINERCLEANFILES = Makefile.in 1MAINTAINERCLEANFILES = Makefile.in
3 2
4AM_CPPFLAGS = \ 3AM_CPPFLAGS = \
@@ -7,19 +6,18 @@ AM_CPPFLAGS = \
7-DPACKAGE_BIN_DIR=\"$(bindir)\" \ 6-DPACKAGE_BIN_DIR=\"$(bindir)\" \
8-DPACKAGE_LIB_DIR=\"$(libdir)\" \ 7-DPACKAGE_LIB_DIR=\"$(libdir)\" \
9-DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \ 8-DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \
9@EMOTION_CPPFLAGS@ \
10@EFL_EMOTION_BUILD@ \ 10@EFL_EMOTION_BUILD@ \
11@EVAS_CFLAGS@ \ 11@GSTREAMER_CFLAGS@
12@ECORE_CFLAGS@ \
13@GST_CFLAGS@
14 12
15if BUILD_GSTREAMER_MODULE 13if EMOTION_BUILD_GSTREAMER
14if !EMOTION_STATIC_BUILD_GSTREAMER
16 15
17pkgdir = $(libdir)/emotion 16pkgdir = $(libdir)/emotion
18 17
19pkg_LTLIBRARIES = gstreamer.la 18pkg_LTLIBRARIES = gstreamer.la
20gstreamer_la_SOURCES = \ 19gstreamer_la_SOURCES = \
21emotion_gstreamer.c \ 20emotion_gstreamer.c \
22emotion_gstreamer.h \
23emotion_gstreamer_pipeline.c \ 21emotion_gstreamer_pipeline.c \
24emotion_gstreamer_pipeline.h \ 22emotion_gstreamer_pipeline.h \
25emotion_gstreamer_pipeline_cdda.c \ 23emotion_gstreamer_pipeline_cdda.c \
@@ -27,9 +25,12 @@ emotion_gstreamer_pipeline_dvd.c \
27emotion_gstreamer_pipeline_file.c \ 25emotion_gstreamer_pipeline_file.c \
28emotion_gstreamer_pipeline_uri.c \ 26emotion_gstreamer_pipeline_uri.c \
29emotion_gstreamer_pipeline_v4l.c 27emotion_gstreamer_pipeline_v4l.c
30gstreamer_la_LIBADD = @EVAS_LIBS@ @ECORE_LIBS@ @GST_LIBS@ $(top_builddir)/src/lib/libemotion.la 28gstreamer_la_LIBADD = @GSTREAMER_LIBS@ $(top_builddir)/src/lib/libemotion.la
31gstreamer_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -module -avoid-version 29gstreamer_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -module -avoid-version
32gstreamer_la_LIBTOOLFLAGS = --tag=disable-static 30gstreamer_la_LIBTOOLFLAGS = --tag=disable-static
33gstreamer_la_DEPENDENCIES = $(top_builddir)/config.h 31gstreamer_la_DEPENDENCIES = $(top_builddir)/config.h
34 32
35endif 33endif
34endif
35
36EXTRA_DIST = emotion_gstreamer.h
diff --git a/legacy/emotion/src/modules/gstreamer/emotion_gstreamer.c b/legacy/emotion/src/modules/gstreamer/emotion_gstreamer.c
index 0de2cb029d..5340612255 100644
--- a/legacy/emotion/src/modules/gstreamer/emotion_gstreamer.c
+++ b/legacy/emotion/src/modules/gstreamer/emotion_gstreamer.c
@@ -236,7 +236,7 @@ static Emotion_Video_Module em_module =
236static unsigned char 236static unsigned char
237em_init(Evas_Object *obj, 237em_init(Evas_Object *obj,
238 void **emotion_video, 238 void **emotion_video,
239 Emotion_Module_Options *opt) 239 Emotion_Module_Options *opt __UNUSED__)
240{ 240{
241 Emotion_Gstreamer_Video *ev; 241 Emotion_Gstreamer_Video *ev;
242 GError *error; 242 GError *error;
@@ -494,7 +494,7 @@ em_file_close(void *video)
494 494
495static void 495static void
496em_play(void *video, 496em_play(void *video,
497 double pos) 497 double pos __UNUSED__)
498{ 498{
499 Emotion_Gstreamer_Video *ev; 499 Emotion_Gstreamer_Video *ev;
500 500
@@ -714,7 +714,7 @@ em_vis_get(void *video)
714} 714}
715 715
716static Eina_Bool 716static Eina_Bool
717em_vis_supported(void *ef, Emotion_Vis vis) 717em_vis_supported(void *ef __UNUSED__, Emotion_Vis vis)
718{ 718{
719 const char *name; 719 const char *name;
720 GstElementFactory *factory; 720 GstElementFactory *factory;
@@ -899,7 +899,7 @@ em_bgra_data_get(void *video, unsigned char **bgra_data)
899} 899}
900 900
901static void 901static void
902em_event_feed(void *video, int event) 902em_event_feed(void *video, int event __UNUSED__)
903{ 903{
904 Emotion_Gstreamer_Video *ev; 904 Emotion_Gstreamer_Video *ev;
905 905
@@ -907,7 +907,7 @@ em_event_feed(void *video, int event)
907} 907}
908 908
909static void 909static void
910em_event_mouse_button_feed(void *video, int button, int x, int y) 910em_event_mouse_button_feed(void *video, int button __UNUSED__, int x __UNUSED__, int y __UNUSED__)
911{ 911{
912 Emotion_Gstreamer_Video *ev; 912 Emotion_Gstreamer_Video *ev;
913 913
@@ -915,7 +915,7 @@ em_event_mouse_button_feed(void *video, int button, int x, int y)
915} 915}
916 916
917static void 917static void
918em_event_mouse_move_feed(void *video, int x, int y) 918em_event_mouse_move_feed(void *video, int x __UNUSED__, int y __UNUSED__)
919{ 919{
920 Emotion_Gstreamer_Video *ev; 920 Emotion_Gstreamer_Video *ev;
921 921
@@ -957,7 +957,7 @@ em_video_channel_get(void *video)
957 957
958static const char * 958static const char *
959em_video_channel_name_get(void *video, 959em_video_channel_name_get(void *video,
960 int channel) 960 int channel __UNUSED__)
961{ 961{
962 Emotion_Gstreamer_Video *ev; 962 Emotion_Gstreamer_Video *ev;
963 963
@@ -1023,7 +1023,7 @@ em_audio_channel_get(void *video)
1023 1023
1024static const char * 1024static const char *
1025em_audio_channel_name_get(void *video, 1025em_audio_channel_name_get(void *video,
1026 int channel) 1026 int channel __UNUSED__)
1027{ 1027{
1028 Emotion_Gstreamer_Video *ev; 1028 Emotion_Gstreamer_Video *ev;
1029 1029
@@ -1109,7 +1109,7 @@ em_spu_channel_count(void *video)
1109} 1109}
1110 1110
1111static void 1111static void
1112em_spu_channel_set(void *video, int channel) 1112em_spu_channel_set(void *video, int channel __UNUSED__)
1113{ 1113{
1114 Emotion_Gstreamer_Video *ev; 1114 Emotion_Gstreamer_Video *ev;
1115 1115
@@ -1127,7 +1127,7 @@ em_spu_channel_get(void *video)
1127} 1127}
1128 1128
1129static const char * 1129static const char *
1130em_spu_channel_name_get(void *video, int channel) 1130em_spu_channel_name_get(void *video, int channel __UNUSED__)
1131{ 1131{
1132 Emotion_Gstreamer_Video *ev; 1132 Emotion_Gstreamer_Video *ev;
1133 1133
@@ -1136,7 +1136,7 @@ em_spu_channel_name_get(void *video, int channel)
1136} 1136}
1137 1137
1138static void 1138static void
1139em_spu_channel_mute_set(void *video, int mute) 1139em_spu_channel_mute_set(void *video, int mute __UNUSED__)
1140{ 1140{
1141 Emotion_Gstreamer_Video *ev; 1141 Emotion_Gstreamer_Video *ev;
1142 1142
@@ -1163,7 +1163,7 @@ em_chapter_count(void *video)
1163} 1163}
1164 1164
1165static void 1165static void
1166em_chapter_set(void *video, int chapter) 1166em_chapter_set(void *video, int chapter __UNUSED__)
1167{ 1167{
1168 Emotion_Gstreamer_Video *ev; 1168 Emotion_Gstreamer_Video *ev;
1169 1169
@@ -1181,7 +1181,7 @@ em_chapter_get(void *video)
1181} 1181}
1182 1182
1183static const char * 1183static const char *
1184em_chapter_name_get(void *video, int chapter) 1184em_chapter_name_get(void *video, int chapter __UNUSED__)
1185{ 1185{
1186 Emotion_Gstreamer_Video *ev; 1186 Emotion_Gstreamer_Video *ev;
1187 1187
@@ -1191,7 +1191,7 @@ em_chapter_name_get(void *video, int chapter)
1191} 1191}
1192 1192
1193static void 1193static void
1194em_speed_set(void *video, double speed) 1194em_speed_set(void *video, double speed __UNUSED__)
1195{ 1195{
1196 Emotion_Gstreamer_Video *ev; 1196 Emotion_Gstreamer_Video *ev;
1197 1197
@@ -1274,7 +1274,7 @@ module_open(Evas_Object *obj,
1274} 1274}
1275 1275
1276static void 1276static void
1277module_close(Emotion_Video_Module *module, 1277module_close(Emotion_Video_Module *module __UNUSED__,
1278 void *video) 1278 void *video)
1279{ 1279{
1280 em_module.shutdown(video); 1280 em_module.shutdown(video);
@@ -1434,7 +1434,7 @@ _free_metadata(Emotion_Gstreamer_Metadata *m)
1434} 1434}
1435 1435
1436static void 1436static void
1437_em_buffer_read(void *data, void *buf, unsigned int nbyte) 1437_em_buffer_read(void *data, void *buf, unsigned int nbyte __UNUSED__)
1438{ 1438{
1439 Emotion_Gstreamer_Video *ev; 1439 Emotion_Gstreamer_Video *ev;
1440 Emotion_Video_Sink *vsink; 1440 Emotion_Video_Sink *vsink;
@@ -1444,7 +1444,11 @@ _em_buffer_read(void *data, void *buf, unsigned int nbyte)
1444 buffer = *((GstBuffer **)buf); 1444 buffer = *((GstBuffer **)buf);
1445 _emotion_frame_new(ev->obj); 1445 _emotion_frame_new(ev->obj);
1446 vsink = (Emotion_Video_Sink *)eina_list_nth(ev->video_sinks, ev->video_sink_nbr); 1446 vsink = (Emotion_Video_Sink *)eina_list_nth(ev->video_sinks, ev->video_sink_nbr);
1447 if (vsink) _emotion_video_pos_update(ev->obj, ev->position, vsink->length_time); 1447 if (vsink)
1448 {
1449 _emotion_video_pos_update(ev->obj, ev->position, vsink->length_time);
1450 _emotion_frame_resize(ev->obj, vsink->width, vsink->height, ev->ratio);
1451 }
1448} 1452}
1449 1453
1450static int 1454static int
diff --git a/legacy/emotion/src/modules/gstreamer/emotion_gstreamer_pipeline.c b/legacy/emotion/src/modules/gstreamer/emotion_gstreamer_pipeline.c
index 6513b91c20..ccfe04e3aa 100644
--- a/legacy/emotion/src/modules/gstreamer/emotion_gstreamer_pipeline.c
+++ b/legacy/emotion/src/modules/gstreamer/emotion_gstreamer_pipeline.c
@@ -33,7 +33,7 @@ emotion_pipeline_pause(GstElement *pipeline)
33 33
34/* Send the video frame to the evas object */ 34/* Send the video frame to the evas object */
35void 35void
36cb_handoff(GstElement *fakesrc, 36cb_handoff(GstElement *fakesrc __UNUSED__,
37 GstBuffer *buffer, 37 GstBuffer *buffer,
38 GstPad *pad, 38 GstPad *pad,
39 gpointer user_data) 39 gpointer user_data)
@@ -74,9 +74,9 @@ cb_handoff(GstElement *fakesrc,
74} 74}
75 75
76void 76void
77file_new_decoded_pad_cb(GstElement *decodebin, 77file_new_decoded_pad_cb(GstElement *decodebin __UNUSED__,
78 GstPad *new_pad, 78 GstPad *new_pad,
79 gboolean last, 79 gboolean last __UNUSED__,
80 gpointer user_data) 80 gpointer user_data)
81{ 81{
82 Emotion_Gstreamer_Video *ev; 82 Emotion_Gstreamer_Video *ev;
diff --git a/legacy/emotion/src/modules/gstreamer/emotion_gstreamer_pipeline_dvd.c b/legacy/emotion/src/modules/gstreamer/emotion_gstreamer_pipeline_dvd.c
index 48b9f00dde..465c2bbcb5 100644
--- a/legacy/emotion/src/modules/gstreamer/emotion_gstreamer_pipeline_dvd.c
+++ b/legacy/emotion/src/modules/gstreamer/emotion_gstreamer_pipeline_dvd.c
@@ -144,7 +144,7 @@ failure_dvdreadsrc:
144} 144}
145 145
146static void 146static void
147dvd_pad_added_cb(GstElement *dvddemuxer, 147dvd_pad_added_cb(GstElement *dvddemuxer __UNUSED__,
148 GObject *new_pad, 148 GObject *new_pad,
149 gpointer user_data) 149 gpointer user_data)
150{ 150{
@@ -239,8 +239,8 @@ dvd_pad_added_cb(GstElement *dvddemuxer,
239} 239}
240 240
241static void 241static void
242dvd_no_more_pads_cb(GstElement *dvddemuxer, 242dvd_no_more_pads_cb(GstElement *dvddemuxer __UNUSED__,
243 gpointer user_data) 243 gpointer user_data __UNUSED__)
244{ 244{
245 no_more_pads = 1; 245 no_more_pads = 1;
246} 246}
diff --git a/legacy/emotion/src/modules/vlc/Makefile.am b/legacy/emotion/src/modules/vlc/Makefile.am
index f165d684a5..9e706ff4de 100644
--- a/legacy/emotion/src/modules/vlc/Makefile.am
+++ b/legacy/emotion/src/modules/vlc/Makefile.am
@@ -1,4 +1,3 @@
1
2MAINTAINERCLEANFILES = Makefile.in 1MAINTAINERCLEANFILES = Makefile.in
3 2
4AM_CPPFLAGS = \ 3AM_CPPFLAGS = \
@@ -8,22 +7,22 @@ AM_CPPFLAGS = \
8-DPACKAGE_BIN_DIR=\"$(bindir)\" \ 7-DPACKAGE_BIN_DIR=\"$(bindir)\" \
9-DPACKAGE_LIB_DIR=\"$(libdir)\" \ 8-DPACKAGE_LIB_DIR=\"$(libdir)\" \
10-DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \ 9-DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \
11@EVAS_CFLAGS@ \ 10@EMOTION_CPPFLAGS@ \
12@ECORE_CFLAGS@ \
13@VLC_CFLAGS@ 11@VLC_CFLAGS@
14 12
15if BUILD_VLC_MODULE 13if EMOTION_BUILD_VLC
14if !EMOTION_STATIC_BUILD_VLC
16 15
17pkgdir = $(libdir)/emotion 16pkgdir = $(libdir)/emotion
18 17
19pkg_LTLIBRARIES = vlc.la 18pkg_LTLIBRARIES = vlc.la
20 19
21vlc_la_SOURCES = \ 20vlc_la_SOURCES = \
22emotion_vlc.c \ 21emotion_vlc.c \
23emotion_vlc.h 22emotion_vlc.h
24vlc_la_LIBADD = @EVAS_LIBS@ @ECORE_LIBS@ @VLC_LIBS@ $(top_builddir)/src/lib/libemotion.la -lpthread 23vlc_la_LIBADD = @VLC_LIBS@ $(top_builddir)/src/lib/libemotion.la -lpthread
25vlc_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -module -avoid-version 24vlc_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -module -avoid-version
26vlc_la_LIBTOOLFLAGS = --tag=disable-static 25vlc_la_LIBTOOLFLAGS = --tag=disable-static
27vlc_la_DEPENDENCIES = $(top_builddir)/config.h
28 26
29endif 27endif
28endif
diff --git a/legacy/emotion/src/modules/vlc/emotion_vlc.c b/legacy/emotion/src/modules/vlc/emotion_vlc.c
index 7f641802a9..bf0c9ccbad 100644
--- a/legacy/emotion/src/modules/vlc/emotion_vlc.c
+++ b/legacy/emotion/src/modules/vlc/emotion_vlc.c
@@ -3,8 +3,8 @@
3 * code@ife-sit.info 3 * code@ife-sit.info
4 */ 4 */
5 5
6#ifndef EMOTION_VLC_C 6#include <sys/types.h>
7#define EMOTION_VLC_C 7#include <unistd.h>
8 8
9#include "Emotion.h" 9#include "Emotion.h"
10#include "emotion_private.h" 10#include "emotion_private.h"
@@ -1241,6 +1241,3 @@ EINA_MODULE_SHUTDOWN(vlc_module_shutdown);
1241 1241
1242#endif 1242#endif
1243 1243
1244
1245#endif /* EMOTION_VLC_C */
1246
diff --git a/legacy/emotion/src/modules/xine/Makefile.am b/legacy/emotion/src/modules/xine/Makefile.am
index 3dfcba7584..a716243c03 100644
--- a/legacy/emotion/src/modules/xine/Makefile.am
+++ b/legacy/emotion/src/modules/xine/Makefile.am
@@ -1,4 +1,3 @@
1
2MAINTAINERCLEANFILES = Makefile.in 1MAINTAINERCLEANFILES = Makefile.in
3 2
4AM_CPPFLAGS = \ 3AM_CPPFLAGS = \
@@ -8,23 +7,23 @@ AM_CPPFLAGS = \
8-DPACKAGE_BIN_DIR=\"$(bindir)\" \ 7-DPACKAGE_BIN_DIR=\"$(bindir)\" \
9-DPACKAGE_LIB_DIR=\"$(libdir)\" \ 8-DPACKAGE_LIB_DIR=\"$(libdir)\" \
10-DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \ 9-DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \
11@EVAS_CFLAGS@ \ 10@EMOTION_CPPFLAGS@ \
12@ECORE_CFLAGS@ \
13@XINE_CFLAGS@ 11@XINE_CFLAGS@
14 12
15if BUILD_XINE_MODULE 13if EMOTION_BUILD_XINE
14if !EMOTION_STATIC_BUILD_XINE
16 15
17pkgdir = $(libdir)/emotion 16pkgdir = $(libdir)/emotion
18 17
19pkg_LTLIBRARIES = xine.la 18pkg_LTLIBRARIES = xine.la
20 19
21xine_la_SOURCES = \ 20xine_la_SOURCES = \
22emotion_xine.c \ 21emotion_xine.c \
23emotion_xine.h \ 22emotion_xine.h \
24emotion_xine_vo_out.c 23emotion_xine_vo_out.c
25xine_la_LIBADD = @EVAS_LIBS@ @ECORE_LIBS@ @XINE_LIBS@ $(top_builddir)/src/lib/libemotion.la -lpthread 24xine_la_LIBADD = @XINE_LIBS@ $(top_builddir)/src/lib/libemotion.la -lpthread
26xine_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -module -avoid-version 25xine_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -module -avoid-version
27xine_la_LIBTOOLFLAGS = --tag=disable-static 26xine_la_LIBTOOLFLAGS = --tag=disable-static
28xine_la_DEPENDENCIES = $(top_builddir)/config.h
29 27
30endif 28endif
29endif
diff --git a/legacy/emotion/src/modules/xine/emotion_xine.c b/legacy/emotion/src/modules/xine/emotion_xine.c
index 15d1556843..99b3139c85 100644
--- a/legacy/emotion/src/modules/xine/emotion_xine.c
+++ b/legacy/emotion/src/modules/xine/emotion_xine.c
@@ -439,7 +439,7 @@ em_shutdown(void *ef)
439} 439}
440 440
441static unsigned char 441static unsigned char
442em_file_open(const char *file, Evas_Object *obj, void *ef) 442em_file_open(const char *file, Evas_Object *obj __UNUSED__, void *ef)
443{ 443{
444 Emotion_Xine_Video *ev; 444 Emotion_Xine_Video *ev;
445 445
@@ -573,7 +573,7 @@ em_vis_get(void *ef)
573} 573}
574 574
575static Eina_Bool 575static Eina_Bool
576em_vis_supported(void *ef, Emotion_Vis vis) 576em_vis_supported(void *ef __UNUSED__, Emotion_Vis vis __UNUSED__)
577{ 577{
578 return EINA_FALSE; 578 return EINA_FALSE;
579} 579}
@@ -665,7 +665,7 @@ em_video_data_size_get(void *ef, int *w, int *h)
665} 665}
666 666
667static int 667static int
668em_yuv_rows_get(void *ef, int w, int h, unsigned char **yrows, unsigned char **urows, unsigned char **vrows) 668em_yuv_rows_get(void *ef, int w __UNUSED__, int h, unsigned char **yrows, unsigned char **urows, unsigned char **vrows)
669{ 669{
670 Emotion_Xine_Video *ev; 670 Emotion_Xine_Video *ev;
671 volatile Emotion_Xine_Video_Frame *fr; 671 volatile Emotion_Xine_Video_Frame *fr;
@@ -808,7 +808,7 @@ em_event_feed(void *ef, int event)
808} 808}
809 809
810static void 810static void
811em_event_mouse_button_feed(void *ef, int button, int x, int y) 811em_event_mouse_button_feed(void *ef, int button __UNUSED__, int x, int y)
812{ 812{
813 Emotion_Xine_Video *ev; 813 Emotion_Xine_Video *ev;
814 xine_event_t xine_event; 814 xine_event_t xine_event;
@@ -883,7 +883,7 @@ em_video_channel_get(void *ef)
883} 883}
884 884
885static const char * 885static const char *
886em_video_channel_name_get(void *ef, int channel) 886em_video_channel_name_get(void *ef, int channel __UNUSED__)
887{ 887{
888 Emotion_Xine_Video *ev; 888 Emotion_Xine_Video *ev;
889 889
@@ -1072,7 +1072,7 @@ em_chapter_count(void *ef)
1072} 1072}
1073 1073
1074static void 1074static void
1075em_chapter_set(void *ef, int chapter) 1075em_chapter_set(void *ef, int chapter __UNUSED__)
1076{ 1076{
1077 Emotion_Xine_Video *ev; 1077 Emotion_Xine_Video *ev;
1078 1078
@@ -1089,7 +1089,7 @@ em_chapter_get(void *ef)
1089} 1089}
1090 1090
1091static const char * 1091static const char *
1092em_chapter_name_get(void *ef, int chapter) 1092em_chapter_name_get(void *ef, int chapter __UNUSED__)
1093{ 1093{
1094 Emotion_Xine_Video *ev; 1094 Emotion_Xine_Video *ev;
1095 1095
@@ -1098,7 +1098,7 @@ em_chapter_name_get(void *ef, int chapter)
1098} 1098}
1099 1099
1100static void 1100static void
1101em_speed_set(void *ef, double speed) 1101em_speed_set(void *ef, double speed __UNUSED__)
1102{ 1102{
1103 Emotion_Xine_Video *ev; 1103 Emotion_Xine_Video *ev;
1104 1104
@@ -1540,7 +1540,7 @@ module_open(Evas_Object *obj, const Emotion_Video_Module **module, void **video,
1540} 1540}
1541 1541
1542static void 1542static void
1543module_close(Emotion_Video_Module *module, void *video) 1543module_close(Emotion_Video_Module *module __UNUSED__, void *video)
1544{ 1544{
1545 em_module.shutdown(video); 1545 em_module.shutdown(video);
1546} 1546}
diff --git a/legacy/emotion/src/modules/xine/emotion_xine_vo_out.c b/legacy/emotion/src/modules/xine/emotion_xine_vo_out.c
index e3bf7d59e5..92f66ebf29 100644
--- a/legacy/emotion/src/modules/xine/emotion_xine_vo_out.c
+++ b/legacy/emotion/src/modules/xine/emotion_xine_vo_out.c
@@ -111,7 +111,7 @@ plugin_info_t emotion_xine_plugin_info[] =
111 111
112/***************************************************************************/ 112/***************************************************************************/
113static void * 113static void *
114_emotion_class_init(xine_t *xine, void *visual) 114_emotion_class_init(xine_t *xine, void *visual __UNUSED__)
115{ 115{
116 Emotion_Class *cl; 116 Emotion_Class *cl;
117 117
@@ -225,7 +225,7 @@ _emotion_capabilities_get(vo_driver_t *vo_driver)
225 225
226/***************************************************************************/ 226/***************************************************************************/
227static int 227static int
228_emotion_gui_data_exchange(vo_driver_t *vo_driver, int data_type, void *data) 228_emotion_gui_data_exchange(vo_driver_t *vo_driver, int data_type, void *data __UNUSED__)
229{ 229{
230 Emotion_Driver *dv; 230 Emotion_Driver *dv;
231 231
@@ -292,7 +292,7 @@ _emotion_property_get(vo_driver_t *vo_driver, int property)
292} 292}
293 293
294static void 294static void
295_emotion_property_min_max_get(vo_driver_t *vo_driver, int property, int *min, int *max) 295_emotion_property_min_max_get(vo_driver_t *vo_driver, int property __UNUSED__, int *min, int *max)
296{ 296{
297 Emotion_Driver *dv; 297 Emotion_Driver *dv;
298 298
@@ -339,7 +339,7 @@ _emotion_frame_dispose(vo_frame_t *vo_frame)
339} 339}
340 340
341static void 341static void
342_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) 342_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__)
343{ 343{
344 Emotion_Driver *dv; 344 Emotion_Driver *dv;
345 Emotion_Frame *fr; 345 Emotion_Frame *fr;
@@ -468,7 +468,7 @@ _emotion_frame_display(vo_driver_t *vo_driver, vo_frame_t *vo_frame)
468} 468}
469 469
470static void 470static void
471_emotion_frame_field(vo_frame_t *vo_frame, int which_field) 471_emotion_frame_field(vo_frame_t *vo_frame, int which_field __UNUSED__)
472{ 472{
473 Emotion_Frame *fr; 473 Emotion_Frame *fr;
474 474
@@ -510,7 +510,7 @@ _emotion_frame_data_unlock(Emotion_Frame *fr)
510 510
511/***************************************************************************/ 511/***************************************************************************/
512static void 512static void
513_emotion_overlay_begin(vo_driver_t *vo_driver, vo_frame_t *vo_frame, int changed) 513_emotion_overlay_begin(vo_driver_t *vo_driver, vo_frame_t *vo_frame, int changed __UNUSED__)
514{ 514{
515 Emotion_Driver *dv; 515 Emotion_Driver *dv;
516 Emotion_Frame *fr; 516 Emotion_Frame *fr;